diff --git a/src/api/customer/overtime.ts b/src/api/customer/overtime.ts
deleted file mode 100644
index 9f349d6..0000000
--- a/src/api/customer/overtime.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * 到期样品接口
- */
-import request from '../index'
-import type { IOvertimeListQuery } from '@/views/customer/sample/overTime/overtime_list_interface'
-const prefix = '/meter'
-
-// 列表查询
-export function getOverTimeList(data: IOvertimeListQuery) {
-  return request({
-    url: `${prefix}/sample/overtime/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 导出列表
-export function exportOverTimeList(data: Omit<IOvertimeListQuery, 'limit' | 'offset'>) {
-  return request({
-    url: `${prefix}/sample/overtime/listExport`,
-    method: 'post',
-    responseType: 'blob',
-    data,
-  })
-}

diff --git a/src/api/customer/overtime.ts b/src/api/customer/overtime.ts
deleted file mode 100644
index 9f349d6..0000000
--- a/src/api/customer/overtime.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * 到期样品接口
- */
-import request from '../index'
-import type { IOvertimeListQuery } from '@/views/customer/sample/overTime/overtime_list_interface'
-const prefix = '/meter'
-
-// 列表查询
-export function getOverTimeList(data: IOvertimeListQuery) {
-  return request({
-    url: `${prefix}/sample/overtime/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 导出列表
-export function exportOverTimeList(data: Omit<IOvertimeListQuery, 'limit' | 'offset'>) {
-  return request({
-    url: `${prefix}/sample/overtime/listExport`,
-    method: 'post',
-    responseType: 'blob',
-    data,
-  })
-}
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index 2610494..21a9c9e 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -59,3 +59,20 @@
   })
 }
 
+// 查询检定记录
+export function getMesureRecords(data: { id: string }) {
+  return request({
+    url: `${prefix}/sample/mesureRecordsBySampleId`,
+    method: 'post',
+    data,
+  })
+}
+
+// 查询检定证书
+export function getCertification(data: { id: string }) {
+  return request({
+    url: `${prefix}/sample/certificationBySampleId`,
+    method: 'post',
+    data,
+  })
+}

diff --git a/src/api/customer/overtime.ts b/src/api/customer/overtime.ts
deleted file mode 100644
index 9f349d6..0000000
--- a/src/api/customer/overtime.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * 到期样品接口
- */
-import request from '../index'
-import type { IOvertimeListQuery } from '@/views/customer/sample/overTime/overtime_list_interface'
-const prefix = '/meter'
-
-// 列表查询
-export function getOverTimeList(data: IOvertimeListQuery) {
-  return request({
-    url: `${prefix}/sample/overtime/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 导出列表
-export function exportOverTimeList(data: Omit<IOvertimeListQuery, 'limit' | 'offset'>) {
-  return request({
-    url: `${prefix}/sample/overtime/listExport`,
-    method: 'post',
-    responseType: 'blob',
-    data,
-  })
-}
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index 2610494..21a9c9e 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -59,3 +59,20 @@
   })
 }
 
+// 查询检定记录
+export function getMesureRecords(data: { id: string }) {
+  return request({
+    url: `${prefix}/sample/mesureRecordsBySampleId`,
+    method: 'post',
+    data,
+  })
+}
+
+// 查询检定证书
+export function getCertification(data: { id: string }) {
+  return request({
+    url: `${prefix}/sample/certificationBySampleId`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components.d.ts b/src/components.d.ts
index 227585d..90f2dde 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -21,6 +21,7 @@
     BarCodeBind: typeof import('./components/BarCodeBind/index.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
+    ButtonBox: typeof import('./components/buttonBox/buttonBox.vue')['default']
     CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default']
     CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']

diff --git a/src/api/customer/overtime.ts b/src/api/customer/overtime.ts
deleted file mode 100644
index 9f349d6..0000000
--- a/src/api/customer/overtime.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * 到期样品接口
- */
-import request from '../index'
-import type { IOvertimeListQuery } from '@/views/customer/sample/overTime/overtime_list_interface'
-const prefix = '/meter'
-
-// 列表查询
-export function getOverTimeList(data: IOvertimeListQuery) {
-  return request({
-    url: `${prefix}/sample/overtime/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 导出列表
-export function exportOverTimeList(data: Omit<IOvertimeListQuery, 'limit' | 'offset'>) {
-  return request({
-    url: `${prefix}/sample/overtime/listExport`,
-    method: 'post',
-    responseType: 'blob',
-    data,
-  })
-}
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index 2610494..21a9c9e 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -59,3 +59,20 @@
   })
 }
 
+// 查询检定记录
+export function getMesureRecords(data: { id: string }) {
+  return request({
+    url: `${prefix}/sample/mesureRecordsBySampleId`,
+    method: 'post',
+    data,
+  })
+}
+
+// 查询检定证书
+export function getCertification(data: { id: string }) {
+  return request({
+    url: `${prefix}/sample/certificationBySampleId`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components.d.ts b/src/components.d.ts
index 227585d..90f2dde 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -21,6 +21,7 @@
     BarCodeBind: typeof import('./components/BarCodeBind/index.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
+    ButtonBox: typeof import('./components/buttonBox/buttonBox.vue')['default']
     CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default']
     CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
diff --git a/src/components/buttonBox/buttonBox.vue b/src/components/buttonBox/buttonBox.vue
new file mode 100644
index 0000000..cf93686
--- /dev/null
+++ b/src/components/buttonBox/buttonBox.vue
@@ -0,0 +1,49 @@
+<!-- 列表页右上角按钮组 -->
+<script lang="ts" setup name="ButtonBox">
+import type { PropType } from 'vue'
+import { ref } from 'vue'
+import type { IMenu } from '../../views/device/receive/receive'
+
+const props = defineProps({
+  active: String,
+  menu: {
+    type: Array as PropType<IMenu[]>,
+  },
+})
+const emits = defineEmits(['changeCurrentButton'])
+
+const current = ref('')
+watch(current, (newValue) => {
+  emits('changeCurrentButton', newValue)
+})
+watch(() => props.active, (newValue) => {
+  current.value = newValue!
+  console.log('pppppp', newValue)
+})
+</script>
+
+<template>
+  <div class="container">
+    <div class="btns">
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.id" :label="item.id">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 69px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+

diff --git a/src/api/customer/overtime.ts b/src/api/customer/overtime.ts
deleted file mode 100644
index 9f349d6..0000000
--- a/src/api/customer/overtime.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * 到期样品接口
- */
-import request from '../index'
-import type { IOvertimeListQuery } from '@/views/customer/sample/overTime/overtime_list_interface'
-const prefix = '/meter'
-
-// 列表查询
-export function getOverTimeList(data: IOvertimeListQuery) {
-  return request({
-    url: `${prefix}/sample/overtime/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 导出列表
-export function exportOverTimeList(data: Omit<IOvertimeListQuery, 'limit' | 'offset'>) {
-  return request({
-    url: `${prefix}/sample/overtime/listExport`,
-    method: 'post',
-    responseType: 'blob',
-    data,
-  })
-}
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index 2610494..21a9c9e 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -59,3 +59,20 @@
   })
 }
 
+// 查询检定记录
+export function getMesureRecords(data: { id: string }) {
+  return request({
+    url: `${prefix}/sample/mesureRecordsBySampleId`,
+    method: 'post',
+    data,
+  })
+}
+
+// 查询检定证书
+export function getCertification(data: { id: string }) {
+  return request({
+    url: `${prefix}/sample/certificationBySampleId`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components.d.ts b/src/components.d.ts
index 227585d..90f2dde 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -21,6 +21,7 @@
     BarCodeBind: typeof import('./components/BarCodeBind/index.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
+    ButtonBox: typeof import('./components/buttonBox/buttonBox.vue')['default']
     CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default']
     CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
diff --git a/src/components/buttonBox/buttonBox.vue b/src/components/buttonBox/buttonBox.vue
new file mode 100644
index 0000000..cf93686
--- /dev/null
+++ b/src/components/buttonBox/buttonBox.vue
@@ -0,0 +1,49 @@
+<!-- 列表页右上角按钮组 -->
+<script lang="ts" setup name="ButtonBox">
+import type { PropType } from 'vue'
+import { ref } from 'vue'
+import type { IMenu } from '../../views/device/receive/receive'
+
+const props = defineProps({
+  active: String,
+  menu: {
+    type: Array as PropType<IMenu[]>,
+  },
+})
+const emits = defineEmits(['changeCurrentButton'])
+
+const current = ref('')
+watch(current, (newValue) => {
+  emits('changeCurrentButton', newValue)
+})
+watch(() => props.active, (newValue) => {
+  current.value = newValue!
+  console.log('pppppp', newValue)
+})
+</script>
+
+<template>
+  <div class="container">
+    <div class="btns">
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.id" :label="item.id">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 69px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 36f5104..fb6758e 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -481,7 +481,7 @@
       {
         path: 'applyList',
         name: 'ApplyList',
-        component: () => import('@/views/device/receive/applyList.vue'),
+        component: () => import('@/views/device/receive/apply/applyList.vue'),
         meta: {
           title: '设备领用申请',
           icon: 'ep:key',
@@ -491,7 +491,7 @@
       {
         path: ':type',
         name: 'ApplyListDetail',
-        component: () => import('@/views/device/receive/createOrCheck.vue'),
+        component: () => import('@/views/device/receive/apply/applyEdit.vue'),
         meta: {
           title: '设备领用申请',
           icon: 'ep:key',
@@ -503,7 +503,7 @@
       {
         path: 'solveList',
         name: 'SolveList',
-        component: () => import('@/views/device/receive/solveList.vue'),
+        component: () => import('@/views/device/receive/solve/solveList.vue'),
         meta: {
           title: '设备领用处理',
           icon: 'ep:key',
@@ -513,7 +513,7 @@
       {
         path: 'solveDetail',
         name: 'SolveListDetail',
-        component: () => import('@/views/device/receive/solveComponent/detail.vue'),
+        component: () => import('@/views/device/receive/solve/solveDetail.vue'),
         meta: {
           title: '设备领用处理',
           icon: 'ep:key',

diff --git a/src/api/customer/overtime.ts b/src/api/customer/overtime.ts
deleted file mode 100644
index 9f349d6..0000000
--- a/src/api/customer/overtime.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * 到期样品接口
- */
-import request from '../index'
-import type { IOvertimeListQuery } from '@/views/customer/sample/overTime/overtime_list_interface'
-const prefix = '/meter'
-
-// 列表查询
-export function getOverTimeList(data: IOvertimeListQuery) {
-  return request({
-    url: `${prefix}/sample/overtime/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 导出列表
-export function exportOverTimeList(data: Omit<IOvertimeListQuery, 'limit' | 'offset'>) {
-  return request({
-    url: `${prefix}/sample/overtime/listExport`,
-    method: 'post',
-    responseType: 'blob',
-    data,
-  })
-}
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index 2610494..21a9c9e 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -59,3 +59,20 @@
   })
 }
 
+// 查询检定记录
+export function getMesureRecords(data: { id: string }) {
+  return request({
+    url: `${prefix}/sample/mesureRecordsBySampleId`,
+    method: 'post',
+    data,
+  })
+}
+
+// 查询检定证书
+export function getCertification(data: { id: string }) {
+  return request({
+    url: `${prefix}/sample/certificationBySampleId`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components.d.ts b/src/components.d.ts
index 227585d..90f2dde 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -21,6 +21,7 @@
     BarCodeBind: typeof import('./components/BarCodeBind/index.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
+    ButtonBox: typeof import('./components/buttonBox/buttonBox.vue')['default']
     CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default']
     CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
diff --git a/src/components/buttonBox/buttonBox.vue b/src/components/buttonBox/buttonBox.vue
new file mode 100644
index 0000000..cf93686
--- /dev/null
+++ b/src/components/buttonBox/buttonBox.vue
@@ -0,0 +1,49 @@
+<!-- 列表页右上角按钮组 -->
+<script lang="ts" setup name="ButtonBox">
+import type { PropType } from 'vue'
+import { ref } from 'vue'
+import type { IMenu } from '../../views/device/receive/receive'
+
+const props = defineProps({
+  active: String,
+  menu: {
+    type: Array as PropType<IMenu[]>,
+  },
+})
+const emits = defineEmits(['changeCurrentButton'])
+
+const current = ref('')
+watch(current, (newValue) => {
+  emits('changeCurrentButton', newValue)
+})
+watch(() => props.active, (newValue) => {
+  current.value = newValue!
+  console.log('pppppp', newValue)
+})
+</script>
+
+<template>
+  <div class="container">
+    <div class="btns">
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.id" :label="item.id">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 69px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 36f5104..fb6758e 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -481,7 +481,7 @@
       {
         path: 'applyList',
         name: 'ApplyList',
-        component: () => import('@/views/device/receive/applyList.vue'),
+        component: () => import('@/views/device/receive/apply/applyList.vue'),
         meta: {
           title: '设备领用申请',
           icon: 'ep:key',
@@ -491,7 +491,7 @@
       {
         path: ':type',
         name: 'ApplyListDetail',
-        component: () => import('@/views/device/receive/createOrCheck.vue'),
+        component: () => import('@/views/device/receive/apply/applyEdit.vue'),
         meta: {
           title: '设备领用申请',
           icon: 'ep:key',
@@ -503,7 +503,7 @@
       {
         path: 'solveList',
         name: 'SolveList',
-        component: () => import('@/views/device/receive/solveList.vue'),
+        component: () => import('@/views/device/receive/solve/solveList.vue'),
         meta: {
           title: '设备领用处理',
           icon: 'ep:key',
@@ -513,7 +513,7 @@
       {
         path: 'solveDetail',
         name: 'SolveListDetail',
-        component: () => import('@/views/device/receive/solveComponent/detail.vue'),
+        component: () => import('@/views/device/receive/solve/solveDetail.vue'),
         meta: {
           title: '设备领用处理',
           icon: 'ep:key',
diff --git a/src/views/customer/bench/bench.vue b/src/views/customer/bench/bench.vue
index 6b502fc..3b8f274 100644
--- a/src/views/customer/bench/bench.vue
+++ b/src/views/customer/bench/bench.vue
@@ -1,15 +1,53 @@
 <script lang="ts" setup name="DeviceBench">
-import { getCurrentInstance, ref } from 'vue'
+import { ref } from 'vue'
 import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
 import type { planReturn } from './bench-interface'
 import Linechart from '@/components/Echart/LineChart.vue'
 import type { lineDataI } from '@/components/Echart/echart-interface'
 import { getCustomerExpireData, getHighQualityCustomerList, getSampleAddData, getSampleExpireData } from '@/api/customer/bench'
+import { getSampleList } from '@/api/customer/sampleList'
+import type { IOvertimeListQuery } from '@/views/customer/sample/overTime/overtime_list_interface'
+import { getAdviceList } from '@/api/customer/advice'
+import type { IAdvice, IAdviceQuery } from '@/views/customer/advice/advice_interface'
 
+const reg = /(\d{4})\年(\d{2})月/ // 把2022年3月转为2022-03
 // 每个展示块高度
 const blockHeight = ref(300)
 const blockWidth = ref(400)
-const { proxy } = getCurrentInstance() as any
+
+// 到期样品查询条件
+const dueSampleListQuery: Ref<IOvertimeListQuery> = ref({
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 型号
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  startTime: '', // 检定开始时间
+  endTime: '', // 检定结束时间
+  overtimeStatus: '1', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+  offset: 1,
+  limit: 20,
+})
+
+// 客户关系查询条件
+const customerRelationsListQuery: Ref<IAdviceQuery> = ref({
+  adviceNo: '', // 投诉编号
+  customerName: '', // 公司名称
+  customerNo: '', // 客户编号
+  startTime: '', // 投诉开始时间
+  endTime: '', // 投诉结束时间
+  offset: 1,
+  limit: 20,
+})
+
+const dueSampleTableLoading = ref(false) // 到期样品表格loading
+const customerRelationsTableLoading = ref(false) // 客户关系loading
+const sampleAddLoading = ref(false) // 样品新增趋势loading
+const customerAddLoading = ref(false) // 客户新增趋势loading
+const sampleExpireLoading = ref(false) // 样品到期趋势loading
+const highQualityCustomerLoading = ref(false) // 优质客户名单loading
+
 // 到期样品表格数据
 const dueSampleTableData = ref()
 // 到期样品表头
@@ -64,54 +102,81 @@
   blockWidth.value = (document.body.clientWidth - 180 - 20 - 20) / 3
   console.log(blockHeight.value, blockWidth.value - 20)
 }
+
 window.addEventListener('resize', () => {
   calcBlockSize()
 })
 
 // 获取样品新增趋势数据
 function fetchSampleAddData() {
+  sampleAddLoading.value = true
   getSampleAddData().then((res) => {
-    sampleAddXData.value = res.data.map((item: planReturn) => {
-      // return item.date.replace('年', '-')
-      return item.date
-    })
+    sampleAddXData.value = res.data.map((item: planReturn) => item.date.replace(reg, '$1-$2'))
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     sampleAddYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
-    sampleAddData.value = [{ name: '客户', data: yValue }]
+    sampleAddData.value = [{ name: '样品', data: yValue }]
+    sampleAddLoading.value = false
   })
 }
 
 // 获取样品到期趋势数据
 function fetchSampleExpireData() {
+  sampleExpireLoading.value = true
   getSampleExpireData().then((res) => {
-    sampleExpireXData.value = res.data.map((item: planReturn) => item.date)
+    sampleExpireXData.value = res.data.map((item: planReturn) => item.date.replace(reg, '$1-$2'))
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     sampleExpireYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
-    sampleExpireData.value = [{ name: '客户', data: yValue }]
+    sampleExpireData.value = [{ name: '样品', data: yValue }]
+    sampleExpireLoading.value = false
   })
 }
 
 // 获取优质客户名单
 function fetchHighQualityCustomerList() {
+  highQualityCustomerLoading.value = true
   getHighQualityCustomerList().then((res) => {
     highQualityCustomerTableData.value = res.data.rows
+    highQualityCustomerLoading.value = false
   })
 }
 // 获取客户新增趋势数据
 function fetchCustomerExpireData() {
+  customerAddLoading.value = true
   getCustomerExpireData().then((res) => {
-    customerAddXData.value = res.data.map((item: planReturn) => item.date)
+    customerAddXData.value = res.data.map((item: planReturn) => item.date.replace(reg, '$1-$2'))
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     customerAddYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
     customerAddData.value = [{ name: '客户', data: yValue }]
+    customerAddLoading.value = false
   })
 }
 
 // 获取到期样品表格数据
+function fetchDueSampleTableData() {
+  dueSampleTableLoading.value = true
+  getSampleList(dueSampleListQuery.value).then((response) => {
+    dueSampleTableData.value = response.data.rows
+    dueSampleTableLoading.value = false
+  })
+}
 // 获取客户关系表格数据
+function fetchcustomerRelationsTableData() {
+  customerRelationsTableLoading.value = true
+  getAdviceList(customerRelationsListQuery.value).then((res) => {
+    customerRelationsTabledata.value = res.data.rows.map((item: IAdvice) => {
+      return {
+        ...item,
+        adviceClass: item.adviceClass === '0' ? '建议' : item.adviceClass === '1' ? '投诉' : '其他',
+      }
+    })
+    customerRelationsTableLoading.value = false
+  })
+}
 
 onMounted(() => {
   calcBlockSize()
+  fetchDueSampleTableData() // 到期样品表格
+  fetchcustomerRelationsTableData() // 客户关系表格
   fetchSampleAddData()// 样品新增趋势
   fetchSampleExpireData()// 样品到期趋势
   fetchCustomerExpireData()// 客户新增趋势
@@ -125,6 +190,7 @@
       <el-row :gutter="10">
         <el-col :span="8">
           <bench-col
+            v-loading="dueSampleTableLoading"
             icon="icon-book"
             title="到期样品"
             path-url="/sample/overtime"
@@ -145,6 +211,7 @@
         </el-col>
         <el-col :span="8">
           <bench-col
+            v-loading="sampleAddLoading"
             icon="icon-line"
             title="样品新增趋势"
             :height="blockHeight"
@@ -159,6 +226,7 @@
         </el-col>
         <el-col :span="8">
           <bench-col
+            v-loading="sampleExpireLoading"
             icon="icon-line"
             title="样品到期趋势"
             :height="blockHeight"
@@ -177,6 +245,7 @@
       <el-row :gutter="10">
         <el-col :span="8">
           <bench-col
+            v-loading="customerRelationsTableLoading"
             icon="icon-book"
             title="客户关系"
             path-url="/customerManage/advice"
@@ -197,6 +266,7 @@
         </el-col>
         <el-col :span="8">
           <bench-col
+            v-loading="customerAddLoading"
             icon="icon-line"
             title="客户新增趋势"
             :height="blockHeight"
@@ -211,6 +281,7 @@
         </el-col>
         <el-col :span="8">
           <bench-col
+            v-loading="highQualityCustomerLoading"
             icon="icon-book"
             title="优质客户名单"
             :style="{ height: blockHeight }"

diff --git a/src/api/customer/overtime.ts b/src/api/customer/overtime.ts
deleted file mode 100644
index 9f349d6..0000000
--- a/src/api/customer/overtime.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * 到期样品接口
- */
-import request from '../index'
-import type { IOvertimeListQuery } from '@/views/customer/sample/overTime/overtime_list_interface'
-const prefix = '/meter'
-
-// 列表查询
-export function getOverTimeList(data: IOvertimeListQuery) {
-  return request({
-    url: `${prefix}/sample/overtime/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 导出列表
-export function exportOverTimeList(data: Omit<IOvertimeListQuery, 'limit' | 'offset'>) {
-  return request({
-    url: `${prefix}/sample/overtime/listExport`,
-    method: 'post',
-    responseType: 'blob',
-    data,
-  })
-}
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index 2610494..21a9c9e 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -59,3 +59,20 @@
   })
 }
 
+// 查询检定记录
+export function getMesureRecords(data: { id: string }) {
+  return request({
+    url: `${prefix}/sample/mesureRecordsBySampleId`,
+    method: 'post',
+    data,
+  })
+}
+
+// 查询检定证书
+export function getCertification(data: { id: string }) {
+  return request({
+    url: `${prefix}/sample/certificationBySampleId`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components.d.ts b/src/components.d.ts
index 227585d..90f2dde 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -21,6 +21,7 @@
     BarCodeBind: typeof import('./components/BarCodeBind/index.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
+    ButtonBox: typeof import('./components/buttonBox/buttonBox.vue')['default']
     CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default']
     CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
diff --git a/src/components/buttonBox/buttonBox.vue b/src/components/buttonBox/buttonBox.vue
new file mode 100644
index 0000000..cf93686
--- /dev/null
+++ b/src/components/buttonBox/buttonBox.vue
@@ -0,0 +1,49 @@
+<!-- 列表页右上角按钮组 -->
+<script lang="ts" setup name="ButtonBox">
+import type { PropType } from 'vue'
+import { ref } from 'vue'
+import type { IMenu } from '../../views/device/receive/receive'
+
+const props = defineProps({
+  active: String,
+  menu: {
+    type: Array as PropType<IMenu[]>,
+  },
+})
+const emits = defineEmits(['changeCurrentButton'])
+
+const current = ref('')
+watch(current, (newValue) => {
+  emits('changeCurrentButton', newValue)
+})
+watch(() => props.active, (newValue) => {
+  current.value = newValue!
+  console.log('pppppp', newValue)
+})
+</script>
+
+<template>
+  <div class="container">
+    <div class="btns">
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.id" :label="item.id">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 69px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 36f5104..fb6758e 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -481,7 +481,7 @@
       {
         path: 'applyList',
         name: 'ApplyList',
-        component: () => import('@/views/device/receive/applyList.vue'),
+        component: () => import('@/views/device/receive/apply/applyList.vue'),
         meta: {
           title: '设备领用申请',
           icon: 'ep:key',
@@ -491,7 +491,7 @@
       {
         path: ':type',
         name: 'ApplyListDetail',
-        component: () => import('@/views/device/receive/createOrCheck.vue'),
+        component: () => import('@/views/device/receive/apply/applyEdit.vue'),
         meta: {
           title: '设备领用申请',
           icon: 'ep:key',
@@ -503,7 +503,7 @@
       {
         path: 'solveList',
         name: 'SolveList',
-        component: () => import('@/views/device/receive/solveList.vue'),
+        component: () => import('@/views/device/receive/solve/solveList.vue'),
         meta: {
           title: '设备领用处理',
           icon: 'ep:key',
@@ -513,7 +513,7 @@
       {
         path: 'solveDetail',
         name: 'SolveListDetail',
-        component: () => import('@/views/device/receive/solveComponent/detail.vue'),
+        component: () => import('@/views/device/receive/solve/solveDetail.vue'),
         meta: {
           title: '设备领用处理',
           icon: 'ep:key',
diff --git a/src/views/customer/bench/bench.vue b/src/views/customer/bench/bench.vue
index 6b502fc..3b8f274 100644
--- a/src/views/customer/bench/bench.vue
+++ b/src/views/customer/bench/bench.vue
@@ -1,15 +1,53 @@
 <script lang="ts" setup name="DeviceBench">
-import { getCurrentInstance, ref } from 'vue'
+import { ref } from 'vue'
 import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
 import type { planReturn } from './bench-interface'
 import Linechart from '@/components/Echart/LineChart.vue'
 import type { lineDataI } from '@/components/Echart/echart-interface'
 import { getCustomerExpireData, getHighQualityCustomerList, getSampleAddData, getSampleExpireData } from '@/api/customer/bench'
+import { getSampleList } from '@/api/customer/sampleList'
+import type { IOvertimeListQuery } from '@/views/customer/sample/overTime/overtime_list_interface'
+import { getAdviceList } from '@/api/customer/advice'
+import type { IAdvice, IAdviceQuery } from '@/views/customer/advice/advice_interface'
 
+const reg = /(\d{4})\年(\d{2})月/ // 把2022年3月转为2022-03
 // 每个展示块高度
 const blockHeight = ref(300)
 const blockWidth = ref(400)
-const { proxy } = getCurrentInstance() as any
+
+// 到期样品查询条件
+const dueSampleListQuery: Ref<IOvertimeListQuery> = ref({
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 型号
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  startTime: '', // 检定开始时间
+  endTime: '', // 检定结束时间
+  overtimeStatus: '1', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+  offset: 1,
+  limit: 20,
+})
+
+// 客户关系查询条件
+const customerRelationsListQuery: Ref<IAdviceQuery> = ref({
+  adviceNo: '', // 投诉编号
+  customerName: '', // 公司名称
+  customerNo: '', // 客户编号
+  startTime: '', // 投诉开始时间
+  endTime: '', // 投诉结束时间
+  offset: 1,
+  limit: 20,
+})
+
+const dueSampleTableLoading = ref(false) // 到期样品表格loading
+const customerRelationsTableLoading = ref(false) // 客户关系loading
+const sampleAddLoading = ref(false) // 样品新增趋势loading
+const customerAddLoading = ref(false) // 客户新增趋势loading
+const sampleExpireLoading = ref(false) // 样品到期趋势loading
+const highQualityCustomerLoading = ref(false) // 优质客户名单loading
+
 // 到期样品表格数据
 const dueSampleTableData = ref()
 // 到期样品表头
@@ -64,54 +102,81 @@
   blockWidth.value = (document.body.clientWidth - 180 - 20 - 20) / 3
   console.log(blockHeight.value, blockWidth.value - 20)
 }
+
 window.addEventListener('resize', () => {
   calcBlockSize()
 })
 
 // 获取样品新增趋势数据
 function fetchSampleAddData() {
+  sampleAddLoading.value = true
   getSampleAddData().then((res) => {
-    sampleAddXData.value = res.data.map((item: planReturn) => {
-      // return item.date.replace('年', '-')
-      return item.date
-    })
+    sampleAddXData.value = res.data.map((item: planReturn) => item.date.replace(reg, '$1-$2'))
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     sampleAddYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
-    sampleAddData.value = [{ name: '客户', data: yValue }]
+    sampleAddData.value = [{ name: '样品', data: yValue }]
+    sampleAddLoading.value = false
   })
 }
 
 // 获取样品到期趋势数据
 function fetchSampleExpireData() {
+  sampleExpireLoading.value = true
   getSampleExpireData().then((res) => {
-    sampleExpireXData.value = res.data.map((item: planReturn) => item.date)
+    sampleExpireXData.value = res.data.map((item: planReturn) => item.date.replace(reg, '$1-$2'))
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     sampleExpireYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
-    sampleExpireData.value = [{ name: '客户', data: yValue }]
+    sampleExpireData.value = [{ name: '样品', data: yValue }]
+    sampleExpireLoading.value = false
   })
 }
 
 // 获取优质客户名单
 function fetchHighQualityCustomerList() {
+  highQualityCustomerLoading.value = true
   getHighQualityCustomerList().then((res) => {
     highQualityCustomerTableData.value = res.data.rows
+    highQualityCustomerLoading.value = false
   })
 }
 // 获取客户新增趋势数据
 function fetchCustomerExpireData() {
+  customerAddLoading.value = true
   getCustomerExpireData().then((res) => {
-    customerAddXData.value = res.data.map((item: planReturn) => item.date)
+    customerAddXData.value = res.data.map((item: planReturn) => item.date.replace(reg, '$1-$2'))
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     customerAddYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
     customerAddData.value = [{ name: '客户', data: yValue }]
+    customerAddLoading.value = false
   })
 }
 
 // 获取到期样品表格数据
+function fetchDueSampleTableData() {
+  dueSampleTableLoading.value = true
+  getSampleList(dueSampleListQuery.value).then((response) => {
+    dueSampleTableData.value = response.data.rows
+    dueSampleTableLoading.value = false
+  })
+}
 // 获取客户关系表格数据
+function fetchcustomerRelationsTableData() {
+  customerRelationsTableLoading.value = true
+  getAdviceList(customerRelationsListQuery.value).then((res) => {
+    customerRelationsTabledata.value = res.data.rows.map((item: IAdvice) => {
+      return {
+        ...item,
+        adviceClass: item.adviceClass === '0' ? '建议' : item.adviceClass === '1' ? '投诉' : '其他',
+      }
+    })
+    customerRelationsTableLoading.value = false
+  })
+}
 
 onMounted(() => {
   calcBlockSize()
+  fetchDueSampleTableData() // 到期样品表格
+  fetchcustomerRelationsTableData() // 客户关系表格
   fetchSampleAddData()// 样品新增趋势
   fetchSampleExpireData()// 样品到期趋势
   fetchCustomerExpireData()// 客户新增趋势
@@ -125,6 +190,7 @@
       <el-row :gutter="10">
         <el-col :span="8">
           <bench-col
+            v-loading="dueSampleTableLoading"
             icon="icon-book"
             title="到期样品"
             path-url="/sample/overtime"
@@ -145,6 +211,7 @@
         </el-col>
         <el-col :span="8">
           <bench-col
+            v-loading="sampleAddLoading"
             icon="icon-line"
             title="样品新增趋势"
             :height="blockHeight"
@@ -159,6 +226,7 @@
         </el-col>
         <el-col :span="8">
           <bench-col
+            v-loading="sampleExpireLoading"
             icon="icon-line"
             title="样品到期趋势"
             :height="blockHeight"
@@ -177,6 +245,7 @@
       <el-row :gutter="10">
         <el-col :span="8">
           <bench-col
+            v-loading="customerRelationsTableLoading"
             icon="icon-book"
             title="客户关系"
             path-url="/customerManage/advice"
@@ -197,6 +266,7 @@
         </el-col>
         <el-col :span="8">
           <bench-col
+            v-loading="customerAddLoading"
             icon="icon-line"
             title="客户新增趋势"
             :height="blockHeight"
@@ -211,6 +281,7 @@
         </el-col>
         <el-col :span="8">
           <bench-col
+            v-loading="highQualityCustomerLoading"
             icon="icon-book"
             title="优质客户名单"
             :style="{ height: blockHeight }"
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index e7d1acb..359c94d 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -8,7 +8,7 @@
 import selectCustomer from './selectCustomer.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import { addSample, getCertification, getMesureRecords, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
@@ -69,6 +69,7 @@
   sampleName: '', // 样品名称
   sampleModel: '', // 样品型号
   manufacturingNo: '', // 出厂编号
+  customerId: '', // 委托方id
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   phone: '', // 委托方电话
@@ -138,12 +139,17 @@
 })
 
 // 获取检定记录
-const fetchMeasureRecords = function (query = null) {
-  dataList.value.measureRecords = []
+const fetchMeasureRecords = (query = null) => {
+  getMesureRecords({ id: infoId.value }).then((res) => {
+    dataList.value.measureRecords = res.data.rows
+  })
 }
+
 // 获取检定证书
-const fetchCertifications = function (query = null) {
-  dataList.value.certificationRecords = []
+const fetchCertifications = (query = null) => {
+  getCertification({ id: infoId.value }).then((res) => {
+    dataList.value.certificationRecords = res.data.rows
+  })
 }
 
 // 菜单
@@ -151,12 +157,12 @@
   {
     name: '检定记录',
     columns: [
-      { text: '委托单编号', value: 'orderCode' },
-      { text: '委托单日期', value: 'orderTime' },
-      { text: '委托方代码', value: 'customerCode' },
-      { text: '委托方名称', value: 'customerName' },
-      { text: '送检人', value: 'deliverer' },
-      { text: '送检日期', value: 'deliverTime' },
+      { text: '委托单编号', value: 'orderCode', align: 'center' },
+      { text: '委托单日期', value: 'orderTime', align: 'center' },
+      { text: '委托方代码', value: 'customerCode', align: 'center' },
+      { text: '委托方名称', value: 'customerName', align: 'center' },
+      { text: '送检人', value: 'deliverer', align: 'center' },
+      { text: '送检日期', value: 'deliverTime', align: 'center' },
     ],
     list: 'measureRecords',
     pagination: true,
@@ -165,11 +171,11 @@
   {
     name: '检定证书',
     columns: [
-      { text: '证书编号', value: 'certificationCode' },
-      { text: '证书名称', value: 'certificationName' },
-      { text: '证书类型', value: 'certificationType' },
-      { text: '证书出具日期', value: 'effectiveDate' },
-      { text: '证书有效期', value: 'expirationDate' },
+      { text: '证书编号', value: 'certificationCode', align: 'center' },
+      { text: '证书名称', value: 'certificationName', align: 'center' },
+      { text: '证书类型', value: 'certificationType', align: 'center' },
+      { text: '证书出具日期', value: 'effectiveDate', align: 'center' },
+      { text: '证书有效期', value: 'expirationDate', align: 'center' },
     ],
     list: 'certificationRecords',
     pagination: true,
@@ -233,18 +239,18 @@
 // 委托方代码获取焦点
 const customerNoFocus = () => {
   visible.value = true
-  console.log(visible.value)
 }
 
 // 选好委托方
 const confirmCheckout = (val: Array<ICustomer>) => {
   if (val && val.length) {
     const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo
-    dataForm.value.customerName = getValue.customerName
-    dataForm.value.phone = getValue.phone
-    dataForm.value.postalCode = getValue.postalCode
-    dataForm.value.customerAddress = getValue.briefName
+    dataForm.value.customerNo = getValue.customerNo // 委托方代码
+    dataForm.value.customerId = getValue.id // 委托方id
+    dataForm.value.customerName = getValue.customerName // 委托方名称
+    dataForm.value.phone = getValue.phone // 电话
+    dataForm.value.postalCode = getValue.postalCode // 邮编
+    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
   }
 }
 
@@ -296,6 +302,7 @@
 const getInfo = () => {
   getSapmleDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data
+    dataForm.value.ABC = res.data.abc
     for (const item of menu) {
       item.searchFunc()
     }

diff --git a/src/api/customer/overtime.ts b/src/api/customer/overtime.ts
deleted file mode 100644
index 9f349d6..0000000
--- a/src/api/customer/overtime.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * 到期样品接口
- */
-import request from '../index'
-import type { IOvertimeListQuery } from '@/views/customer/sample/overTime/overtime_list_interface'
-const prefix = '/meter'
-
-// 列表查询
-export function getOverTimeList(data: IOvertimeListQuery) {
-  return request({
-    url: `${prefix}/sample/overtime/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 导出列表
-export function exportOverTimeList(data: Omit<IOvertimeListQuery, 'limit' | 'offset'>) {
-  return request({
-    url: `${prefix}/sample/overtime/listExport`,
-    method: 'post',
-    responseType: 'blob',
-    data,
-  })
-}
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index 2610494..21a9c9e 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -59,3 +59,20 @@
   })
 }
 
+// 查询检定记录
+export function getMesureRecords(data: { id: string }) {
+  return request({
+    url: `${prefix}/sample/mesureRecordsBySampleId`,
+    method: 'post',
+    data,
+  })
+}
+
+// 查询检定证书
+export function getCertification(data: { id: string }) {
+  return request({
+    url: `${prefix}/sample/certificationBySampleId`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components.d.ts b/src/components.d.ts
index 227585d..90f2dde 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -21,6 +21,7 @@
     BarCodeBind: typeof import('./components/BarCodeBind/index.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
+    ButtonBox: typeof import('./components/buttonBox/buttonBox.vue')['default']
     CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default']
     CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
diff --git a/src/components/buttonBox/buttonBox.vue b/src/components/buttonBox/buttonBox.vue
new file mode 100644
index 0000000..cf93686
--- /dev/null
+++ b/src/components/buttonBox/buttonBox.vue
@@ -0,0 +1,49 @@
+<!-- 列表页右上角按钮组 -->
+<script lang="ts" setup name="ButtonBox">
+import type { PropType } from 'vue'
+import { ref } from 'vue'
+import type { IMenu } from '../../views/device/receive/receive'
+
+const props = defineProps({
+  active: String,
+  menu: {
+    type: Array as PropType<IMenu[]>,
+  },
+})
+const emits = defineEmits(['changeCurrentButton'])
+
+const current = ref('')
+watch(current, (newValue) => {
+  emits('changeCurrentButton', newValue)
+})
+watch(() => props.active, (newValue) => {
+  current.value = newValue!
+  console.log('pppppp', newValue)
+})
+</script>
+
+<template>
+  <div class="container">
+    <div class="btns">
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.id" :label="item.id">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 69px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 36f5104..fb6758e 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -481,7 +481,7 @@
       {
         path: 'applyList',
         name: 'ApplyList',
-        component: () => import('@/views/device/receive/applyList.vue'),
+        component: () => import('@/views/device/receive/apply/applyList.vue'),
         meta: {
           title: '设备领用申请',
           icon: 'ep:key',
@@ -491,7 +491,7 @@
       {
         path: ':type',
         name: 'ApplyListDetail',
-        component: () => import('@/views/device/receive/createOrCheck.vue'),
+        component: () => import('@/views/device/receive/apply/applyEdit.vue'),
         meta: {
           title: '设备领用申请',
           icon: 'ep:key',
@@ -503,7 +503,7 @@
       {
         path: 'solveList',
         name: 'SolveList',
-        component: () => import('@/views/device/receive/solveList.vue'),
+        component: () => import('@/views/device/receive/solve/solveList.vue'),
         meta: {
           title: '设备领用处理',
           icon: 'ep:key',
@@ -513,7 +513,7 @@
       {
         path: 'solveDetail',
         name: 'SolveListDetail',
-        component: () => import('@/views/device/receive/solveComponent/detail.vue'),
+        component: () => import('@/views/device/receive/solve/solveDetail.vue'),
         meta: {
           title: '设备领用处理',
           icon: 'ep:key',
diff --git a/src/views/customer/bench/bench.vue b/src/views/customer/bench/bench.vue
index 6b502fc..3b8f274 100644
--- a/src/views/customer/bench/bench.vue
+++ b/src/views/customer/bench/bench.vue
@@ -1,15 +1,53 @@
 <script lang="ts" setup name="DeviceBench">
-import { getCurrentInstance, ref } from 'vue'
+import { ref } from 'vue'
 import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
 import type { planReturn } from './bench-interface'
 import Linechart from '@/components/Echart/LineChart.vue'
 import type { lineDataI } from '@/components/Echart/echart-interface'
 import { getCustomerExpireData, getHighQualityCustomerList, getSampleAddData, getSampleExpireData } from '@/api/customer/bench'
+import { getSampleList } from '@/api/customer/sampleList'
+import type { IOvertimeListQuery } from '@/views/customer/sample/overTime/overtime_list_interface'
+import { getAdviceList } from '@/api/customer/advice'
+import type { IAdvice, IAdviceQuery } from '@/views/customer/advice/advice_interface'
 
+const reg = /(\d{4})\年(\d{2})月/ // 把2022年3月转为2022-03
 // 每个展示块高度
 const blockHeight = ref(300)
 const blockWidth = ref(400)
-const { proxy } = getCurrentInstance() as any
+
+// 到期样品查询条件
+const dueSampleListQuery: Ref<IOvertimeListQuery> = ref({
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 型号
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  startTime: '', // 检定开始时间
+  endTime: '', // 检定结束时间
+  overtimeStatus: '1', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+  offset: 1,
+  limit: 20,
+})
+
+// 客户关系查询条件
+const customerRelationsListQuery: Ref<IAdviceQuery> = ref({
+  adviceNo: '', // 投诉编号
+  customerName: '', // 公司名称
+  customerNo: '', // 客户编号
+  startTime: '', // 投诉开始时间
+  endTime: '', // 投诉结束时间
+  offset: 1,
+  limit: 20,
+})
+
+const dueSampleTableLoading = ref(false) // 到期样品表格loading
+const customerRelationsTableLoading = ref(false) // 客户关系loading
+const sampleAddLoading = ref(false) // 样品新增趋势loading
+const customerAddLoading = ref(false) // 客户新增趋势loading
+const sampleExpireLoading = ref(false) // 样品到期趋势loading
+const highQualityCustomerLoading = ref(false) // 优质客户名单loading
+
 // 到期样品表格数据
 const dueSampleTableData = ref()
 // 到期样品表头
@@ -64,54 +102,81 @@
   blockWidth.value = (document.body.clientWidth - 180 - 20 - 20) / 3
   console.log(blockHeight.value, blockWidth.value - 20)
 }
+
 window.addEventListener('resize', () => {
   calcBlockSize()
 })
 
 // 获取样品新增趋势数据
 function fetchSampleAddData() {
+  sampleAddLoading.value = true
   getSampleAddData().then((res) => {
-    sampleAddXData.value = res.data.map((item: planReturn) => {
-      // return item.date.replace('年', '-')
-      return item.date
-    })
+    sampleAddXData.value = res.data.map((item: planReturn) => item.date.replace(reg, '$1-$2'))
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     sampleAddYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
-    sampleAddData.value = [{ name: '客户', data: yValue }]
+    sampleAddData.value = [{ name: '样品', data: yValue }]
+    sampleAddLoading.value = false
   })
 }
 
 // 获取样品到期趋势数据
 function fetchSampleExpireData() {
+  sampleExpireLoading.value = true
   getSampleExpireData().then((res) => {
-    sampleExpireXData.value = res.data.map((item: planReturn) => item.date)
+    sampleExpireXData.value = res.data.map((item: planReturn) => item.date.replace(reg, '$1-$2'))
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     sampleExpireYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
-    sampleExpireData.value = [{ name: '客户', data: yValue }]
+    sampleExpireData.value = [{ name: '样品', data: yValue }]
+    sampleExpireLoading.value = false
   })
 }
 
 // 获取优质客户名单
 function fetchHighQualityCustomerList() {
+  highQualityCustomerLoading.value = true
   getHighQualityCustomerList().then((res) => {
     highQualityCustomerTableData.value = res.data.rows
+    highQualityCustomerLoading.value = false
   })
 }
 // 获取客户新增趋势数据
 function fetchCustomerExpireData() {
+  customerAddLoading.value = true
   getCustomerExpireData().then((res) => {
-    customerAddXData.value = res.data.map((item: planReturn) => item.date)
+    customerAddXData.value = res.data.map((item: planReturn) => item.date.replace(reg, '$1-$2'))
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     customerAddYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
     customerAddData.value = [{ name: '客户', data: yValue }]
+    customerAddLoading.value = false
   })
 }
 
 // 获取到期样品表格数据
+function fetchDueSampleTableData() {
+  dueSampleTableLoading.value = true
+  getSampleList(dueSampleListQuery.value).then((response) => {
+    dueSampleTableData.value = response.data.rows
+    dueSampleTableLoading.value = false
+  })
+}
 // 获取客户关系表格数据
+function fetchcustomerRelationsTableData() {
+  customerRelationsTableLoading.value = true
+  getAdviceList(customerRelationsListQuery.value).then((res) => {
+    customerRelationsTabledata.value = res.data.rows.map((item: IAdvice) => {
+      return {
+        ...item,
+        adviceClass: item.adviceClass === '0' ? '建议' : item.adviceClass === '1' ? '投诉' : '其他',
+      }
+    })
+    customerRelationsTableLoading.value = false
+  })
+}
 
 onMounted(() => {
   calcBlockSize()
+  fetchDueSampleTableData() // 到期样品表格
+  fetchcustomerRelationsTableData() // 客户关系表格
   fetchSampleAddData()// 样品新增趋势
   fetchSampleExpireData()// 样品到期趋势
   fetchCustomerExpireData()// 客户新增趋势
@@ -125,6 +190,7 @@
       <el-row :gutter="10">
         <el-col :span="8">
           <bench-col
+            v-loading="dueSampleTableLoading"
             icon="icon-book"
             title="到期样品"
             path-url="/sample/overtime"
@@ -145,6 +211,7 @@
         </el-col>
         <el-col :span="8">
           <bench-col
+            v-loading="sampleAddLoading"
             icon="icon-line"
             title="样品新增趋势"
             :height="blockHeight"
@@ -159,6 +226,7 @@
         </el-col>
         <el-col :span="8">
           <bench-col
+            v-loading="sampleExpireLoading"
             icon="icon-line"
             title="样品到期趋势"
             :height="blockHeight"
@@ -177,6 +245,7 @@
       <el-row :gutter="10">
         <el-col :span="8">
           <bench-col
+            v-loading="customerRelationsTableLoading"
             icon="icon-book"
             title="客户关系"
             path-url="/customerManage/advice"
@@ -197,6 +266,7 @@
         </el-col>
         <el-col :span="8">
           <bench-col
+            v-loading="customerAddLoading"
             icon="icon-line"
             title="客户新增趋势"
             :height="blockHeight"
@@ -211,6 +281,7 @@
         </el-col>
         <el-col :span="8">
           <bench-col
+            v-loading="highQualityCustomerLoading"
             icon="icon-book"
             title="优质客户名单"
             :style="{ height: blockHeight }"
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index e7d1acb..359c94d 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -8,7 +8,7 @@
 import selectCustomer from './selectCustomer.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import { addSample, getCertification, getMesureRecords, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
@@ -69,6 +69,7 @@
   sampleName: '', // 样品名称
   sampleModel: '', // 样品型号
   manufacturingNo: '', // 出厂编号
+  customerId: '', // 委托方id
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   phone: '', // 委托方电话
@@ -138,12 +139,17 @@
 })
 
 // 获取检定记录
-const fetchMeasureRecords = function (query = null) {
-  dataList.value.measureRecords = []
+const fetchMeasureRecords = (query = null) => {
+  getMesureRecords({ id: infoId.value }).then((res) => {
+    dataList.value.measureRecords = res.data.rows
+  })
 }
+
 // 获取检定证书
-const fetchCertifications = function (query = null) {
-  dataList.value.certificationRecords = []
+const fetchCertifications = (query = null) => {
+  getCertification({ id: infoId.value }).then((res) => {
+    dataList.value.certificationRecords = res.data.rows
+  })
 }
 
 // 菜单
@@ -151,12 +157,12 @@
   {
     name: '检定记录',
     columns: [
-      { text: '委托单编号', value: 'orderCode' },
-      { text: '委托单日期', value: 'orderTime' },
-      { text: '委托方代码', value: 'customerCode' },
-      { text: '委托方名称', value: 'customerName' },
-      { text: '送检人', value: 'deliverer' },
-      { text: '送检日期', value: 'deliverTime' },
+      { text: '委托单编号', value: 'orderCode', align: 'center' },
+      { text: '委托单日期', value: 'orderTime', align: 'center' },
+      { text: '委托方代码', value: 'customerCode', align: 'center' },
+      { text: '委托方名称', value: 'customerName', align: 'center' },
+      { text: '送检人', value: 'deliverer', align: 'center' },
+      { text: '送检日期', value: 'deliverTime', align: 'center' },
     ],
     list: 'measureRecords',
     pagination: true,
@@ -165,11 +171,11 @@
   {
     name: '检定证书',
     columns: [
-      { text: '证书编号', value: 'certificationCode' },
-      { text: '证书名称', value: 'certificationName' },
-      { text: '证书类型', value: 'certificationType' },
-      { text: '证书出具日期', value: 'effectiveDate' },
-      { text: '证书有效期', value: 'expirationDate' },
+      { text: '证书编号', value: 'certificationCode', align: 'center' },
+      { text: '证书名称', value: 'certificationName', align: 'center' },
+      { text: '证书类型', value: 'certificationType', align: 'center' },
+      { text: '证书出具日期', value: 'effectiveDate', align: 'center' },
+      { text: '证书有效期', value: 'expirationDate', align: 'center' },
     ],
     list: 'certificationRecords',
     pagination: true,
@@ -233,18 +239,18 @@
 // 委托方代码获取焦点
 const customerNoFocus = () => {
   visible.value = true
-  console.log(visible.value)
 }
 
 // 选好委托方
 const confirmCheckout = (val: Array<ICustomer>) => {
   if (val && val.length) {
     const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo
-    dataForm.value.customerName = getValue.customerName
-    dataForm.value.phone = getValue.phone
-    dataForm.value.postalCode = getValue.postalCode
-    dataForm.value.customerAddress = getValue.briefName
+    dataForm.value.customerNo = getValue.customerNo // 委托方代码
+    dataForm.value.customerId = getValue.id // 委托方id
+    dataForm.value.customerName = getValue.customerName // 委托方名称
+    dataForm.value.phone = getValue.phone // 电话
+    dataForm.value.postalCode = getValue.postalCode // 邮编
+    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
   }
 }
 
@@ -296,6 +302,7 @@
 const getInfo = () => {
   getSapmleDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data
+    dataForm.value.ABC = res.data.abc
     for (const item of menu) {
       item.searchFunc()
     }
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index a2c4307..c3690d4 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -35,6 +35,7 @@
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center', width: '180px' },
 ])
 // 表格数据
@@ -47,6 +48,7 @@
 const checkoutList = ref<string[]>([])
 // 文件上传input
 const fileRef = ref()
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -62,6 +64,7 @@
     loadingTable.value = false
   })
 }
+
 // 多选发生改变时
 function handleSelectionChange(e: any) {
   checkoutList.value = e.map((item: { id: string }) => item.id)
@@ -71,6 +74,7 @@
 const handleEdit = (row: ISampleList, pageType: 'edit' | 'detail') => {
   $router.push(`/sample/${pageType}/${row.id}`)
 }
+
 // 点击删除
 const handleDelete = (row: ISampleList) => {
   ElMessageBox.confirm(
@@ -94,10 +98,12 @@
       })
     })
 }
+
 // 点击搜索
 const searchList = () => {
   fetchData(true)
 }
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -112,7 +118,7 @@
     offset: 1,
     limit: 20,
   }
-  timeRange.value = ['', '']
+  timeRange.value = ['', ''] // 置空筛选时间
   fetchData(true)
 }
 
@@ -138,10 +144,12 @@
     ElMessage.error('请上传pdf格式')
   }
 }
+
 // 模板下载
 const templateDownload = () => {
 
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -157,10 +165,12 @@
 const uploadAll = () => {
   fileRef.value.click()
 }
+
 // 新建样品
 const add = () => {
   $router.push('/sample/add')
 }
+
 // 导出
 const exportAll = () => {
   const loading = ElLoading.service({
@@ -293,11 +303,13 @@
         <template #columns>
           <el-table-column label="操作" align="center" fixed="right" width="120">
             <template #default="{ row }">
+              <!-- 有orderid(关联了委托书)不允许编辑 -->
               <el-button
                 v-if="proxy.hasPerm('/sample/list/update')"
                 size="small"
                 type="primary"
                 link
+                :disabled="`${row.orderId}` !== ''"
                 @click="handleEdit(row, 'edit')"
               >
                 编辑
@@ -310,11 +322,13 @@
               >
                 详情
               </el-button>
+              <!-- 检测中的样品不允许删除 -->
               <el-button
                 v-if="proxy.hasPerm('/sample/list/delete')"
                 size="small"
                 link
                 type="danger"
+                :disabled="row.sampleSatus !== '3'"
                 @click="handleDelete(row)"
               >
                 删除

diff --git a/src/api/customer/overtime.ts b/src/api/customer/overtime.ts
deleted file mode 100644
index 9f349d6..0000000
--- a/src/api/customer/overtime.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * 到期样品接口
- */
-import request from '../index'
-import type { IOvertimeListQuery } from '@/views/customer/sample/overTime/overtime_list_interface'
-const prefix = '/meter'
-
-// 列表查询
-export function getOverTimeList(data: IOvertimeListQuery) {
-  return request({
-    url: `${prefix}/sample/overtime/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 导出列表
-export function exportOverTimeList(data: Omit<IOvertimeListQuery, 'limit' | 'offset'>) {
-  return request({
-    url: `${prefix}/sample/overtime/listExport`,
-    method: 'post',
-    responseType: 'blob',
-    data,
-  })
-}
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index 2610494..21a9c9e 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -59,3 +59,20 @@
   })
 }
 
+// 查询检定记录
+export function getMesureRecords(data: { id: string }) {
+  return request({
+    url: `${prefix}/sample/mesureRecordsBySampleId`,
+    method: 'post',
+    data,
+  })
+}
+
+// 查询检定证书
+export function getCertification(data: { id: string }) {
+  return request({
+    url: `${prefix}/sample/certificationBySampleId`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components.d.ts b/src/components.d.ts
index 227585d..90f2dde 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -21,6 +21,7 @@
     BarCodeBind: typeof import('./components/BarCodeBind/index.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
+    ButtonBox: typeof import('./components/buttonBox/buttonBox.vue')['default']
     CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default']
     CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
diff --git a/src/components/buttonBox/buttonBox.vue b/src/components/buttonBox/buttonBox.vue
new file mode 100644
index 0000000..cf93686
--- /dev/null
+++ b/src/components/buttonBox/buttonBox.vue
@@ -0,0 +1,49 @@
+<!-- 列表页右上角按钮组 -->
+<script lang="ts" setup name="ButtonBox">
+import type { PropType } from 'vue'
+import { ref } from 'vue'
+import type { IMenu } from '../../views/device/receive/receive'
+
+const props = defineProps({
+  active: String,
+  menu: {
+    type: Array as PropType<IMenu[]>,
+  },
+})
+const emits = defineEmits(['changeCurrentButton'])
+
+const current = ref('')
+watch(current, (newValue) => {
+  emits('changeCurrentButton', newValue)
+})
+watch(() => props.active, (newValue) => {
+  current.value = newValue!
+  console.log('pppppp', newValue)
+})
+</script>
+
+<template>
+  <div class="container">
+    <div class="btns">
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.id" :label="item.id">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 69px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 36f5104..fb6758e 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -481,7 +481,7 @@
       {
         path: 'applyList',
         name: 'ApplyList',
-        component: () => import('@/views/device/receive/applyList.vue'),
+        component: () => import('@/views/device/receive/apply/applyList.vue'),
         meta: {
           title: '设备领用申请',
           icon: 'ep:key',
@@ -491,7 +491,7 @@
       {
         path: ':type',
         name: 'ApplyListDetail',
-        component: () => import('@/views/device/receive/createOrCheck.vue'),
+        component: () => import('@/views/device/receive/apply/applyEdit.vue'),
         meta: {
           title: '设备领用申请',
           icon: 'ep:key',
@@ -503,7 +503,7 @@
       {
         path: 'solveList',
         name: 'SolveList',
-        component: () => import('@/views/device/receive/solveList.vue'),
+        component: () => import('@/views/device/receive/solve/solveList.vue'),
         meta: {
           title: '设备领用处理',
           icon: 'ep:key',
@@ -513,7 +513,7 @@
       {
         path: 'solveDetail',
         name: 'SolveListDetail',
-        component: () => import('@/views/device/receive/solveComponent/detail.vue'),
+        component: () => import('@/views/device/receive/solve/solveDetail.vue'),
         meta: {
           title: '设备领用处理',
           icon: 'ep:key',
diff --git a/src/views/customer/bench/bench.vue b/src/views/customer/bench/bench.vue
index 6b502fc..3b8f274 100644
--- a/src/views/customer/bench/bench.vue
+++ b/src/views/customer/bench/bench.vue
@@ -1,15 +1,53 @@
 <script lang="ts" setup name="DeviceBench">
-import { getCurrentInstance, ref } from 'vue'
+import { ref } from 'vue'
 import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
 import type { planReturn } from './bench-interface'
 import Linechart from '@/components/Echart/LineChart.vue'
 import type { lineDataI } from '@/components/Echart/echart-interface'
 import { getCustomerExpireData, getHighQualityCustomerList, getSampleAddData, getSampleExpireData } from '@/api/customer/bench'
+import { getSampleList } from '@/api/customer/sampleList'
+import type { IOvertimeListQuery } from '@/views/customer/sample/overTime/overtime_list_interface'
+import { getAdviceList } from '@/api/customer/advice'
+import type { IAdvice, IAdviceQuery } from '@/views/customer/advice/advice_interface'
 
+const reg = /(\d{4})\年(\d{2})月/ // 把2022年3月转为2022-03
 // 每个展示块高度
 const blockHeight = ref(300)
 const blockWidth = ref(400)
-const { proxy } = getCurrentInstance() as any
+
+// 到期样品查询条件
+const dueSampleListQuery: Ref<IOvertimeListQuery> = ref({
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 型号
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  startTime: '', // 检定开始时间
+  endTime: '', // 检定结束时间
+  overtimeStatus: '1', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+  offset: 1,
+  limit: 20,
+})
+
+// 客户关系查询条件
+const customerRelationsListQuery: Ref<IAdviceQuery> = ref({
+  adviceNo: '', // 投诉编号
+  customerName: '', // 公司名称
+  customerNo: '', // 客户编号
+  startTime: '', // 投诉开始时间
+  endTime: '', // 投诉结束时间
+  offset: 1,
+  limit: 20,
+})
+
+const dueSampleTableLoading = ref(false) // 到期样品表格loading
+const customerRelationsTableLoading = ref(false) // 客户关系loading
+const sampleAddLoading = ref(false) // 样品新增趋势loading
+const customerAddLoading = ref(false) // 客户新增趋势loading
+const sampleExpireLoading = ref(false) // 样品到期趋势loading
+const highQualityCustomerLoading = ref(false) // 优质客户名单loading
+
 // 到期样品表格数据
 const dueSampleTableData = ref()
 // 到期样品表头
@@ -64,54 +102,81 @@
   blockWidth.value = (document.body.clientWidth - 180 - 20 - 20) / 3
   console.log(blockHeight.value, blockWidth.value - 20)
 }
+
 window.addEventListener('resize', () => {
   calcBlockSize()
 })
 
 // 获取样品新增趋势数据
 function fetchSampleAddData() {
+  sampleAddLoading.value = true
   getSampleAddData().then((res) => {
-    sampleAddXData.value = res.data.map((item: planReturn) => {
-      // return item.date.replace('年', '-')
-      return item.date
-    })
+    sampleAddXData.value = res.data.map((item: planReturn) => item.date.replace(reg, '$1-$2'))
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     sampleAddYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
-    sampleAddData.value = [{ name: '客户', data: yValue }]
+    sampleAddData.value = [{ name: '样品', data: yValue }]
+    sampleAddLoading.value = false
   })
 }
 
 // 获取样品到期趋势数据
 function fetchSampleExpireData() {
+  sampleExpireLoading.value = true
   getSampleExpireData().then((res) => {
-    sampleExpireXData.value = res.data.map((item: planReturn) => item.date)
+    sampleExpireXData.value = res.data.map((item: planReturn) => item.date.replace(reg, '$1-$2'))
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     sampleExpireYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
-    sampleExpireData.value = [{ name: '客户', data: yValue }]
+    sampleExpireData.value = [{ name: '样品', data: yValue }]
+    sampleExpireLoading.value = false
   })
 }
 
 // 获取优质客户名单
 function fetchHighQualityCustomerList() {
+  highQualityCustomerLoading.value = true
   getHighQualityCustomerList().then((res) => {
     highQualityCustomerTableData.value = res.data.rows
+    highQualityCustomerLoading.value = false
   })
 }
 // 获取客户新增趋势数据
 function fetchCustomerExpireData() {
+  customerAddLoading.value = true
   getCustomerExpireData().then((res) => {
-    customerAddXData.value = res.data.map((item: planReturn) => item.date)
+    customerAddXData.value = res.data.map((item: planReturn) => item.date.replace(reg, '$1-$2'))
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     customerAddYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
     customerAddData.value = [{ name: '客户', data: yValue }]
+    customerAddLoading.value = false
   })
 }
 
 // 获取到期样品表格数据
+function fetchDueSampleTableData() {
+  dueSampleTableLoading.value = true
+  getSampleList(dueSampleListQuery.value).then((response) => {
+    dueSampleTableData.value = response.data.rows
+    dueSampleTableLoading.value = false
+  })
+}
 // 获取客户关系表格数据
+function fetchcustomerRelationsTableData() {
+  customerRelationsTableLoading.value = true
+  getAdviceList(customerRelationsListQuery.value).then((res) => {
+    customerRelationsTabledata.value = res.data.rows.map((item: IAdvice) => {
+      return {
+        ...item,
+        adviceClass: item.adviceClass === '0' ? '建议' : item.adviceClass === '1' ? '投诉' : '其他',
+      }
+    })
+    customerRelationsTableLoading.value = false
+  })
+}
 
 onMounted(() => {
   calcBlockSize()
+  fetchDueSampleTableData() // 到期样品表格
+  fetchcustomerRelationsTableData() // 客户关系表格
   fetchSampleAddData()// 样品新增趋势
   fetchSampleExpireData()// 样品到期趋势
   fetchCustomerExpireData()// 客户新增趋势
@@ -125,6 +190,7 @@
       <el-row :gutter="10">
         <el-col :span="8">
           <bench-col
+            v-loading="dueSampleTableLoading"
             icon="icon-book"
             title="到期样品"
             path-url="/sample/overtime"
@@ -145,6 +211,7 @@
         </el-col>
         <el-col :span="8">
           <bench-col
+            v-loading="sampleAddLoading"
             icon="icon-line"
             title="样品新增趋势"
             :height="blockHeight"
@@ -159,6 +226,7 @@
         </el-col>
         <el-col :span="8">
           <bench-col
+            v-loading="sampleExpireLoading"
             icon="icon-line"
             title="样品到期趋势"
             :height="blockHeight"
@@ -177,6 +245,7 @@
       <el-row :gutter="10">
         <el-col :span="8">
           <bench-col
+            v-loading="customerRelationsTableLoading"
             icon="icon-book"
             title="客户关系"
             path-url="/customerManage/advice"
@@ -197,6 +266,7 @@
         </el-col>
         <el-col :span="8">
           <bench-col
+            v-loading="customerAddLoading"
             icon="icon-line"
             title="客户新增趋势"
             :height="blockHeight"
@@ -211,6 +281,7 @@
         </el-col>
         <el-col :span="8">
           <bench-col
+            v-loading="highQualityCustomerLoading"
             icon="icon-book"
             title="优质客户名单"
             :style="{ height: blockHeight }"
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index e7d1acb..359c94d 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -8,7 +8,7 @@
 import selectCustomer from './selectCustomer.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import { addSample, getCertification, getMesureRecords, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
@@ -69,6 +69,7 @@
   sampleName: '', // 样品名称
   sampleModel: '', // 样品型号
   manufacturingNo: '', // 出厂编号
+  customerId: '', // 委托方id
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   phone: '', // 委托方电话
@@ -138,12 +139,17 @@
 })
 
 // 获取检定记录
-const fetchMeasureRecords = function (query = null) {
-  dataList.value.measureRecords = []
+const fetchMeasureRecords = (query = null) => {
+  getMesureRecords({ id: infoId.value }).then((res) => {
+    dataList.value.measureRecords = res.data.rows
+  })
 }
+
 // 获取检定证书
-const fetchCertifications = function (query = null) {
-  dataList.value.certificationRecords = []
+const fetchCertifications = (query = null) => {
+  getCertification({ id: infoId.value }).then((res) => {
+    dataList.value.certificationRecords = res.data.rows
+  })
 }
 
 // 菜单
@@ -151,12 +157,12 @@
   {
     name: '检定记录',
     columns: [
-      { text: '委托单编号', value: 'orderCode' },
-      { text: '委托单日期', value: 'orderTime' },
-      { text: '委托方代码', value: 'customerCode' },
-      { text: '委托方名称', value: 'customerName' },
-      { text: '送检人', value: 'deliverer' },
-      { text: '送检日期', value: 'deliverTime' },
+      { text: '委托单编号', value: 'orderCode', align: 'center' },
+      { text: '委托单日期', value: 'orderTime', align: 'center' },
+      { text: '委托方代码', value: 'customerCode', align: 'center' },
+      { text: '委托方名称', value: 'customerName', align: 'center' },
+      { text: '送检人', value: 'deliverer', align: 'center' },
+      { text: '送检日期', value: 'deliverTime', align: 'center' },
     ],
     list: 'measureRecords',
     pagination: true,
@@ -165,11 +171,11 @@
   {
     name: '检定证书',
     columns: [
-      { text: '证书编号', value: 'certificationCode' },
-      { text: '证书名称', value: 'certificationName' },
-      { text: '证书类型', value: 'certificationType' },
-      { text: '证书出具日期', value: 'effectiveDate' },
-      { text: '证书有效期', value: 'expirationDate' },
+      { text: '证书编号', value: 'certificationCode', align: 'center' },
+      { text: '证书名称', value: 'certificationName', align: 'center' },
+      { text: '证书类型', value: 'certificationType', align: 'center' },
+      { text: '证书出具日期', value: 'effectiveDate', align: 'center' },
+      { text: '证书有效期', value: 'expirationDate', align: 'center' },
     ],
     list: 'certificationRecords',
     pagination: true,
@@ -233,18 +239,18 @@
 // 委托方代码获取焦点
 const customerNoFocus = () => {
   visible.value = true
-  console.log(visible.value)
 }
 
 // 选好委托方
 const confirmCheckout = (val: Array<ICustomer>) => {
   if (val && val.length) {
     const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo
-    dataForm.value.customerName = getValue.customerName
-    dataForm.value.phone = getValue.phone
-    dataForm.value.postalCode = getValue.postalCode
-    dataForm.value.customerAddress = getValue.briefName
+    dataForm.value.customerNo = getValue.customerNo // 委托方代码
+    dataForm.value.customerId = getValue.id // 委托方id
+    dataForm.value.customerName = getValue.customerName // 委托方名称
+    dataForm.value.phone = getValue.phone // 电话
+    dataForm.value.postalCode = getValue.postalCode // 邮编
+    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
   }
 }
 
@@ -296,6 +302,7 @@
 const getInfo = () => {
   getSapmleDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data
+    dataForm.value.ABC = res.data.abc
     for (const item of menu) {
       item.searchFunc()
     }
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index a2c4307..c3690d4 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -35,6 +35,7 @@
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center', width: '180px' },
 ])
 // 表格数据
@@ -47,6 +48,7 @@
 const checkoutList = ref<string[]>([])
 // 文件上传input
 const fileRef = ref()
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -62,6 +64,7 @@
     loadingTable.value = false
   })
 }
+
 // 多选发生改变时
 function handleSelectionChange(e: any) {
   checkoutList.value = e.map((item: { id: string }) => item.id)
@@ -71,6 +74,7 @@
 const handleEdit = (row: ISampleList, pageType: 'edit' | 'detail') => {
   $router.push(`/sample/${pageType}/${row.id}`)
 }
+
 // 点击删除
 const handleDelete = (row: ISampleList) => {
   ElMessageBox.confirm(
@@ -94,10 +98,12 @@
       })
     })
 }
+
 // 点击搜索
 const searchList = () => {
   fetchData(true)
 }
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -112,7 +118,7 @@
     offset: 1,
     limit: 20,
   }
-  timeRange.value = ['', '']
+  timeRange.value = ['', ''] // 置空筛选时间
   fetchData(true)
 }
 
@@ -138,10 +144,12 @@
     ElMessage.error('请上传pdf格式')
   }
 }
+
 // 模板下载
 const templateDownload = () => {
 
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -157,10 +165,12 @@
 const uploadAll = () => {
   fileRef.value.click()
 }
+
 // 新建样品
 const add = () => {
   $router.push('/sample/add')
 }
+
 // 导出
 const exportAll = () => {
   const loading = ElLoading.service({
@@ -293,11 +303,13 @@
         <template #columns>
           <el-table-column label="操作" align="center" fixed="right" width="120">
             <template #default="{ row }">
+              <!-- 有orderid(关联了委托书)不允许编辑 -->
               <el-button
                 v-if="proxy.hasPerm('/sample/list/update')"
                 size="small"
                 type="primary"
                 link
+                :disabled="`${row.orderId}` !== ''"
                 @click="handleEdit(row, 'edit')"
               >
                 编辑
@@ -310,11 +322,13 @@
               >
                 详情
               </el-button>
+              <!-- 检测中的样品不允许删除 -->
               <el-button
                 v-if="proxy.hasPerm('/sample/list/delete')"
                 size="small"
                 link
                 type="danger"
+                :disabled="row.sampleSatus !== '3'"
                 @click="handleDelete(row)"
               >
                 删除
diff --git a/src/views/customer/sample/list/sample_list_interface.ts b/src/views/customer/sample/list/sample_list_interface.ts
index 707c8b5..81498a5 100644
--- a/src/views/customer/sample/list/sample_list_interface.ts
+++ b/src/views/customer/sample/list/sample_list_interface.ts
@@ -33,6 +33,7 @@
   sampleModel: string // 样品型号
   manufacturingNo: string // 出厂编号
   customerNo: string // 委托方代码
+  customerId: string // 委托方id
   customerName: string // 委托方名称
   phone: string // 委托方电话
   postalCode: string // 委托方邮编

diff --git a/src/api/customer/overtime.ts b/src/api/customer/overtime.ts
deleted file mode 100644
index 9f349d6..0000000
--- a/src/api/customer/overtime.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * 到期样品接口
- */
-import request from '../index'
-import type { IOvertimeListQuery } from '@/views/customer/sample/overTime/overtime_list_interface'
-const prefix = '/meter'
-
-// 列表查询
-export function getOverTimeList(data: IOvertimeListQuery) {
-  return request({
-    url: `${prefix}/sample/overtime/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 导出列表
-export function exportOverTimeList(data: Omit<IOvertimeListQuery, 'limit' | 'offset'>) {
-  return request({
-    url: `${prefix}/sample/overtime/listExport`,
-    method: 'post',
-    responseType: 'blob',
-    data,
-  })
-}
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index 2610494..21a9c9e 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -59,3 +59,20 @@
   })
 }
 
+// 查询检定记录
+export function getMesureRecords(data: { id: string }) {
+  return request({
+    url: `${prefix}/sample/mesureRecordsBySampleId`,
+    method: 'post',
+    data,
+  })
+}
+
+// 查询检定证书
+export function getCertification(data: { id: string }) {
+  return request({
+    url: `${prefix}/sample/certificationBySampleId`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components.d.ts b/src/components.d.ts
index 227585d..90f2dde 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -21,6 +21,7 @@
     BarCodeBind: typeof import('./components/BarCodeBind/index.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
+    ButtonBox: typeof import('./components/buttonBox/buttonBox.vue')['default']
     CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default']
     CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
diff --git a/src/components/buttonBox/buttonBox.vue b/src/components/buttonBox/buttonBox.vue
new file mode 100644
index 0000000..cf93686
--- /dev/null
+++ b/src/components/buttonBox/buttonBox.vue
@@ -0,0 +1,49 @@
+<!-- 列表页右上角按钮组 -->
+<script lang="ts" setup name="ButtonBox">
+import type { PropType } from 'vue'
+import { ref } from 'vue'
+import type { IMenu } from '../../views/device/receive/receive'
+
+const props = defineProps({
+  active: String,
+  menu: {
+    type: Array as PropType<IMenu[]>,
+  },
+})
+const emits = defineEmits(['changeCurrentButton'])
+
+const current = ref('')
+watch(current, (newValue) => {
+  emits('changeCurrentButton', newValue)
+})
+watch(() => props.active, (newValue) => {
+  current.value = newValue!
+  console.log('pppppp', newValue)
+})
+</script>
+
+<template>
+  <div class="container">
+    <div class="btns">
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.id" :label="item.id">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 69px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 36f5104..fb6758e 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -481,7 +481,7 @@
       {
         path: 'applyList',
         name: 'ApplyList',
-        component: () => import('@/views/device/receive/applyList.vue'),
+        component: () => import('@/views/device/receive/apply/applyList.vue'),
         meta: {
           title: '设备领用申请',
           icon: 'ep:key',
@@ -491,7 +491,7 @@
       {
         path: ':type',
         name: 'ApplyListDetail',
-        component: () => import('@/views/device/receive/createOrCheck.vue'),
+        component: () => import('@/views/device/receive/apply/applyEdit.vue'),
         meta: {
           title: '设备领用申请',
           icon: 'ep:key',
@@ -503,7 +503,7 @@
       {
         path: 'solveList',
         name: 'SolveList',
-        component: () => import('@/views/device/receive/solveList.vue'),
+        component: () => import('@/views/device/receive/solve/solveList.vue'),
         meta: {
           title: '设备领用处理',
           icon: 'ep:key',
@@ -513,7 +513,7 @@
       {
         path: 'solveDetail',
         name: 'SolveListDetail',
-        component: () => import('@/views/device/receive/solveComponent/detail.vue'),
+        component: () => import('@/views/device/receive/solve/solveDetail.vue'),
         meta: {
           title: '设备领用处理',
           icon: 'ep:key',
diff --git a/src/views/customer/bench/bench.vue b/src/views/customer/bench/bench.vue
index 6b502fc..3b8f274 100644
--- a/src/views/customer/bench/bench.vue
+++ b/src/views/customer/bench/bench.vue
@@ -1,15 +1,53 @@
 <script lang="ts" setup name="DeviceBench">
-import { getCurrentInstance, ref } from 'vue'
+import { ref } from 'vue'
 import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
 import type { planReturn } from './bench-interface'
 import Linechart from '@/components/Echart/LineChart.vue'
 import type { lineDataI } from '@/components/Echart/echart-interface'
 import { getCustomerExpireData, getHighQualityCustomerList, getSampleAddData, getSampleExpireData } from '@/api/customer/bench'
+import { getSampleList } from '@/api/customer/sampleList'
+import type { IOvertimeListQuery } from '@/views/customer/sample/overTime/overtime_list_interface'
+import { getAdviceList } from '@/api/customer/advice'
+import type { IAdvice, IAdviceQuery } from '@/views/customer/advice/advice_interface'
 
+const reg = /(\d{4})\年(\d{2})月/ // 把2022年3月转为2022-03
 // 每个展示块高度
 const blockHeight = ref(300)
 const blockWidth = ref(400)
-const { proxy } = getCurrentInstance() as any
+
+// 到期样品查询条件
+const dueSampleListQuery: Ref<IOvertimeListQuery> = ref({
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 型号
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  startTime: '', // 检定开始时间
+  endTime: '', // 检定结束时间
+  overtimeStatus: '1', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+  offset: 1,
+  limit: 20,
+})
+
+// 客户关系查询条件
+const customerRelationsListQuery: Ref<IAdviceQuery> = ref({
+  adviceNo: '', // 投诉编号
+  customerName: '', // 公司名称
+  customerNo: '', // 客户编号
+  startTime: '', // 投诉开始时间
+  endTime: '', // 投诉结束时间
+  offset: 1,
+  limit: 20,
+})
+
+const dueSampleTableLoading = ref(false) // 到期样品表格loading
+const customerRelationsTableLoading = ref(false) // 客户关系loading
+const sampleAddLoading = ref(false) // 样品新增趋势loading
+const customerAddLoading = ref(false) // 客户新增趋势loading
+const sampleExpireLoading = ref(false) // 样品到期趋势loading
+const highQualityCustomerLoading = ref(false) // 优质客户名单loading
+
 // 到期样品表格数据
 const dueSampleTableData = ref()
 // 到期样品表头
@@ -64,54 +102,81 @@
   blockWidth.value = (document.body.clientWidth - 180 - 20 - 20) / 3
   console.log(blockHeight.value, blockWidth.value - 20)
 }
+
 window.addEventListener('resize', () => {
   calcBlockSize()
 })
 
 // 获取样品新增趋势数据
 function fetchSampleAddData() {
+  sampleAddLoading.value = true
   getSampleAddData().then((res) => {
-    sampleAddXData.value = res.data.map((item: planReturn) => {
-      // return item.date.replace('年', '-')
-      return item.date
-    })
+    sampleAddXData.value = res.data.map((item: planReturn) => item.date.replace(reg, '$1-$2'))
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     sampleAddYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
-    sampleAddData.value = [{ name: '客户', data: yValue }]
+    sampleAddData.value = [{ name: '样品', data: yValue }]
+    sampleAddLoading.value = false
   })
 }
 
 // 获取样品到期趋势数据
 function fetchSampleExpireData() {
+  sampleExpireLoading.value = true
   getSampleExpireData().then((res) => {
-    sampleExpireXData.value = res.data.map((item: planReturn) => item.date)
+    sampleExpireXData.value = res.data.map((item: planReturn) => item.date.replace(reg, '$1-$2'))
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     sampleExpireYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
-    sampleExpireData.value = [{ name: '客户', data: yValue }]
+    sampleExpireData.value = [{ name: '样品', data: yValue }]
+    sampleExpireLoading.value = false
   })
 }
 
 // 获取优质客户名单
 function fetchHighQualityCustomerList() {
+  highQualityCustomerLoading.value = true
   getHighQualityCustomerList().then((res) => {
     highQualityCustomerTableData.value = res.data.rows
+    highQualityCustomerLoading.value = false
   })
 }
 // 获取客户新增趋势数据
 function fetchCustomerExpireData() {
+  customerAddLoading.value = true
   getCustomerExpireData().then((res) => {
-    customerAddXData.value = res.data.map((item: planReturn) => item.date)
+    customerAddXData.value = res.data.map((item: planReturn) => item.date.replace(reg, '$1-$2'))
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     customerAddYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
     customerAddData.value = [{ name: '客户', data: yValue }]
+    customerAddLoading.value = false
   })
 }
 
 // 获取到期样品表格数据
+function fetchDueSampleTableData() {
+  dueSampleTableLoading.value = true
+  getSampleList(dueSampleListQuery.value).then((response) => {
+    dueSampleTableData.value = response.data.rows
+    dueSampleTableLoading.value = false
+  })
+}
 // 获取客户关系表格数据
+function fetchcustomerRelationsTableData() {
+  customerRelationsTableLoading.value = true
+  getAdviceList(customerRelationsListQuery.value).then((res) => {
+    customerRelationsTabledata.value = res.data.rows.map((item: IAdvice) => {
+      return {
+        ...item,
+        adviceClass: item.adviceClass === '0' ? '建议' : item.adviceClass === '1' ? '投诉' : '其他',
+      }
+    })
+    customerRelationsTableLoading.value = false
+  })
+}
 
 onMounted(() => {
   calcBlockSize()
+  fetchDueSampleTableData() // 到期样品表格
+  fetchcustomerRelationsTableData() // 客户关系表格
   fetchSampleAddData()// 样品新增趋势
   fetchSampleExpireData()// 样品到期趋势
   fetchCustomerExpireData()// 客户新增趋势
@@ -125,6 +190,7 @@
       <el-row :gutter="10">
         <el-col :span="8">
           <bench-col
+            v-loading="dueSampleTableLoading"
             icon="icon-book"
             title="到期样品"
             path-url="/sample/overtime"
@@ -145,6 +211,7 @@
         </el-col>
         <el-col :span="8">
           <bench-col
+            v-loading="sampleAddLoading"
             icon="icon-line"
             title="样品新增趋势"
             :height="blockHeight"
@@ -159,6 +226,7 @@
         </el-col>
         <el-col :span="8">
           <bench-col
+            v-loading="sampleExpireLoading"
             icon="icon-line"
             title="样品到期趋势"
             :height="blockHeight"
@@ -177,6 +245,7 @@
       <el-row :gutter="10">
         <el-col :span="8">
           <bench-col
+            v-loading="customerRelationsTableLoading"
             icon="icon-book"
             title="客户关系"
             path-url="/customerManage/advice"
@@ -197,6 +266,7 @@
         </el-col>
         <el-col :span="8">
           <bench-col
+            v-loading="customerAddLoading"
             icon="icon-line"
             title="客户新增趋势"
             :height="blockHeight"
@@ -211,6 +281,7 @@
         </el-col>
         <el-col :span="8">
           <bench-col
+            v-loading="highQualityCustomerLoading"
             icon="icon-book"
             title="优质客户名单"
             :style="{ height: blockHeight }"
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index e7d1acb..359c94d 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -8,7 +8,7 @@
 import selectCustomer from './selectCustomer.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import { addSample, getCertification, getMesureRecords, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
@@ -69,6 +69,7 @@
   sampleName: '', // 样品名称
   sampleModel: '', // 样品型号
   manufacturingNo: '', // 出厂编号
+  customerId: '', // 委托方id
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   phone: '', // 委托方电话
@@ -138,12 +139,17 @@
 })
 
 // 获取检定记录
-const fetchMeasureRecords = function (query = null) {
-  dataList.value.measureRecords = []
+const fetchMeasureRecords = (query = null) => {
+  getMesureRecords({ id: infoId.value }).then((res) => {
+    dataList.value.measureRecords = res.data.rows
+  })
 }
+
 // 获取检定证书
-const fetchCertifications = function (query = null) {
-  dataList.value.certificationRecords = []
+const fetchCertifications = (query = null) => {
+  getCertification({ id: infoId.value }).then((res) => {
+    dataList.value.certificationRecords = res.data.rows
+  })
 }
 
 // 菜单
@@ -151,12 +157,12 @@
   {
     name: '检定记录',
     columns: [
-      { text: '委托单编号', value: 'orderCode' },
-      { text: '委托单日期', value: 'orderTime' },
-      { text: '委托方代码', value: 'customerCode' },
-      { text: '委托方名称', value: 'customerName' },
-      { text: '送检人', value: 'deliverer' },
-      { text: '送检日期', value: 'deliverTime' },
+      { text: '委托单编号', value: 'orderCode', align: 'center' },
+      { text: '委托单日期', value: 'orderTime', align: 'center' },
+      { text: '委托方代码', value: 'customerCode', align: 'center' },
+      { text: '委托方名称', value: 'customerName', align: 'center' },
+      { text: '送检人', value: 'deliverer', align: 'center' },
+      { text: '送检日期', value: 'deliverTime', align: 'center' },
     ],
     list: 'measureRecords',
     pagination: true,
@@ -165,11 +171,11 @@
   {
     name: '检定证书',
     columns: [
-      { text: '证书编号', value: 'certificationCode' },
-      { text: '证书名称', value: 'certificationName' },
-      { text: '证书类型', value: 'certificationType' },
-      { text: '证书出具日期', value: 'effectiveDate' },
-      { text: '证书有效期', value: 'expirationDate' },
+      { text: '证书编号', value: 'certificationCode', align: 'center' },
+      { text: '证书名称', value: 'certificationName', align: 'center' },
+      { text: '证书类型', value: 'certificationType', align: 'center' },
+      { text: '证书出具日期', value: 'effectiveDate', align: 'center' },
+      { text: '证书有效期', value: 'expirationDate', align: 'center' },
     ],
     list: 'certificationRecords',
     pagination: true,
@@ -233,18 +239,18 @@
 // 委托方代码获取焦点
 const customerNoFocus = () => {
   visible.value = true
-  console.log(visible.value)
 }
 
 // 选好委托方
 const confirmCheckout = (val: Array<ICustomer>) => {
   if (val && val.length) {
     const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo
-    dataForm.value.customerName = getValue.customerName
-    dataForm.value.phone = getValue.phone
-    dataForm.value.postalCode = getValue.postalCode
-    dataForm.value.customerAddress = getValue.briefName
+    dataForm.value.customerNo = getValue.customerNo // 委托方代码
+    dataForm.value.customerId = getValue.id // 委托方id
+    dataForm.value.customerName = getValue.customerName // 委托方名称
+    dataForm.value.phone = getValue.phone // 电话
+    dataForm.value.postalCode = getValue.postalCode // 邮编
+    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
   }
 }
 
@@ -296,6 +302,7 @@
 const getInfo = () => {
   getSapmleDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data
+    dataForm.value.ABC = res.data.abc
     for (const item of menu) {
       item.searchFunc()
     }
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index a2c4307..c3690d4 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -35,6 +35,7 @@
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center', width: '180px' },
 ])
 // 表格数据
@@ -47,6 +48,7 @@
 const checkoutList = ref<string[]>([])
 // 文件上传input
 const fileRef = ref()
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -62,6 +64,7 @@
     loadingTable.value = false
   })
 }
+
 // 多选发生改变时
 function handleSelectionChange(e: any) {
   checkoutList.value = e.map((item: { id: string }) => item.id)
@@ -71,6 +74,7 @@
 const handleEdit = (row: ISampleList, pageType: 'edit' | 'detail') => {
   $router.push(`/sample/${pageType}/${row.id}`)
 }
+
 // 点击删除
 const handleDelete = (row: ISampleList) => {
   ElMessageBox.confirm(
@@ -94,10 +98,12 @@
       })
     })
 }
+
 // 点击搜索
 const searchList = () => {
   fetchData(true)
 }
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -112,7 +118,7 @@
     offset: 1,
     limit: 20,
   }
-  timeRange.value = ['', '']
+  timeRange.value = ['', ''] // 置空筛选时间
   fetchData(true)
 }
 
@@ -138,10 +144,12 @@
     ElMessage.error('请上传pdf格式')
   }
 }
+
 // 模板下载
 const templateDownload = () => {
 
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -157,10 +165,12 @@
 const uploadAll = () => {
   fileRef.value.click()
 }
+
 // 新建样品
 const add = () => {
   $router.push('/sample/add')
 }
+
 // 导出
 const exportAll = () => {
   const loading = ElLoading.service({
@@ -293,11 +303,13 @@
         <template #columns>
           <el-table-column label="操作" align="center" fixed="right" width="120">
             <template #default="{ row }">
+              <!-- 有orderid(关联了委托书)不允许编辑 -->
               <el-button
                 v-if="proxy.hasPerm('/sample/list/update')"
                 size="small"
                 type="primary"
                 link
+                :disabled="`${row.orderId}` !== ''"
                 @click="handleEdit(row, 'edit')"
               >
                 编辑
@@ -310,11 +322,13 @@
               >
                 详情
               </el-button>
+              <!-- 检测中的样品不允许删除 -->
               <el-button
                 v-if="proxy.hasPerm('/sample/list/delete')"
                 size="small"
                 link
                 type="danger"
+                :disabled="row.sampleSatus !== '3'"
                 @click="handleDelete(row)"
               >
                 删除
diff --git a/src/views/customer/sample/list/sample_list_interface.ts b/src/views/customer/sample/list/sample_list_interface.ts
index 707c8b5..81498a5 100644
--- a/src/views/customer/sample/list/sample_list_interface.ts
+++ b/src/views/customer/sample/list/sample_list_interface.ts
@@ -33,6 +33,7 @@
   sampleModel: string // 样品型号
   manufacturingNo: string // 出厂编号
   customerNo: string // 委托方代码
+  customerId: string // 委托方id
   customerName: string // 委托方名称
   phone: string // 委托方电话
   postalCode: string // 委托方邮编
diff --git a/src/views/customer/sample/list/selectCustomer.vue b/src/views/customer/sample/list/selectCustomer.vue
index 5de352d..0eef7d0 100644
--- a/src/views/customer/sample/list/selectCustomer.vue
+++ b/src/views/customer/sample/list/selectCustomer.vue
@@ -6,7 +6,8 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getCustomerList } from '@/api/customer/customer'
 import { getDictByCode } from '@/api/system/dict'
-const props = defineProps({
+
+defineProps({
   visible: {
     type: Boolean,
     default: false,
@@ -14,18 +15,9 @@
 })
 const emits = defineEmits(['changeVisible', 'confirmCheckout'])
 
-const visibleDialog = computed({
-  get() {
-    return props.visible
-  },
-  set(val) {
-    emits('changeVisible', val)
-  },
-})
-
 // 查询条件
 const listQuery: Ref<ICustomerQuery> = ref({
-  bussinessSize: '', // 业务规模
+  businessSize: '', // 业务规模
   customerName: '', // 公司名称
   customerNo: '', // 客户编号
   grade: '', // 履约评级
@@ -37,40 +29,20 @@
   name: string
   value: string
 }
-// const companySizeList = ref<dictType[]>([]) // 公司规模列表
+
 const businessSizeList = ref<dictType[]>([]) // 业务规模列表
 const gradeList = ref<dictType[]>([]) // 履约评级列表
-// const evaluationList = ref<dictType[]>([]) // 整体评价列表
-function getDict() {
-  // // 获取公司规模
-  // getDictByCode('companySize').then((response) => {
-  //   companySizeList.value = response.data
-  // })
-  // 获取业务规模
-  getDictByCode('businessSize').then((response) => {
-    businessSizeList.value = response.data
-  })
-  // 获取履约评级
-  getDictByCode('grade').then((response) => {
-    gradeList.value = response.data
-  })
-  // // 获取整体评价
-  // getDictByCode('evaluation').then((response) => {
-  //   evaluationList.value = response.data
-  // })
-}
-getDict()
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '客户编号', value: 'customerNo', width: '160', align: 'center', fixed: true },
-  { text: '客户名称', value: 'customerName', width: '120', align: 'center', fixed: true },
-  { text: '公司规模', value: 'companySizeName', align: 'center', fixed: false },
-  { text: '业务规模', value: 'businessSizeName', align: 'center', fixed: false },
-  { text: '履约评级', value: 'gradeName', align: 'center', fixed: false },
-  { text: '整体评价', value: 'evaluationName', align: 'center', fixed: false },
-  { text: '公司地址', value: 'briefName', align: 'center', fixed: false },
-  { text: '创建时间', value: 'createTime', align: 'center', width: '180px', fixed: false },
-  { text: '备注', value: 'remark', align: 'center', fixed: false },
+  { text: '客户名称', value: 'customerName', align: 'center', fixed: true },
+  { text: '公司规模', value: 'companySizeName', width: '110', align: 'center' },
+  { text: '业务规模', value: 'businessSizeName', width: '130', align: 'center' },
+  { text: '履约评级', value: 'gradeName', width: '90', align: 'center' },
+  { text: '整体评价', value: 'evaluationName', width: '110', align: 'center' },
+  { text: '公司地址', value: 'fullAddress', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
+  { text: '备注', value: 'remark', align: 'center' },
 ])
 // 表格数据
 const list = ref<ICustomer[]>([])
@@ -81,44 +53,42 @@
 // 选中的内容
 const checkoutList = ref<string[]>([])
 
-// 数据查询
+function getDict() {
+  // 获取业务规模
+  getDictByCode('businessSize').then((response) => {
+    businessSizeList.value = response.data
+  })
+  // 获取履约评级
+  getDictByCode('grade').then((response) => {
+    gradeList.value = response.data
+  })
+}
+getDict()
+
+// 表格数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getCustomerList(listQuery.value).then((response) => {
-  //   // 模拟数据
-  //   response.data.rows = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', customerAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  //   list.value = response.data.rows.map((item: ICustomer) => {
-  //     if (item.companyProvinceName && item.companyCityName) {
-  //       item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-  //     }
-  //     else {
-  //       item.briefName = item.companyProvinceName || item.companyCityName
-  //     }
-  //     return item
-  //   })
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-
-  // 模拟数据
-  const response = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', customerAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' },
-    { bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', customerAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '2集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' },
-    { bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', customerAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '3集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  list.value = response.map((item: ICustomer) => {
-    if (item.companyProvinceName && item.companyCityName) {
-      item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-    }
-    else {
-      item.briefName = item.companyProvinceName || item.companyCityName
-    }
-    return item
+  getCustomerList(listQuery.value).then((response) => {
+    // 模拟数据
+    list.value = response.data.rows.map((item: ICustomer) => {
+      if (item.addressProvinceName && item.addressCityName) {
+        item.fullAddress = `${item.addressProvinceName}/${item.addressCityName}`
+      }
+      else if (item.addressProvinceName || item.addressCityName) {
+        item.fullAddress = item.addressProvinceName || item.addressCityName
+      }
+      else if (item.addressCountryName) {
+        item.fullAddress = item.addressCountryName
+      }
+      return item
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
   })
-  total.value = 50
-  loadingTable.value = false
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -131,7 +101,7 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    bussinessSize: '', // 业务规模
+    businessSize: '', // 业务规模
     customerName: '', // 公司名称
     customerNo: '', // 客户编号
     grade: '', // 履约评级
@@ -155,9 +125,9 @@
 const cancle = () => {
   emits('changeVisible', false)
 }
+
 // 点击确定
 const clickConfirm = () => {
-  console.log(checkoutList.value)
   if (!checkoutList.value.length) {
     ElMessage({
       message: '请选中',

diff --git a/src/api/customer/overtime.ts b/src/api/customer/overtime.ts
deleted file mode 100644
index 9f349d6..0000000
--- a/src/api/customer/overtime.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * 到期样品接口
- */
-import request from '../index'
-import type { IOvertimeListQuery } from '@/views/customer/sample/overTime/overtime_list_interface'
-const prefix = '/meter'
-
-// 列表查询
-export function getOverTimeList(data: IOvertimeListQuery) {
-  return request({
-    url: `${prefix}/sample/overtime/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 导出列表
-export function exportOverTimeList(data: Omit<IOvertimeListQuery, 'limit' | 'offset'>) {
-  return request({
-    url: `${prefix}/sample/overtime/listExport`,
-    method: 'post',
-    responseType: 'blob',
-    data,
-  })
-}
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index 2610494..21a9c9e 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -59,3 +59,20 @@
   })
 }
 
+// 查询检定记录
+export function getMesureRecords(data: { id: string }) {
+  return request({
+    url: `${prefix}/sample/mesureRecordsBySampleId`,
+    method: 'post',
+    data,
+  })
+}
+
+// 查询检定证书
+export function getCertification(data: { id: string }) {
+  return request({
+    url: `${prefix}/sample/certificationBySampleId`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components.d.ts b/src/components.d.ts
index 227585d..90f2dde 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -21,6 +21,7 @@
     BarCodeBind: typeof import('./components/BarCodeBind/index.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
+    ButtonBox: typeof import('./components/buttonBox/buttonBox.vue')['default']
     CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default']
     CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
diff --git a/src/components/buttonBox/buttonBox.vue b/src/components/buttonBox/buttonBox.vue
new file mode 100644
index 0000000..cf93686
--- /dev/null
+++ b/src/components/buttonBox/buttonBox.vue
@@ -0,0 +1,49 @@
+<!-- 列表页右上角按钮组 -->
+<script lang="ts" setup name="ButtonBox">
+import type { PropType } from 'vue'
+import { ref } from 'vue'
+import type { IMenu } from '../../views/device/receive/receive'
+
+const props = defineProps({
+  active: String,
+  menu: {
+    type: Array as PropType<IMenu[]>,
+  },
+})
+const emits = defineEmits(['changeCurrentButton'])
+
+const current = ref('')
+watch(current, (newValue) => {
+  emits('changeCurrentButton', newValue)
+})
+watch(() => props.active, (newValue) => {
+  current.value = newValue!
+  console.log('pppppp', newValue)
+})
+</script>
+
+<template>
+  <div class="container">
+    <div class="btns">
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.id" :label="item.id">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 69px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 36f5104..fb6758e 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -481,7 +481,7 @@
       {
         path: 'applyList',
         name: 'ApplyList',
-        component: () => import('@/views/device/receive/applyList.vue'),
+        component: () => import('@/views/device/receive/apply/applyList.vue'),
         meta: {
           title: '设备领用申请',
           icon: 'ep:key',
@@ -491,7 +491,7 @@
       {
         path: ':type',
         name: 'ApplyListDetail',
-        component: () => import('@/views/device/receive/createOrCheck.vue'),
+        component: () => import('@/views/device/receive/apply/applyEdit.vue'),
         meta: {
           title: '设备领用申请',
           icon: 'ep:key',
@@ -503,7 +503,7 @@
       {
         path: 'solveList',
         name: 'SolveList',
-        component: () => import('@/views/device/receive/solveList.vue'),
+        component: () => import('@/views/device/receive/solve/solveList.vue'),
         meta: {
           title: '设备领用处理',
           icon: 'ep:key',
@@ -513,7 +513,7 @@
       {
         path: 'solveDetail',
         name: 'SolveListDetail',
-        component: () => import('@/views/device/receive/solveComponent/detail.vue'),
+        component: () => import('@/views/device/receive/solve/solveDetail.vue'),
         meta: {
           title: '设备领用处理',
           icon: 'ep:key',
diff --git a/src/views/customer/bench/bench.vue b/src/views/customer/bench/bench.vue
index 6b502fc..3b8f274 100644
--- a/src/views/customer/bench/bench.vue
+++ b/src/views/customer/bench/bench.vue
@@ -1,15 +1,53 @@
 <script lang="ts" setup name="DeviceBench">
-import { getCurrentInstance, ref } from 'vue'
+import { ref } from 'vue'
 import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
 import type { planReturn } from './bench-interface'
 import Linechart from '@/components/Echart/LineChart.vue'
 import type { lineDataI } from '@/components/Echart/echart-interface'
 import { getCustomerExpireData, getHighQualityCustomerList, getSampleAddData, getSampleExpireData } from '@/api/customer/bench'
+import { getSampleList } from '@/api/customer/sampleList'
+import type { IOvertimeListQuery } from '@/views/customer/sample/overTime/overtime_list_interface'
+import { getAdviceList } from '@/api/customer/advice'
+import type { IAdvice, IAdviceQuery } from '@/views/customer/advice/advice_interface'
 
+const reg = /(\d{4})\年(\d{2})月/ // 把2022年3月转为2022-03
 // 每个展示块高度
 const blockHeight = ref(300)
 const blockWidth = ref(400)
-const { proxy } = getCurrentInstance() as any
+
+// 到期样品查询条件
+const dueSampleListQuery: Ref<IOvertimeListQuery> = ref({
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 型号
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  startTime: '', // 检定开始时间
+  endTime: '', // 检定结束时间
+  overtimeStatus: '1', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+  offset: 1,
+  limit: 20,
+})
+
+// 客户关系查询条件
+const customerRelationsListQuery: Ref<IAdviceQuery> = ref({
+  adviceNo: '', // 投诉编号
+  customerName: '', // 公司名称
+  customerNo: '', // 客户编号
+  startTime: '', // 投诉开始时间
+  endTime: '', // 投诉结束时间
+  offset: 1,
+  limit: 20,
+})
+
+const dueSampleTableLoading = ref(false) // 到期样品表格loading
+const customerRelationsTableLoading = ref(false) // 客户关系loading
+const sampleAddLoading = ref(false) // 样品新增趋势loading
+const customerAddLoading = ref(false) // 客户新增趋势loading
+const sampleExpireLoading = ref(false) // 样品到期趋势loading
+const highQualityCustomerLoading = ref(false) // 优质客户名单loading
+
 // 到期样品表格数据
 const dueSampleTableData = ref()
 // 到期样品表头
@@ -64,54 +102,81 @@
   blockWidth.value = (document.body.clientWidth - 180 - 20 - 20) / 3
   console.log(blockHeight.value, blockWidth.value - 20)
 }
+
 window.addEventListener('resize', () => {
   calcBlockSize()
 })
 
 // 获取样品新增趋势数据
 function fetchSampleAddData() {
+  sampleAddLoading.value = true
   getSampleAddData().then((res) => {
-    sampleAddXData.value = res.data.map((item: planReturn) => {
-      // return item.date.replace('年', '-')
-      return item.date
-    })
+    sampleAddXData.value = res.data.map((item: planReturn) => item.date.replace(reg, '$1-$2'))
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     sampleAddYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
-    sampleAddData.value = [{ name: '客户', data: yValue }]
+    sampleAddData.value = [{ name: '样品', data: yValue }]
+    sampleAddLoading.value = false
   })
 }
 
 // 获取样品到期趋势数据
 function fetchSampleExpireData() {
+  sampleExpireLoading.value = true
   getSampleExpireData().then((res) => {
-    sampleExpireXData.value = res.data.map((item: planReturn) => item.date)
+    sampleExpireXData.value = res.data.map((item: planReturn) => item.date.replace(reg, '$1-$2'))
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     sampleExpireYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
-    sampleExpireData.value = [{ name: '客户', data: yValue }]
+    sampleExpireData.value = [{ name: '样品', data: yValue }]
+    sampleExpireLoading.value = false
   })
 }
 
 // 获取优质客户名单
 function fetchHighQualityCustomerList() {
+  highQualityCustomerLoading.value = true
   getHighQualityCustomerList().then((res) => {
     highQualityCustomerTableData.value = res.data.rows
+    highQualityCustomerLoading.value = false
   })
 }
 // 获取客户新增趋势数据
 function fetchCustomerExpireData() {
+  customerAddLoading.value = true
   getCustomerExpireData().then((res) => {
-    customerAddXData.value = res.data.map((item: planReturn) => item.date)
+    customerAddXData.value = res.data.map((item: planReturn) => item.date.replace(reg, '$1-$2'))
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     customerAddYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
     customerAddData.value = [{ name: '客户', data: yValue }]
+    customerAddLoading.value = false
   })
 }
 
 // 获取到期样品表格数据
+function fetchDueSampleTableData() {
+  dueSampleTableLoading.value = true
+  getSampleList(dueSampleListQuery.value).then((response) => {
+    dueSampleTableData.value = response.data.rows
+    dueSampleTableLoading.value = false
+  })
+}
 // 获取客户关系表格数据
+function fetchcustomerRelationsTableData() {
+  customerRelationsTableLoading.value = true
+  getAdviceList(customerRelationsListQuery.value).then((res) => {
+    customerRelationsTabledata.value = res.data.rows.map((item: IAdvice) => {
+      return {
+        ...item,
+        adviceClass: item.adviceClass === '0' ? '建议' : item.adviceClass === '1' ? '投诉' : '其他',
+      }
+    })
+    customerRelationsTableLoading.value = false
+  })
+}
 
 onMounted(() => {
   calcBlockSize()
+  fetchDueSampleTableData() // 到期样品表格
+  fetchcustomerRelationsTableData() // 客户关系表格
   fetchSampleAddData()// 样品新增趋势
   fetchSampleExpireData()// 样品到期趋势
   fetchCustomerExpireData()// 客户新增趋势
@@ -125,6 +190,7 @@
       <el-row :gutter="10">
         <el-col :span="8">
           <bench-col
+            v-loading="dueSampleTableLoading"
             icon="icon-book"
             title="到期样品"
             path-url="/sample/overtime"
@@ -145,6 +211,7 @@
         </el-col>
         <el-col :span="8">
           <bench-col
+            v-loading="sampleAddLoading"
             icon="icon-line"
             title="样品新增趋势"
             :height="blockHeight"
@@ -159,6 +226,7 @@
         </el-col>
         <el-col :span="8">
           <bench-col
+            v-loading="sampleExpireLoading"
             icon="icon-line"
             title="样品到期趋势"
             :height="blockHeight"
@@ -177,6 +245,7 @@
       <el-row :gutter="10">
         <el-col :span="8">
           <bench-col
+            v-loading="customerRelationsTableLoading"
             icon="icon-book"
             title="客户关系"
             path-url="/customerManage/advice"
@@ -197,6 +266,7 @@
         </el-col>
         <el-col :span="8">
           <bench-col
+            v-loading="customerAddLoading"
             icon="icon-line"
             title="客户新增趋势"
             :height="blockHeight"
@@ -211,6 +281,7 @@
         </el-col>
         <el-col :span="8">
           <bench-col
+            v-loading="highQualityCustomerLoading"
             icon="icon-book"
             title="优质客户名单"
             :style="{ height: blockHeight }"
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index e7d1acb..359c94d 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -8,7 +8,7 @@
 import selectCustomer from './selectCustomer.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import { addSample, getCertification, getMesureRecords, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
@@ -69,6 +69,7 @@
   sampleName: '', // 样品名称
   sampleModel: '', // 样品型号
   manufacturingNo: '', // 出厂编号
+  customerId: '', // 委托方id
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   phone: '', // 委托方电话
@@ -138,12 +139,17 @@
 })
 
 // 获取检定记录
-const fetchMeasureRecords = function (query = null) {
-  dataList.value.measureRecords = []
+const fetchMeasureRecords = (query = null) => {
+  getMesureRecords({ id: infoId.value }).then((res) => {
+    dataList.value.measureRecords = res.data.rows
+  })
 }
+
 // 获取检定证书
-const fetchCertifications = function (query = null) {
-  dataList.value.certificationRecords = []
+const fetchCertifications = (query = null) => {
+  getCertification({ id: infoId.value }).then((res) => {
+    dataList.value.certificationRecords = res.data.rows
+  })
 }
 
 // 菜单
@@ -151,12 +157,12 @@
   {
     name: '检定记录',
     columns: [
-      { text: '委托单编号', value: 'orderCode' },
-      { text: '委托单日期', value: 'orderTime' },
-      { text: '委托方代码', value: 'customerCode' },
-      { text: '委托方名称', value: 'customerName' },
-      { text: '送检人', value: 'deliverer' },
-      { text: '送检日期', value: 'deliverTime' },
+      { text: '委托单编号', value: 'orderCode', align: 'center' },
+      { text: '委托单日期', value: 'orderTime', align: 'center' },
+      { text: '委托方代码', value: 'customerCode', align: 'center' },
+      { text: '委托方名称', value: 'customerName', align: 'center' },
+      { text: '送检人', value: 'deliverer', align: 'center' },
+      { text: '送检日期', value: 'deliverTime', align: 'center' },
     ],
     list: 'measureRecords',
     pagination: true,
@@ -165,11 +171,11 @@
   {
     name: '检定证书',
     columns: [
-      { text: '证书编号', value: 'certificationCode' },
-      { text: '证书名称', value: 'certificationName' },
-      { text: '证书类型', value: 'certificationType' },
-      { text: '证书出具日期', value: 'effectiveDate' },
-      { text: '证书有效期', value: 'expirationDate' },
+      { text: '证书编号', value: 'certificationCode', align: 'center' },
+      { text: '证书名称', value: 'certificationName', align: 'center' },
+      { text: '证书类型', value: 'certificationType', align: 'center' },
+      { text: '证书出具日期', value: 'effectiveDate', align: 'center' },
+      { text: '证书有效期', value: 'expirationDate', align: 'center' },
     ],
     list: 'certificationRecords',
     pagination: true,
@@ -233,18 +239,18 @@
 // 委托方代码获取焦点
 const customerNoFocus = () => {
   visible.value = true
-  console.log(visible.value)
 }
 
 // 选好委托方
 const confirmCheckout = (val: Array<ICustomer>) => {
   if (val && val.length) {
     const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo
-    dataForm.value.customerName = getValue.customerName
-    dataForm.value.phone = getValue.phone
-    dataForm.value.postalCode = getValue.postalCode
-    dataForm.value.customerAddress = getValue.briefName
+    dataForm.value.customerNo = getValue.customerNo // 委托方代码
+    dataForm.value.customerId = getValue.id // 委托方id
+    dataForm.value.customerName = getValue.customerName // 委托方名称
+    dataForm.value.phone = getValue.phone // 电话
+    dataForm.value.postalCode = getValue.postalCode // 邮编
+    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
   }
 }
 
@@ -296,6 +302,7 @@
 const getInfo = () => {
   getSapmleDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data
+    dataForm.value.ABC = res.data.abc
     for (const item of menu) {
       item.searchFunc()
     }
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index a2c4307..c3690d4 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -35,6 +35,7 @@
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center', width: '180px' },
 ])
 // 表格数据
@@ -47,6 +48,7 @@
 const checkoutList = ref<string[]>([])
 // 文件上传input
 const fileRef = ref()
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -62,6 +64,7 @@
     loadingTable.value = false
   })
 }
+
 // 多选发生改变时
 function handleSelectionChange(e: any) {
   checkoutList.value = e.map((item: { id: string }) => item.id)
@@ -71,6 +74,7 @@
 const handleEdit = (row: ISampleList, pageType: 'edit' | 'detail') => {
   $router.push(`/sample/${pageType}/${row.id}`)
 }
+
 // 点击删除
 const handleDelete = (row: ISampleList) => {
   ElMessageBox.confirm(
@@ -94,10 +98,12 @@
       })
     })
 }
+
 // 点击搜索
 const searchList = () => {
   fetchData(true)
 }
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -112,7 +118,7 @@
     offset: 1,
     limit: 20,
   }
-  timeRange.value = ['', '']
+  timeRange.value = ['', ''] // 置空筛选时间
   fetchData(true)
 }
 
@@ -138,10 +144,12 @@
     ElMessage.error('请上传pdf格式')
   }
 }
+
 // 模板下载
 const templateDownload = () => {
 
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -157,10 +165,12 @@
 const uploadAll = () => {
   fileRef.value.click()
 }
+
 // 新建样品
 const add = () => {
   $router.push('/sample/add')
 }
+
 // 导出
 const exportAll = () => {
   const loading = ElLoading.service({
@@ -293,11 +303,13 @@
         <template #columns>
           <el-table-column label="操作" align="center" fixed="right" width="120">
             <template #default="{ row }">
+              <!-- 有orderid(关联了委托书)不允许编辑 -->
               <el-button
                 v-if="proxy.hasPerm('/sample/list/update')"
                 size="small"
                 type="primary"
                 link
+                :disabled="`${row.orderId}` !== ''"
                 @click="handleEdit(row, 'edit')"
               >
                 编辑
@@ -310,11 +322,13 @@
               >
                 详情
               </el-button>
+              <!-- 检测中的样品不允许删除 -->
               <el-button
                 v-if="proxy.hasPerm('/sample/list/delete')"
                 size="small"
                 link
                 type="danger"
+                :disabled="row.sampleSatus !== '3'"
                 @click="handleDelete(row)"
               >
                 删除
diff --git a/src/views/customer/sample/list/sample_list_interface.ts b/src/views/customer/sample/list/sample_list_interface.ts
index 707c8b5..81498a5 100644
--- a/src/views/customer/sample/list/sample_list_interface.ts
+++ b/src/views/customer/sample/list/sample_list_interface.ts
@@ -33,6 +33,7 @@
   sampleModel: string // 样品型号
   manufacturingNo: string // 出厂编号
   customerNo: string // 委托方代码
+  customerId: string // 委托方id
   customerName: string // 委托方名称
   phone: string // 委托方电话
   postalCode: string // 委托方邮编
diff --git a/src/views/customer/sample/list/selectCustomer.vue b/src/views/customer/sample/list/selectCustomer.vue
index 5de352d..0eef7d0 100644
--- a/src/views/customer/sample/list/selectCustomer.vue
+++ b/src/views/customer/sample/list/selectCustomer.vue
@@ -6,7 +6,8 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getCustomerList } from '@/api/customer/customer'
 import { getDictByCode } from '@/api/system/dict'
-const props = defineProps({
+
+defineProps({
   visible: {
     type: Boolean,
     default: false,
@@ -14,18 +15,9 @@
 })
 const emits = defineEmits(['changeVisible', 'confirmCheckout'])
 
-const visibleDialog = computed({
-  get() {
-    return props.visible
-  },
-  set(val) {
-    emits('changeVisible', val)
-  },
-})
-
 // 查询条件
 const listQuery: Ref<ICustomerQuery> = ref({
-  bussinessSize: '', // 业务规模
+  businessSize: '', // 业务规模
   customerName: '', // 公司名称
   customerNo: '', // 客户编号
   grade: '', // 履约评级
@@ -37,40 +29,20 @@
   name: string
   value: string
 }
-// const companySizeList = ref<dictType[]>([]) // 公司规模列表
+
 const businessSizeList = ref<dictType[]>([]) // 业务规模列表
 const gradeList = ref<dictType[]>([]) // 履约评级列表
-// const evaluationList = ref<dictType[]>([]) // 整体评价列表
-function getDict() {
-  // // 获取公司规模
-  // getDictByCode('companySize').then((response) => {
-  //   companySizeList.value = response.data
-  // })
-  // 获取业务规模
-  getDictByCode('businessSize').then((response) => {
-    businessSizeList.value = response.data
-  })
-  // 获取履约评级
-  getDictByCode('grade').then((response) => {
-    gradeList.value = response.data
-  })
-  // // 获取整体评价
-  // getDictByCode('evaluation').then((response) => {
-  //   evaluationList.value = response.data
-  // })
-}
-getDict()
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '客户编号', value: 'customerNo', width: '160', align: 'center', fixed: true },
-  { text: '客户名称', value: 'customerName', width: '120', align: 'center', fixed: true },
-  { text: '公司规模', value: 'companySizeName', align: 'center', fixed: false },
-  { text: '业务规模', value: 'businessSizeName', align: 'center', fixed: false },
-  { text: '履约评级', value: 'gradeName', align: 'center', fixed: false },
-  { text: '整体评价', value: 'evaluationName', align: 'center', fixed: false },
-  { text: '公司地址', value: 'briefName', align: 'center', fixed: false },
-  { text: '创建时间', value: 'createTime', align: 'center', width: '180px', fixed: false },
-  { text: '备注', value: 'remark', align: 'center', fixed: false },
+  { text: '客户名称', value: 'customerName', align: 'center', fixed: true },
+  { text: '公司规模', value: 'companySizeName', width: '110', align: 'center' },
+  { text: '业务规模', value: 'businessSizeName', width: '130', align: 'center' },
+  { text: '履约评级', value: 'gradeName', width: '90', align: 'center' },
+  { text: '整体评价', value: 'evaluationName', width: '110', align: 'center' },
+  { text: '公司地址', value: 'fullAddress', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
+  { text: '备注', value: 'remark', align: 'center' },
 ])
 // 表格数据
 const list = ref<ICustomer[]>([])
@@ -81,44 +53,42 @@
 // 选中的内容
 const checkoutList = ref<string[]>([])
 
-// 数据查询
+function getDict() {
+  // 获取业务规模
+  getDictByCode('businessSize').then((response) => {
+    businessSizeList.value = response.data
+  })
+  // 获取履约评级
+  getDictByCode('grade').then((response) => {
+    gradeList.value = response.data
+  })
+}
+getDict()
+
+// 表格数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getCustomerList(listQuery.value).then((response) => {
-  //   // 模拟数据
-  //   response.data.rows = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', customerAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  //   list.value = response.data.rows.map((item: ICustomer) => {
-  //     if (item.companyProvinceName && item.companyCityName) {
-  //       item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-  //     }
-  //     else {
-  //       item.briefName = item.companyProvinceName || item.companyCityName
-  //     }
-  //     return item
-  //   })
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-
-  // 模拟数据
-  const response = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', customerAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' },
-    { bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', customerAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '2集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' },
-    { bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', customerAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '3集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  list.value = response.map((item: ICustomer) => {
-    if (item.companyProvinceName && item.companyCityName) {
-      item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-    }
-    else {
-      item.briefName = item.companyProvinceName || item.companyCityName
-    }
-    return item
+  getCustomerList(listQuery.value).then((response) => {
+    // 模拟数据
+    list.value = response.data.rows.map((item: ICustomer) => {
+      if (item.addressProvinceName && item.addressCityName) {
+        item.fullAddress = `${item.addressProvinceName}/${item.addressCityName}`
+      }
+      else if (item.addressProvinceName || item.addressCityName) {
+        item.fullAddress = item.addressProvinceName || item.addressCityName
+      }
+      else if (item.addressCountryName) {
+        item.fullAddress = item.addressCountryName
+      }
+      return item
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
   })
-  total.value = 50
-  loadingTable.value = false
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -131,7 +101,7 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    bussinessSize: '', // 业务规模
+    businessSize: '', // 业务规模
     customerName: '', // 公司名称
     customerNo: '', // 客户编号
     grade: '', // 履约评级
@@ -155,9 +125,9 @@
 const cancle = () => {
   emits('changeVisible', false)
 }
+
 // 点击确定
 const clickConfirm = () => {
-  console.log(checkoutList.value)
   if (!checkoutList.value.length) {
     ElMessage({
       message: '请选中',
diff --git a/src/views/customer/sample/overTime/detail.vue b/src/views/customer/sample/overTime/detail.vue
index f553724..1adcbf8 100644
--- a/src/views/customer/sample/overTime/detail.vue
+++ b/src/views/customer/sample/overTime/detail.vue
@@ -184,6 +184,7 @@
 const getInfo = () => {
   getSapmleDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data
+    dataForm.value.ABC = res.data.abc
     for (const item of menu) {
       item.searchFunc()
     }

diff --git a/src/api/customer/overtime.ts b/src/api/customer/overtime.ts
deleted file mode 100644
index 9f349d6..0000000
--- a/src/api/customer/overtime.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * 到期样品接口
- */
-import request from '../index'
-import type { IOvertimeListQuery } from '@/views/customer/sample/overTime/overtime_list_interface'
-const prefix = '/meter'
-
-// 列表查询
-export function getOverTimeList(data: IOvertimeListQuery) {
-  return request({
-    url: `${prefix}/sample/overtime/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 导出列表
-export function exportOverTimeList(data: Omit<IOvertimeListQuery, 'limit' | 'offset'>) {
-  return request({
-    url: `${prefix}/sample/overtime/listExport`,
-    method: 'post',
-    responseType: 'blob',
-    data,
-  })
-}
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index 2610494..21a9c9e 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -59,3 +59,20 @@
   })
 }
 
+// 查询检定记录
+export function getMesureRecords(data: { id: string }) {
+  return request({
+    url: `${prefix}/sample/mesureRecordsBySampleId`,
+    method: 'post',
+    data,
+  })
+}
+
+// 查询检定证书
+export function getCertification(data: { id: string }) {
+  return request({
+    url: `${prefix}/sample/certificationBySampleId`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components.d.ts b/src/components.d.ts
index 227585d..90f2dde 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -21,6 +21,7 @@
     BarCodeBind: typeof import('./components/BarCodeBind/index.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
+    ButtonBox: typeof import('./components/buttonBox/buttonBox.vue')['default']
     CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default']
     CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
diff --git a/src/components/buttonBox/buttonBox.vue b/src/components/buttonBox/buttonBox.vue
new file mode 100644
index 0000000..cf93686
--- /dev/null
+++ b/src/components/buttonBox/buttonBox.vue
@@ -0,0 +1,49 @@
+<!-- 列表页右上角按钮组 -->
+<script lang="ts" setup name="ButtonBox">
+import type { PropType } from 'vue'
+import { ref } from 'vue'
+import type { IMenu } from '../../views/device/receive/receive'
+
+const props = defineProps({
+  active: String,
+  menu: {
+    type: Array as PropType<IMenu[]>,
+  },
+})
+const emits = defineEmits(['changeCurrentButton'])
+
+const current = ref('')
+watch(current, (newValue) => {
+  emits('changeCurrentButton', newValue)
+})
+watch(() => props.active, (newValue) => {
+  current.value = newValue!
+  console.log('pppppp', newValue)
+})
+</script>
+
+<template>
+  <div class="container">
+    <div class="btns">
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.id" :label="item.id">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 69px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 36f5104..fb6758e 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -481,7 +481,7 @@
       {
         path: 'applyList',
         name: 'ApplyList',
-        component: () => import('@/views/device/receive/applyList.vue'),
+        component: () => import('@/views/device/receive/apply/applyList.vue'),
         meta: {
           title: '设备领用申请',
           icon: 'ep:key',
@@ -491,7 +491,7 @@
       {
         path: ':type',
         name: 'ApplyListDetail',
-        component: () => import('@/views/device/receive/createOrCheck.vue'),
+        component: () => import('@/views/device/receive/apply/applyEdit.vue'),
         meta: {
           title: '设备领用申请',
           icon: 'ep:key',
@@ -503,7 +503,7 @@
       {
         path: 'solveList',
         name: 'SolveList',
-        component: () => import('@/views/device/receive/solveList.vue'),
+        component: () => import('@/views/device/receive/solve/solveList.vue'),
         meta: {
           title: '设备领用处理',
           icon: 'ep:key',
@@ -513,7 +513,7 @@
       {
         path: 'solveDetail',
         name: 'SolveListDetail',
-        component: () => import('@/views/device/receive/solveComponent/detail.vue'),
+        component: () => import('@/views/device/receive/solve/solveDetail.vue'),
         meta: {
           title: '设备领用处理',
           icon: 'ep:key',
diff --git a/src/views/customer/bench/bench.vue b/src/views/customer/bench/bench.vue
index 6b502fc..3b8f274 100644
--- a/src/views/customer/bench/bench.vue
+++ b/src/views/customer/bench/bench.vue
@@ -1,15 +1,53 @@
 <script lang="ts" setup name="DeviceBench">
-import { getCurrentInstance, ref } from 'vue'
+import { ref } from 'vue'
 import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
 import type { planReturn } from './bench-interface'
 import Linechart from '@/components/Echart/LineChart.vue'
 import type { lineDataI } from '@/components/Echart/echart-interface'
 import { getCustomerExpireData, getHighQualityCustomerList, getSampleAddData, getSampleExpireData } from '@/api/customer/bench'
+import { getSampleList } from '@/api/customer/sampleList'
+import type { IOvertimeListQuery } from '@/views/customer/sample/overTime/overtime_list_interface'
+import { getAdviceList } from '@/api/customer/advice'
+import type { IAdvice, IAdviceQuery } from '@/views/customer/advice/advice_interface'
 
+const reg = /(\d{4})\年(\d{2})月/ // 把2022年3月转为2022-03
 // 每个展示块高度
 const blockHeight = ref(300)
 const blockWidth = ref(400)
-const { proxy } = getCurrentInstance() as any
+
+// 到期样品查询条件
+const dueSampleListQuery: Ref<IOvertimeListQuery> = ref({
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 型号
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  startTime: '', // 检定开始时间
+  endTime: '', // 检定结束时间
+  overtimeStatus: '1', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+  offset: 1,
+  limit: 20,
+})
+
+// 客户关系查询条件
+const customerRelationsListQuery: Ref<IAdviceQuery> = ref({
+  adviceNo: '', // 投诉编号
+  customerName: '', // 公司名称
+  customerNo: '', // 客户编号
+  startTime: '', // 投诉开始时间
+  endTime: '', // 投诉结束时间
+  offset: 1,
+  limit: 20,
+})
+
+const dueSampleTableLoading = ref(false) // 到期样品表格loading
+const customerRelationsTableLoading = ref(false) // 客户关系loading
+const sampleAddLoading = ref(false) // 样品新增趋势loading
+const customerAddLoading = ref(false) // 客户新增趋势loading
+const sampleExpireLoading = ref(false) // 样品到期趋势loading
+const highQualityCustomerLoading = ref(false) // 优质客户名单loading
+
 // 到期样品表格数据
 const dueSampleTableData = ref()
 // 到期样品表头
@@ -64,54 +102,81 @@
   blockWidth.value = (document.body.clientWidth - 180 - 20 - 20) / 3
   console.log(blockHeight.value, blockWidth.value - 20)
 }
+
 window.addEventListener('resize', () => {
   calcBlockSize()
 })
 
 // 获取样品新增趋势数据
 function fetchSampleAddData() {
+  sampleAddLoading.value = true
   getSampleAddData().then((res) => {
-    sampleAddXData.value = res.data.map((item: planReturn) => {
-      // return item.date.replace('年', '-')
-      return item.date
-    })
+    sampleAddXData.value = res.data.map((item: planReturn) => item.date.replace(reg, '$1-$2'))
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     sampleAddYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
-    sampleAddData.value = [{ name: '客户', data: yValue }]
+    sampleAddData.value = [{ name: '样品', data: yValue }]
+    sampleAddLoading.value = false
   })
 }
 
 // 获取样品到期趋势数据
 function fetchSampleExpireData() {
+  sampleExpireLoading.value = true
   getSampleExpireData().then((res) => {
-    sampleExpireXData.value = res.data.map((item: planReturn) => item.date)
+    sampleExpireXData.value = res.data.map((item: planReturn) => item.date.replace(reg, '$1-$2'))
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     sampleExpireYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
-    sampleExpireData.value = [{ name: '客户', data: yValue }]
+    sampleExpireData.value = [{ name: '样品', data: yValue }]
+    sampleExpireLoading.value = false
   })
 }
 
 // 获取优质客户名单
 function fetchHighQualityCustomerList() {
+  highQualityCustomerLoading.value = true
   getHighQualityCustomerList().then((res) => {
     highQualityCustomerTableData.value = res.data.rows
+    highQualityCustomerLoading.value = false
   })
 }
 // 获取客户新增趋势数据
 function fetchCustomerExpireData() {
+  customerAddLoading.value = true
   getCustomerExpireData().then((res) => {
-    customerAddXData.value = res.data.map((item: planReturn) => item.date)
+    customerAddXData.value = res.data.map((item: planReturn) => item.date.replace(reg, '$1-$2'))
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     customerAddYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
     customerAddData.value = [{ name: '客户', data: yValue }]
+    customerAddLoading.value = false
   })
 }
 
 // 获取到期样品表格数据
+function fetchDueSampleTableData() {
+  dueSampleTableLoading.value = true
+  getSampleList(dueSampleListQuery.value).then((response) => {
+    dueSampleTableData.value = response.data.rows
+    dueSampleTableLoading.value = false
+  })
+}
 // 获取客户关系表格数据
+function fetchcustomerRelationsTableData() {
+  customerRelationsTableLoading.value = true
+  getAdviceList(customerRelationsListQuery.value).then((res) => {
+    customerRelationsTabledata.value = res.data.rows.map((item: IAdvice) => {
+      return {
+        ...item,
+        adviceClass: item.adviceClass === '0' ? '建议' : item.adviceClass === '1' ? '投诉' : '其他',
+      }
+    })
+    customerRelationsTableLoading.value = false
+  })
+}
 
 onMounted(() => {
   calcBlockSize()
+  fetchDueSampleTableData() // 到期样品表格
+  fetchcustomerRelationsTableData() // 客户关系表格
   fetchSampleAddData()// 样品新增趋势
   fetchSampleExpireData()// 样品到期趋势
   fetchCustomerExpireData()// 客户新增趋势
@@ -125,6 +190,7 @@
       <el-row :gutter="10">
         <el-col :span="8">
           <bench-col
+            v-loading="dueSampleTableLoading"
             icon="icon-book"
             title="到期样品"
             path-url="/sample/overtime"
@@ -145,6 +211,7 @@
         </el-col>
         <el-col :span="8">
           <bench-col
+            v-loading="sampleAddLoading"
             icon="icon-line"
             title="样品新增趋势"
             :height="blockHeight"
@@ -159,6 +226,7 @@
         </el-col>
         <el-col :span="8">
           <bench-col
+            v-loading="sampleExpireLoading"
             icon="icon-line"
             title="样品到期趋势"
             :height="blockHeight"
@@ -177,6 +245,7 @@
       <el-row :gutter="10">
         <el-col :span="8">
           <bench-col
+            v-loading="customerRelationsTableLoading"
             icon="icon-book"
             title="客户关系"
             path-url="/customerManage/advice"
@@ -197,6 +266,7 @@
         </el-col>
         <el-col :span="8">
           <bench-col
+            v-loading="customerAddLoading"
             icon="icon-line"
             title="客户新增趋势"
             :height="blockHeight"
@@ -211,6 +281,7 @@
         </el-col>
         <el-col :span="8">
           <bench-col
+            v-loading="highQualityCustomerLoading"
             icon="icon-book"
             title="优质客户名单"
             :style="{ height: blockHeight }"
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index e7d1acb..359c94d 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -8,7 +8,7 @@
 import selectCustomer from './selectCustomer.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import { addSample, getCertification, getMesureRecords, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
@@ -69,6 +69,7 @@
   sampleName: '', // 样品名称
   sampleModel: '', // 样品型号
   manufacturingNo: '', // 出厂编号
+  customerId: '', // 委托方id
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   phone: '', // 委托方电话
@@ -138,12 +139,17 @@
 })
 
 // 获取检定记录
-const fetchMeasureRecords = function (query = null) {
-  dataList.value.measureRecords = []
+const fetchMeasureRecords = (query = null) => {
+  getMesureRecords({ id: infoId.value }).then((res) => {
+    dataList.value.measureRecords = res.data.rows
+  })
 }
+
 // 获取检定证书
-const fetchCertifications = function (query = null) {
-  dataList.value.certificationRecords = []
+const fetchCertifications = (query = null) => {
+  getCertification({ id: infoId.value }).then((res) => {
+    dataList.value.certificationRecords = res.data.rows
+  })
 }
 
 // 菜单
@@ -151,12 +157,12 @@
   {
     name: '检定记录',
     columns: [
-      { text: '委托单编号', value: 'orderCode' },
-      { text: '委托单日期', value: 'orderTime' },
-      { text: '委托方代码', value: 'customerCode' },
-      { text: '委托方名称', value: 'customerName' },
-      { text: '送检人', value: 'deliverer' },
-      { text: '送检日期', value: 'deliverTime' },
+      { text: '委托单编号', value: 'orderCode', align: 'center' },
+      { text: '委托单日期', value: 'orderTime', align: 'center' },
+      { text: '委托方代码', value: 'customerCode', align: 'center' },
+      { text: '委托方名称', value: 'customerName', align: 'center' },
+      { text: '送检人', value: 'deliverer', align: 'center' },
+      { text: '送检日期', value: 'deliverTime', align: 'center' },
     ],
     list: 'measureRecords',
     pagination: true,
@@ -165,11 +171,11 @@
   {
     name: '检定证书',
     columns: [
-      { text: '证书编号', value: 'certificationCode' },
-      { text: '证书名称', value: 'certificationName' },
-      { text: '证书类型', value: 'certificationType' },
-      { text: '证书出具日期', value: 'effectiveDate' },
-      { text: '证书有效期', value: 'expirationDate' },
+      { text: '证书编号', value: 'certificationCode', align: 'center' },
+      { text: '证书名称', value: 'certificationName', align: 'center' },
+      { text: '证书类型', value: 'certificationType', align: 'center' },
+      { text: '证书出具日期', value: 'effectiveDate', align: 'center' },
+      { text: '证书有效期', value: 'expirationDate', align: 'center' },
     ],
     list: 'certificationRecords',
     pagination: true,
@@ -233,18 +239,18 @@
 // 委托方代码获取焦点
 const customerNoFocus = () => {
   visible.value = true
-  console.log(visible.value)
 }
 
 // 选好委托方
 const confirmCheckout = (val: Array<ICustomer>) => {
   if (val && val.length) {
     const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo
-    dataForm.value.customerName = getValue.customerName
-    dataForm.value.phone = getValue.phone
-    dataForm.value.postalCode = getValue.postalCode
-    dataForm.value.customerAddress = getValue.briefName
+    dataForm.value.customerNo = getValue.customerNo // 委托方代码
+    dataForm.value.customerId = getValue.id // 委托方id
+    dataForm.value.customerName = getValue.customerName // 委托方名称
+    dataForm.value.phone = getValue.phone // 电话
+    dataForm.value.postalCode = getValue.postalCode // 邮编
+    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
   }
 }
 
@@ -296,6 +302,7 @@
 const getInfo = () => {
   getSapmleDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data
+    dataForm.value.ABC = res.data.abc
     for (const item of menu) {
       item.searchFunc()
     }
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index a2c4307..c3690d4 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -35,6 +35,7 @@
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center', width: '180px' },
 ])
 // 表格数据
@@ -47,6 +48,7 @@
 const checkoutList = ref<string[]>([])
 // 文件上传input
 const fileRef = ref()
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -62,6 +64,7 @@
     loadingTable.value = false
   })
 }
+
 // 多选发生改变时
 function handleSelectionChange(e: any) {
   checkoutList.value = e.map((item: { id: string }) => item.id)
@@ -71,6 +74,7 @@
 const handleEdit = (row: ISampleList, pageType: 'edit' | 'detail') => {
   $router.push(`/sample/${pageType}/${row.id}`)
 }
+
 // 点击删除
 const handleDelete = (row: ISampleList) => {
   ElMessageBox.confirm(
@@ -94,10 +98,12 @@
       })
     })
 }
+
 // 点击搜索
 const searchList = () => {
   fetchData(true)
 }
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -112,7 +118,7 @@
     offset: 1,
     limit: 20,
   }
-  timeRange.value = ['', '']
+  timeRange.value = ['', ''] // 置空筛选时间
   fetchData(true)
 }
 
@@ -138,10 +144,12 @@
     ElMessage.error('请上传pdf格式')
   }
 }
+
 // 模板下载
 const templateDownload = () => {
 
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -157,10 +165,12 @@
 const uploadAll = () => {
   fileRef.value.click()
 }
+
 // 新建样品
 const add = () => {
   $router.push('/sample/add')
 }
+
 // 导出
 const exportAll = () => {
   const loading = ElLoading.service({
@@ -293,11 +303,13 @@
         <template #columns>
           <el-table-column label="操作" align="center" fixed="right" width="120">
             <template #default="{ row }">
+              <!-- 有orderid(关联了委托书)不允许编辑 -->
               <el-button
                 v-if="proxy.hasPerm('/sample/list/update')"
                 size="small"
                 type="primary"
                 link
+                :disabled="`${row.orderId}` !== ''"
                 @click="handleEdit(row, 'edit')"
               >
                 编辑
@@ -310,11 +322,13 @@
               >
                 详情
               </el-button>
+              <!-- 检测中的样品不允许删除 -->
               <el-button
                 v-if="proxy.hasPerm('/sample/list/delete')"
                 size="small"
                 link
                 type="danger"
+                :disabled="row.sampleSatus !== '3'"
                 @click="handleDelete(row)"
               >
                 删除
diff --git a/src/views/customer/sample/list/sample_list_interface.ts b/src/views/customer/sample/list/sample_list_interface.ts
index 707c8b5..81498a5 100644
--- a/src/views/customer/sample/list/sample_list_interface.ts
+++ b/src/views/customer/sample/list/sample_list_interface.ts
@@ -33,6 +33,7 @@
   sampleModel: string // 样品型号
   manufacturingNo: string // 出厂编号
   customerNo: string // 委托方代码
+  customerId: string // 委托方id
   customerName: string // 委托方名称
   phone: string // 委托方电话
   postalCode: string // 委托方邮编
diff --git a/src/views/customer/sample/list/selectCustomer.vue b/src/views/customer/sample/list/selectCustomer.vue
index 5de352d..0eef7d0 100644
--- a/src/views/customer/sample/list/selectCustomer.vue
+++ b/src/views/customer/sample/list/selectCustomer.vue
@@ -6,7 +6,8 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getCustomerList } from '@/api/customer/customer'
 import { getDictByCode } from '@/api/system/dict'
-const props = defineProps({
+
+defineProps({
   visible: {
     type: Boolean,
     default: false,
@@ -14,18 +15,9 @@
 })
 const emits = defineEmits(['changeVisible', 'confirmCheckout'])
 
-const visibleDialog = computed({
-  get() {
-    return props.visible
-  },
-  set(val) {
-    emits('changeVisible', val)
-  },
-})
-
 // 查询条件
 const listQuery: Ref<ICustomerQuery> = ref({
-  bussinessSize: '', // 业务规模
+  businessSize: '', // 业务规模
   customerName: '', // 公司名称
   customerNo: '', // 客户编号
   grade: '', // 履约评级
@@ -37,40 +29,20 @@
   name: string
   value: string
 }
-// const companySizeList = ref<dictType[]>([]) // 公司规模列表
+
 const businessSizeList = ref<dictType[]>([]) // 业务规模列表
 const gradeList = ref<dictType[]>([]) // 履约评级列表
-// const evaluationList = ref<dictType[]>([]) // 整体评价列表
-function getDict() {
-  // // 获取公司规模
-  // getDictByCode('companySize').then((response) => {
-  //   companySizeList.value = response.data
-  // })
-  // 获取业务规模
-  getDictByCode('businessSize').then((response) => {
-    businessSizeList.value = response.data
-  })
-  // 获取履约评级
-  getDictByCode('grade').then((response) => {
-    gradeList.value = response.data
-  })
-  // // 获取整体评价
-  // getDictByCode('evaluation').then((response) => {
-  //   evaluationList.value = response.data
-  // })
-}
-getDict()
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '客户编号', value: 'customerNo', width: '160', align: 'center', fixed: true },
-  { text: '客户名称', value: 'customerName', width: '120', align: 'center', fixed: true },
-  { text: '公司规模', value: 'companySizeName', align: 'center', fixed: false },
-  { text: '业务规模', value: 'businessSizeName', align: 'center', fixed: false },
-  { text: '履约评级', value: 'gradeName', align: 'center', fixed: false },
-  { text: '整体评价', value: 'evaluationName', align: 'center', fixed: false },
-  { text: '公司地址', value: 'briefName', align: 'center', fixed: false },
-  { text: '创建时间', value: 'createTime', align: 'center', width: '180px', fixed: false },
-  { text: '备注', value: 'remark', align: 'center', fixed: false },
+  { text: '客户名称', value: 'customerName', align: 'center', fixed: true },
+  { text: '公司规模', value: 'companySizeName', width: '110', align: 'center' },
+  { text: '业务规模', value: 'businessSizeName', width: '130', align: 'center' },
+  { text: '履约评级', value: 'gradeName', width: '90', align: 'center' },
+  { text: '整体评价', value: 'evaluationName', width: '110', align: 'center' },
+  { text: '公司地址', value: 'fullAddress', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
+  { text: '备注', value: 'remark', align: 'center' },
 ])
 // 表格数据
 const list = ref<ICustomer[]>([])
@@ -81,44 +53,42 @@
 // 选中的内容
 const checkoutList = ref<string[]>([])
 
-// 数据查询
+function getDict() {
+  // 获取业务规模
+  getDictByCode('businessSize').then((response) => {
+    businessSizeList.value = response.data
+  })
+  // 获取履约评级
+  getDictByCode('grade').then((response) => {
+    gradeList.value = response.data
+  })
+}
+getDict()
+
+// 表格数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getCustomerList(listQuery.value).then((response) => {
-  //   // 模拟数据
-  //   response.data.rows = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', customerAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  //   list.value = response.data.rows.map((item: ICustomer) => {
-  //     if (item.companyProvinceName && item.companyCityName) {
-  //       item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-  //     }
-  //     else {
-  //       item.briefName = item.companyProvinceName || item.companyCityName
-  //     }
-  //     return item
-  //   })
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-
-  // 模拟数据
-  const response = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', customerAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' },
-    { bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', customerAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '2集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' },
-    { bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', customerAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '3集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  list.value = response.map((item: ICustomer) => {
-    if (item.companyProvinceName && item.companyCityName) {
-      item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-    }
-    else {
-      item.briefName = item.companyProvinceName || item.companyCityName
-    }
-    return item
+  getCustomerList(listQuery.value).then((response) => {
+    // 模拟数据
+    list.value = response.data.rows.map((item: ICustomer) => {
+      if (item.addressProvinceName && item.addressCityName) {
+        item.fullAddress = `${item.addressProvinceName}/${item.addressCityName}`
+      }
+      else if (item.addressProvinceName || item.addressCityName) {
+        item.fullAddress = item.addressProvinceName || item.addressCityName
+      }
+      else if (item.addressCountryName) {
+        item.fullAddress = item.addressCountryName
+      }
+      return item
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
   })
-  total.value = 50
-  loadingTable.value = false
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -131,7 +101,7 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    bussinessSize: '', // 业务规模
+    businessSize: '', // 业务规模
     customerName: '', // 公司名称
     customerNo: '', // 客户编号
     grade: '', // 履约评级
@@ -155,9 +125,9 @@
 const cancle = () => {
   emits('changeVisible', false)
 }
+
 // 点击确定
 const clickConfirm = () => {
-  console.log(checkoutList.value)
   if (!checkoutList.value.length) {
     ElMessage({
       message: '请选中',
diff --git a/src/views/customer/sample/overTime/detail.vue b/src/views/customer/sample/overTime/detail.vue
index f553724..1adcbf8 100644
--- a/src/views/customer/sample/overTime/detail.vue
+++ b/src/views/customer/sample/overTime/detail.vue
@@ -184,6 +184,7 @@
 const getInfo = () => {
   getSapmleDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data
+    dataForm.value.ABC = res.data.abc
     for (const item of menu) {
       item.searchFunc()
     }
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index c8f90a1..05fe276 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -19,8 +19,8 @@
   sampleModel: '', // 型号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
-  startTime: '1', // 检定开始时间
-  endTime: '1', // 检定结束时间
+  startTime: '', // 检定开始时间
+  endTime: '', // 检定结束时间
   overtimeStatus: '1', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
   offset: 1,
   limit: 20,

diff --git a/src/api/customer/overtime.ts b/src/api/customer/overtime.ts
deleted file mode 100644
index 9f349d6..0000000
--- a/src/api/customer/overtime.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * 到期样品接口
- */
-import request from '../index'
-import type { IOvertimeListQuery } from '@/views/customer/sample/overTime/overtime_list_interface'
-const prefix = '/meter'
-
-// 列表查询
-export function getOverTimeList(data: IOvertimeListQuery) {
-  return request({
-    url: `${prefix}/sample/overtime/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 导出列表
-export function exportOverTimeList(data: Omit<IOvertimeListQuery, 'limit' | 'offset'>) {
-  return request({
-    url: `${prefix}/sample/overtime/listExport`,
-    method: 'post',
-    responseType: 'blob',
-    data,
-  })
-}
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index 2610494..21a9c9e 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -59,3 +59,20 @@
   })
 }
 
+// 查询检定记录
+export function getMesureRecords(data: { id: string }) {
+  return request({
+    url: `${prefix}/sample/mesureRecordsBySampleId`,
+    method: 'post',
+    data,
+  })
+}
+
+// 查询检定证书
+export function getCertification(data: { id: string }) {
+  return request({
+    url: `${prefix}/sample/certificationBySampleId`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components.d.ts b/src/components.d.ts
index 227585d..90f2dde 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -21,6 +21,7 @@
     BarCodeBind: typeof import('./components/BarCodeBind/index.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
+    ButtonBox: typeof import('./components/buttonBox/buttonBox.vue')['default']
     CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default']
     CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
diff --git a/src/components/buttonBox/buttonBox.vue b/src/components/buttonBox/buttonBox.vue
new file mode 100644
index 0000000..cf93686
--- /dev/null
+++ b/src/components/buttonBox/buttonBox.vue
@@ -0,0 +1,49 @@
+<!-- 列表页右上角按钮组 -->
+<script lang="ts" setup name="ButtonBox">
+import type { PropType } from 'vue'
+import { ref } from 'vue'
+import type { IMenu } from '../../views/device/receive/receive'
+
+const props = defineProps({
+  active: String,
+  menu: {
+    type: Array as PropType<IMenu[]>,
+  },
+})
+const emits = defineEmits(['changeCurrentButton'])
+
+const current = ref('')
+watch(current, (newValue) => {
+  emits('changeCurrentButton', newValue)
+})
+watch(() => props.active, (newValue) => {
+  current.value = newValue!
+  console.log('pppppp', newValue)
+})
+</script>
+
+<template>
+  <div class="container">
+    <div class="btns">
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.id" :label="item.id">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 69px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 36f5104..fb6758e 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -481,7 +481,7 @@
       {
         path: 'applyList',
         name: 'ApplyList',
-        component: () => import('@/views/device/receive/applyList.vue'),
+        component: () => import('@/views/device/receive/apply/applyList.vue'),
         meta: {
           title: '设备领用申请',
           icon: 'ep:key',
@@ -491,7 +491,7 @@
       {
         path: ':type',
         name: 'ApplyListDetail',
-        component: () => import('@/views/device/receive/createOrCheck.vue'),
+        component: () => import('@/views/device/receive/apply/applyEdit.vue'),
         meta: {
           title: '设备领用申请',
           icon: 'ep:key',
@@ -503,7 +503,7 @@
       {
         path: 'solveList',
         name: 'SolveList',
-        component: () => import('@/views/device/receive/solveList.vue'),
+        component: () => import('@/views/device/receive/solve/solveList.vue'),
         meta: {
           title: '设备领用处理',
           icon: 'ep:key',
@@ -513,7 +513,7 @@
       {
         path: 'solveDetail',
         name: 'SolveListDetail',
-        component: () => import('@/views/device/receive/solveComponent/detail.vue'),
+        component: () => import('@/views/device/receive/solve/solveDetail.vue'),
         meta: {
           title: '设备领用处理',
           icon: 'ep:key',
diff --git a/src/views/customer/bench/bench.vue b/src/views/customer/bench/bench.vue
index 6b502fc..3b8f274 100644
--- a/src/views/customer/bench/bench.vue
+++ b/src/views/customer/bench/bench.vue
@@ -1,15 +1,53 @@
 <script lang="ts" setup name="DeviceBench">
-import { getCurrentInstance, ref } from 'vue'
+import { ref } from 'vue'
 import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
 import type { planReturn } from './bench-interface'
 import Linechart from '@/components/Echart/LineChart.vue'
 import type { lineDataI } from '@/components/Echart/echart-interface'
 import { getCustomerExpireData, getHighQualityCustomerList, getSampleAddData, getSampleExpireData } from '@/api/customer/bench'
+import { getSampleList } from '@/api/customer/sampleList'
+import type { IOvertimeListQuery } from '@/views/customer/sample/overTime/overtime_list_interface'
+import { getAdviceList } from '@/api/customer/advice'
+import type { IAdvice, IAdviceQuery } from '@/views/customer/advice/advice_interface'
 
+const reg = /(\d{4})\年(\d{2})月/ // 把2022年3月转为2022-03
 // 每个展示块高度
 const blockHeight = ref(300)
 const blockWidth = ref(400)
-const { proxy } = getCurrentInstance() as any
+
+// 到期样品查询条件
+const dueSampleListQuery: Ref<IOvertimeListQuery> = ref({
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 型号
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  startTime: '', // 检定开始时间
+  endTime: '', // 检定结束时间
+  overtimeStatus: '1', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+  offset: 1,
+  limit: 20,
+})
+
+// 客户关系查询条件
+const customerRelationsListQuery: Ref<IAdviceQuery> = ref({
+  adviceNo: '', // 投诉编号
+  customerName: '', // 公司名称
+  customerNo: '', // 客户编号
+  startTime: '', // 投诉开始时间
+  endTime: '', // 投诉结束时间
+  offset: 1,
+  limit: 20,
+})
+
+const dueSampleTableLoading = ref(false) // 到期样品表格loading
+const customerRelationsTableLoading = ref(false) // 客户关系loading
+const sampleAddLoading = ref(false) // 样品新增趋势loading
+const customerAddLoading = ref(false) // 客户新增趋势loading
+const sampleExpireLoading = ref(false) // 样品到期趋势loading
+const highQualityCustomerLoading = ref(false) // 优质客户名单loading
+
 // 到期样品表格数据
 const dueSampleTableData = ref()
 // 到期样品表头
@@ -64,54 +102,81 @@
   blockWidth.value = (document.body.clientWidth - 180 - 20 - 20) / 3
   console.log(blockHeight.value, blockWidth.value - 20)
 }
+
 window.addEventListener('resize', () => {
   calcBlockSize()
 })
 
 // 获取样品新增趋势数据
 function fetchSampleAddData() {
+  sampleAddLoading.value = true
   getSampleAddData().then((res) => {
-    sampleAddXData.value = res.data.map((item: planReturn) => {
-      // return item.date.replace('年', '-')
-      return item.date
-    })
+    sampleAddXData.value = res.data.map((item: planReturn) => item.date.replace(reg, '$1-$2'))
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     sampleAddYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
-    sampleAddData.value = [{ name: '客户', data: yValue }]
+    sampleAddData.value = [{ name: '样品', data: yValue }]
+    sampleAddLoading.value = false
   })
 }
 
 // 获取样品到期趋势数据
 function fetchSampleExpireData() {
+  sampleExpireLoading.value = true
   getSampleExpireData().then((res) => {
-    sampleExpireXData.value = res.data.map((item: planReturn) => item.date)
+    sampleExpireXData.value = res.data.map((item: planReturn) => item.date.replace(reg, '$1-$2'))
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     sampleExpireYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
-    sampleExpireData.value = [{ name: '客户', data: yValue }]
+    sampleExpireData.value = [{ name: '样品', data: yValue }]
+    sampleExpireLoading.value = false
   })
 }
 
 // 获取优质客户名单
 function fetchHighQualityCustomerList() {
+  highQualityCustomerLoading.value = true
   getHighQualityCustomerList().then((res) => {
     highQualityCustomerTableData.value = res.data.rows
+    highQualityCustomerLoading.value = false
   })
 }
 // 获取客户新增趋势数据
 function fetchCustomerExpireData() {
+  customerAddLoading.value = true
   getCustomerExpireData().then((res) => {
-    customerAddXData.value = res.data.map((item: planReturn) => item.date)
+    customerAddXData.value = res.data.map((item: planReturn) => item.date.replace(reg, '$1-$2'))
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     customerAddYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
     customerAddData.value = [{ name: '客户', data: yValue }]
+    customerAddLoading.value = false
   })
 }
 
 // 获取到期样品表格数据
+function fetchDueSampleTableData() {
+  dueSampleTableLoading.value = true
+  getSampleList(dueSampleListQuery.value).then((response) => {
+    dueSampleTableData.value = response.data.rows
+    dueSampleTableLoading.value = false
+  })
+}
 // 获取客户关系表格数据
+function fetchcustomerRelationsTableData() {
+  customerRelationsTableLoading.value = true
+  getAdviceList(customerRelationsListQuery.value).then((res) => {
+    customerRelationsTabledata.value = res.data.rows.map((item: IAdvice) => {
+      return {
+        ...item,
+        adviceClass: item.adviceClass === '0' ? '建议' : item.adviceClass === '1' ? '投诉' : '其他',
+      }
+    })
+    customerRelationsTableLoading.value = false
+  })
+}
 
 onMounted(() => {
   calcBlockSize()
+  fetchDueSampleTableData() // 到期样品表格
+  fetchcustomerRelationsTableData() // 客户关系表格
   fetchSampleAddData()// 样品新增趋势
   fetchSampleExpireData()// 样品到期趋势
   fetchCustomerExpireData()// 客户新增趋势
@@ -125,6 +190,7 @@
       <el-row :gutter="10">
         <el-col :span="8">
           <bench-col
+            v-loading="dueSampleTableLoading"
             icon="icon-book"
             title="到期样品"
             path-url="/sample/overtime"
@@ -145,6 +211,7 @@
         </el-col>
         <el-col :span="8">
           <bench-col
+            v-loading="sampleAddLoading"
             icon="icon-line"
             title="样品新增趋势"
             :height="blockHeight"
@@ -159,6 +226,7 @@
         </el-col>
         <el-col :span="8">
           <bench-col
+            v-loading="sampleExpireLoading"
             icon="icon-line"
             title="样品到期趋势"
             :height="blockHeight"
@@ -177,6 +245,7 @@
       <el-row :gutter="10">
         <el-col :span="8">
           <bench-col
+            v-loading="customerRelationsTableLoading"
             icon="icon-book"
             title="客户关系"
             path-url="/customerManage/advice"
@@ -197,6 +266,7 @@
         </el-col>
         <el-col :span="8">
           <bench-col
+            v-loading="customerAddLoading"
             icon="icon-line"
             title="客户新增趋势"
             :height="blockHeight"
@@ -211,6 +281,7 @@
         </el-col>
         <el-col :span="8">
           <bench-col
+            v-loading="highQualityCustomerLoading"
             icon="icon-book"
             title="优质客户名单"
             :style="{ height: blockHeight }"
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index e7d1acb..359c94d 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -8,7 +8,7 @@
 import selectCustomer from './selectCustomer.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import { addSample, getCertification, getMesureRecords, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
@@ -69,6 +69,7 @@
   sampleName: '', // 样品名称
   sampleModel: '', // 样品型号
   manufacturingNo: '', // 出厂编号
+  customerId: '', // 委托方id
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   phone: '', // 委托方电话
@@ -138,12 +139,17 @@
 })
 
 // 获取检定记录
-const fetchMeasureRecords = function (query = null) {
-  dataList.value.measureRecords = []
+const fetchMeasureRecords = (query = null) => {
+  getMesureRecords({ id: infoId.value }).then((res) => {
+    dataList.value.measureRecords = res.data.rows
+  })
 }
+
 // 获取检定证书
-const fetchCertifications = function (query = null) {
-  dataList.value.certificationRecords = []
+const fetchCertifications = (query = null) => {
+  getCertification({ id: infoId.value }).then((res) => {
+    dataList.value.certificationRecords = res.data.rows
+  })
 }
 
 // 菜单
@@ -151,12 +157,12 @@
   {
     name: '检定记录',
     columns: [
-      { text: '委托单编号', value: 'orderCode' },
-      { text: '委托单日期', value: 'orderTime' },
-      { text: '委托方代码', value: 'customerCode' },
-      { text: '委托方名称', value: 'customerName' },
-      { text: '送检人', value: 'deliverer' },
-      { text: '送检日期', value: 'deliverTime' },
+      { text: '委托单编号', value: 'orderCode', align: 'center' },
+      { text: '委托单日期', value: 'orderTime', align: 'center' },
+      { text: '委托方代码', value: 'customerCode', align: 'center' },
+      { text: '委托方名称', value: 'customerName', align: 'center' },
+      { text: '送检人', value: 'deliverer', align: 'center' },
+      { text: '送检日期', value: 'deliverTime', align: 'center' },
     ],
     list: 'measureRecords',
     pagination: true,
@@ -165,11 +171,11 @@
   {
     name: '检定证书',
     columns: [
-      { text: '证书编号', value: 'certificationCode' },
-      { text: '证书名称', value: 'certificationName' },
-      { text: '证书类型', value: 'certificationType' },
-      { text: '证书出具日期', value: 'effectiveDate' },
-      { text: '证书有效期', value: 'expirationDate' },
+      { text: '证书编号', value: 'certificationCode', align: 'center' },
+      { text: '证书名称', value: 'certificationName', align: 'center' },
+      { text: '证书类型', value: 'certificationType', align: 'center' },
+      { text: '证书出具日期', value: 'effectiveDate', align: 'center' },
+      { text: '证书有效期', value: 'expirationDate', align: 'center' },
     ],
     list: 'certificationRecords',
     pagination: true,
@@ -233,18 +239,18 @@
 // 委托方代码获取焦点
 const customerNoFocus = () => {
   visible.value = true
-  console.log(visible.value)
 }
 
 // 选好委托方
 const confirmCheckout = (val: Array<ICustomer>) => {
   if (val && val.length) {
     const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo
-    dataForm.value.customerName = getValue.customerName
-    dataForm.value.phone = getValue.phone
-    dataForm.value.postalCode = getValue.postalCode
-    dataForm.value.customerAddress = getValue.briefName
+    dataForm.value.customerNo = getValue.customerNo // 委托方代码
+    dataForm.value.customerId = getValue.id // 委托方id
+    dataForm.value.customerName = getValue.customerName // 委托方名称
+    dataForm.value.phone = getValue.phone // 电话
+    dataForm.value.postalCode = getValue.postalCode // 邮编
+    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
   }
 }
 
@@ -296,6 +302,7 @@
 const getInfo = () => {
   getSapmleDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data
+    dataForm.value.ABC = res.data.abc
     for (const item of menu) {
       item.searchFunc()
     }
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index a2c4307..c3690d4 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -35,6 +35,7 @@
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center', width: '180px' },
 ])
 // 表格数据
@@ -47,6 +48,7 @@
 const checkoutList = ref<string[]>([])
 // 文件上传input
 const fileRef = ref()
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -62,6 +64,7 @@
     loadingTable.value = false
   })
 }
+
 // 多选发生改变时
 function handleSelectionChange(e: any) {
   checkoutList.value = e.map((item: { id: string }) => item.id)
@@ -71,6 +74,7 @@
 const handleEdit = (row: ISampleList, pageType: 'edit' | 'detail') => {
   $router.push(`/sample/${pageType}/${row.id}`)
 }
+
 // 点击删除
 const handleDelete = (row: ISampleList) => {
   ElMessageBox.confirm(
@@ -94,10 +98,12 @@
       })
     })
 }
+
 // 点击搜索
 const searchList = () => {
   fetchData(true)
 }
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -112,7 +118,7 @@
     offset: 1,
     limit: 20,
   }
-  timeRange.value = ['', '']
+  timeRange.value = ['', ''] // 置空筛选时间
   fetchData(true)
 }
 
@@ -138,10 +144,12 @@
     ElMessage.error('请上传pdf格式')
   }
 }
+
 // 模板下载
 const templateDownload = () => {
 
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -157,10 +165,12 @@
 const uploadAll = () => {
   fileRef.value.click()
 }
+
 // 新建样品
 const add = () => {
   $router.push('/sample/add')
 }
+
 // 导出
 const exportAll = () => {
   const loading = ElLoading.service({
@@ -293,11 +303,13 @@
         <template #columns>
           <el-table-column label="操作" align="center" fixed="right" width="120">
             <template #default="{ row }">
+              <!-- 有orderid(关联了委托书)不允许编辑 -->
               <el-button
                 v-if="proxy.hasPerm('/sample/list/update')"
                 size="small"
                 type="primary"
                 link
+                :disabled="`${row.orderId}` !== ''"
                 @click="handleEdit(row, 'edit')"
               >
                 编辑
@@ -310,11 +322,13 @@
               >
                 详情
               </el-button>
+              <!-- 检测中的样品不允许删除 -->
               <el-button
                 v-if="proxy.hasPerm('/sample/list/delete')"
                 size="small"
                 link
                 type="danger"
+                :disabled="row.sampleSatus !== '3'"
                 @click="handleDelete(row)"
               >
                 删除
diff --git a/src/views/customer/sample/list/sample_list_interface.ts b/src/views/customer/sample/list/sample_list_interface.ts
index 707c8b5..81498a5 100644
--- a/src/views/customer/sample/list/sample_list_interface.ts
+++ b/src/views/customer/sample/list/sample_list_interface.ts
@@ -33,6 +33,7 @@
   sampleModel: string // 样品型号
   manufacturingNo: string // 出厂编号
   customerNo: string // 委托方代码
+  customerId: string // 委托方id
   customerName: string // 委托方名称
   phone: string // 委托方电话
   postalCode: string // 委托方邮编
diff --git a/src/views/customer/sample/list/selectCustomer.vue b/src/views/customer/sample/list/selectCustomer.vue
index 5de352d..0eef7d0 100644
--- a/src/views/customer/sample/list/selectCustomer.vue
+++ b/src/views/customer/sample/list/selectCustomer.vue
@@ -6,7 +6,8 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getCustomerList } from '@/api/customer/customer'
 import { getDictByCode } from '@/api/system/dict'
-const props = defineProps({
+
+defineProps({
   visible: {
     type: Boolean,
     default: false,
@@ -14,18 +15,9 @@
 })
 const emits = defineEmits(['changeVisible', 'confirmCheckout'])
 
-const visibleDialog = computed({
-  get() {
-    return props.visible
-  },
-  set(val) {
-    emits('changeVisible', val)
-  },
-})
-
 // 查询条件
 const listQuery: Ref<ICustomerQuery> = ref({
-  bussinessSize: '', // 业务规模
+  businessSize: '', // 业务规模
   customerName: '', // 公司名称
   customerNo: '', // 客户编号
   grade: '', // 履约评级
@@ -37,40 +29,20 @@
   name: string
   value: string
 }
-// const companySizeList = ref<dictType[]>([]) // 公司规模列表
+
 const businessSizeList = ref<dictType[]>([]) // 业务规模列表
 const gradeList = ref<dictType[]>([]) // 履约评级列表
-// const evaluationList = ref<dictType[]>([]) // 整体评价列表
-function getDict() {
-  // // 获取公司规模
-  // getDictByCode('companySize').then((response) => {
-  //   companySizeList.value = response.data
-  // })
-  // 获取业务规模
-  getDictByCode('businessSize').then((response) => {
-    businessSizeList.value = response.data
-  })
-  // 获取履约评级
-  getDictByCode('grade').then((response) => {
-    gradeList.value = response.data
-  })
-  // // 获取整体评价
-  // getDictByCode('evaluation').then((response) => {
-  //   evaluationList.value = response.data
-  // })
-}
-getDict()
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '客户编号', value: 'customerNo', width: '160', align: 'center', fixed: true },
-  { text: '客户名称', value: 'customerName', width: '120', align: 'center', fixed: true },
-  { text: '公司规模', value: 'companySizeName', align: 'center', fixed: false },
-  { text: '业务规模', value: 'businessSizeName', align: 'center', fixed: false },
-  { text: '履约评级', value: 'gradeName', align: 'center', fixed: false },
-  { text: '整体评价', value: 'evaluationName', align: 'center', fixed: false },
-  { text: '公司地址', value: 'briefName', align: 'center', fixed: false },
-  { text: '创建时间', value: 'createTime', align: 'center', width: '180px', fixed: false },
-  { text: '备注', value: 'remark', align: 'center', fixed: false },
+  { text: '客户名称', value: 'customerName', align: 'center', fixed: true },
+  { text: '公司规模', value: 'companySizeName', width: '110', align: 'center' },
+  { text: '业务规模', value: 'businessSizeName', width: '130', align: 'center' },
+  { text: '履约评级', value: 'gradeName', width: '90', align: 'center' },
+  { text: '整体评价', value: 'evaluationName', width: '110', align: 'center' },
+  { text: '公司地址', value: 'fullAddress', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
+  { text: '备注', value: 'remark', align: 'center' },
 ])
 // 表格数据
 const list = ref<ICustomer[]>([])
@@ -81,44 +53,42 @@
 // 选中的内容
 const checkoutList = ref<string[]>([])
 
-// 数据查询
+function getDict() {
+  // 获取业务规模
+  getDictByCode('businessSize').then((response) => {
+    businessSizeList.value = response.data
+  })
+  // 获取履约评级
+  getDictByCode('grade').then((response) => {
+    gradeList.value = response.data
+  })
+}
+getDict()
+
+// 表格数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getCustomerList(listQuery.value).then((response) => {
-  //   // 模拟数据
-  //   response.data.rows = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', customerAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  //   list.value = response.data.rows.map((item: ICustomer) => {
-  //     if (item.companyProvinceName && item.companyCityName) {
-  //       item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-  //     }
-  //     else {
-  //       item.briefName = item.companyProvinceName || item.companyCityName
-  //     }
-  //     return item
-  //   })
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-
-  // 模拟数据
-  const response = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', customerAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' },
-    { bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', customerAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '2集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' },
-    { bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', customerAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '3集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  list.value = response.map((item: ICustomer) => {
-    if (item.companyProvinceName && item.companyCityName) {
-      item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-    }
-    else {
-      item.briefName = item.companyProvinceName || item.companyCityName
-    }
-    return item
+  getCustomerList(listQuery.value).then((response) => {
+    // 模拟数据
+    list.value = response.data.rows.map((item: ICustomer) => {
+      if (item.addressProvinceName && item.addressCityName) {
+        item.fullAddress = `${item.addressProvinceName}/${item.addressCityName}`
+      }
+      else if (item.addressProvinceName || item.addressCityName) {
+        item.fullAddress = item.addressProvinceName || item.addressCityName
+      }
+      else if (item.addressCountryName) {
+        item.fullAddress = item.addressCountryName
+      }
+      return item
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
   })
-  total.value = 50
-  loadingTable.value = false
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -131,7 +101,7 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    bussinessSize: '', // 业务规模
+    businessSize: '', // 业务规模
     customerName: '', // 公司名称
     customerNo: '', // 客户编号
     grade: '', // 履约评级
@@ -155,9 +125,9 @@
 const cancle = () => {
   emits('changeVisible', false)
 }
+
 // 点击确定
 const clickConfirm = () => {
-  console.log(checkoutList.value)
   if (!checkoutList.value.length) {
     ElMessage({
       message: '请选中',
diff --git a/src/views/customer/sample/overTime/detail.vue b/src/views/customer/sample/overTime/detail.vue
index f553724..1adcbf8 100644
--- a/src/views/customer/sample/overTime/detail.vue
+++ b/src/views/customer/sample/overTime/detail.vue
@@ -184,6 +184,7 @@
 const getInfo = () => {
   getSapmleDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data
+    dataForm.value.ABC = res.data.abc
     for (const item of menu) {
       item.searchFunc()
     }
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index c8f90a1..05fe276 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -19,8 +19,8 @@
   sampleModel: '', // 型号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
-  startTime: '1', // 检定开始时间
-  endTime: '1', // 检定结束时间
+  startTime: '', // 检定开始时间
+  endTime: '', // 检定结束时间
   overtimeStatus: '1', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
   offset: 1,
   limit: 20,
diff --git a/src/views/device/receive/apply/applyEdit.vue b/src/views/device/receive/apply/applyEdit.vue
new file mode 100644
index 0000000..5194bdb
--- /dev/null
+++ b/src/views/device/receive/apply/applyEdit.vue
@@ -0,0 +1,552 @@
+<script lang="ts" setup name="CreateOrCheck">
+import { onMounted, reactive, ref } from 'vue'
+import type { Ref } from 'vue'
+import dayjs from 'dayjs'
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { useRoute, useRouter } from 'vue-router'
+import type { IdeviceList, IdeviceListQuery } from '../receive'
+import SelectDeviceDialog from '../selectDeviceDialog.vue'
+import { toTreeList } from '@/utils/structure'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import {
+  getReceiveApplyListDetail,
+  saveAddReceiveApplyList,
+  saveEditReceiveApplyList,
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import type { userType } from '@/views/system/user/user-interface'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { getDeptTreeList } from '@/api/system/dept'
+import { getUserList } from '@/api/system/user'
+import { submitApproval } from '@/api/approval'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+
+const $route = useRoute()
+const approvalDialog = ref() // 审批对话框显隐
+const typeValue = ref() // add、edit、detail
+const approvalStatus = ref() // 审批类型
+const useDeptList = ref<deptType[]>([]) // 部门列表
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false)
+const isMulti = ref(false) // 是否批量添加(允许多选)
+const selectIndex = ref() // 点击选择的index--点击第几行
+const dialogSelectDiviceVisible = ref(false) // 控制选择设备对话框显隐
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+// 选中的内容
+const checkoutList = ref([])
+// 表单数据
+const form = ref({
+  taskId: '', // 任务id（审批用）
+  id: '',
+  processId: '', // 流程id--查询审批记录使用
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 领用时间
+  applyDesc: '', // 申请说明
+})
+const ruleFormRef = ref<FormInstance>() as any
+const list = ref<IdeviceList[]>([])// 表格数据
+
+// 查询条件
+const listQuery: Ref<IdeviceListQuery> = ref({
+  equipmentName: '', // 仪器名称
+  equipmentNo: '', // 设备编号
+  modelNo: '', // 型号
+  mesureRange: '', // 测量范围
+  useDeptName: '', // 使用部门
+  usePersonName: '', // 使用人
+  managerStateName: '', // 管理状态
+  validDate: '', // 有效日期
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '设备编号', value: 'equipmentNo', align: 'center', width: '230' },
+  { text: '设备名称', value: 'equipmentName', align: 'center' },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: '测量范围', value: 'mesureRange', align: 'center' },
+  { text: '使用部门', value: 'useDeptName', align: 'center' },
+  { text: '使用人', value: 'usePersonName', align: 'center' },
+  { text: '管理状态', value: 'managerStateName', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center' },
+])
+// 表单校验规则
+const rules = reactive<FormRules>({
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'change' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  time: [{ type: 'date', required: true, message: '领用时间不能为空', trigger: 'change' }],
+  applyDesc: [{ required: true, message: '申请说明不能为空', trigger: 'blur' }],
+})
+
+const $router = useRouter()
+// 点击关闭
+const close = () => {
+  $router.back()
+}
+
+const handleClick = (val: string) => {
+  if (val === 'agree') { // 同意
+    approvalDialog.value.initDialog('agree', form.value.taskId)
+  }
+  else if (val === 'reject') { // 驳回
+    approvalDialog.value.initDialog('reject', form.value.taskId)
+  }
+  else if (val === 'refuse') { // 拒绝
+    approvalDialog.value.initDialog('refuse', form.value.taskId)
+  }
+  else if (val === 'revoke') {
+    const params = {
+      taskId: form.value.taskId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认撤回该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        submitApproval('revoke', params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已撤回',
+          })
+        })
+        close()
+      })
+  }
+}
+
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+
+// 删除行
+const delRow = () => {
+  if (checkoutList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    checkoutList.value.forEach((item: IdeviceListQuery) => {
+      list.value.forEach((element, index) => {
+        if (element.equipmentNo === item.equipmentNo) {
+          list.value.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+
+// 增加行
+const addRow = () => {
+  const index = list.value.findIndex(item => !item.equipmentNo)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条设备信息')
+    return
+  }
+  list.value.push({
+    equipmentName: '', // 设备名称
+    equipmentNo: '', // 设备编号
+    modelNo: '', // 型号
+    mesureRange: '', // 测量范围
+    useDeptName: '', // 使用部门
+    usePersonName: '', // 使用人
+    managerStateName: '', // 管理状态
+    validDate: '', // 有效日期
+    equipmentId: '', // 设备ID
+  })
+}
+
+// 点击选择
+const handleSelect = (index: number, row: IdeviceList) => {
+  dialogSelectDiviceVisible.value = true // 选择设备对话框显隐
+  isMulti.value = false // 是否单选, false单选、true表格多选
+  selectIndex.value = index
+}
+
+// 点击批量添加
+const multiAdd = () => {
+  dialogSelectDiviceVisible.value = true
+  isMulti.value = true
+}
+
+// 选择设备对话框关闭
+const closeDialog = () => {
+  dialogSelectDiviceVisible.value = false
+}
+
+// 选择好设备了, 添加选好的设备到表格中
+const updateDeviceConfirm = (val: Array<IdeviceList>) => {
+  if (isMulti.value) { // 批量增加时push
+    val.forEach((item: IdeviceList) => {
+    // 只添加列表里不存在的
+      const index = list.value.findIndex((i: IdeviceList) => item.equipmentNo === i.equipmentNo)
+      if (index === -1) {
+        list.value.push(item)
+      }
+    })
+  }
+  else { // 单选替换
+    const index = list.value.findIndex((i: IdeviceList) => val[0].equipmentNo === i.equipmentNo)
+    if (index !== -1) {
+      ElMessage.warning('此设备已添加过')
+      return
+    }
+    list.value.splice(selectIndex.value, 1, val[0])
+  }
+}
+
+// 保存
+const save = () => {
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      // 保存之前清除空行、避免传给后端无用空对象
+      const index = list.value.findIndex((item: IdeviceList) => !item.equipmentNo)
+      if (index !== -1) {
+        list.value.splice(index, 1)
+      }
+      const params = {
+        applyName: form.value.applyName, // 申请名称
+        applyUnit: form.value.applyUnit, // 申请单位
+        applyPerson: form.value.applyPerson, // 申请人
+        time: form.value.time, // 领用时间
+        applyDesc: form.value.applyDesc, // 申请说明
+        applyType: '1', // 申请类型 领用1
+        id: form.value.id,
+        equipmentList: list.value.map((item) => {
+          return {
+            equipmentId: item.id!,
+          }
+        }),
+      }
+      // 新建
+      if (typeValue.value === 'add') {
+        saveAddReceiveApplyList(params).then((res) => {
+          form.value.id = res.data
+          ElMessage.success('保存成功')
+          loading.close()
+        })
+      }
+      // 保存
+      else if (typeValue.value === 'edit') {
+        saveEditReceiveApplyList(params).then((res) => {
+          form.value.id = res.data
+          ElMessage.success('保存成功')
+          loading.close()
+        })
+      }
+    }
+    else {
+      console.log('表单校验不通过')
+    }
+  })
+}
+
+// 提交表单
+const submit = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (form.value.id) {
+    const params = {
+      id: form.value.id,
+      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL, // 表单id
+    }
+    submitReceiveApplyList(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    })
+  }
+  else {
+    ElMessage.info('请先保存再提交！')
+  }
+}
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 获取使用部门
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res: any) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+// 审批结束回调
+const approvalSuccess = () => {
+  close()
+}
+
+// 编辑、详情--获取详细信息
+const fetchReceiveApplyListDetail = () => {
+  getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
+    form.value.applyUnit = res.data.applyUnit // 部门
+    form.value.applyName = res.data.applyName // 申请名称
+    form.value.applyPerson = res.data.applyPerson// 申请人
+    form.value.time = res.data.time // 领用时间
+    form.value.applyDesc = res.data.applyDesc // 申请说明
+    list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
+      return {
+        ...item,
+        validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+      }
+    })
+  })
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+onMounted(() => {
+  typeValue.value = $route.query.typeValue // 类型add、edit、detail
+  form.value.id = $route.query.id as string // id
+  form.value.taskId = $route.query.taskId as string // 任务id
+  form.value.processId = $route.query.processId as string // 任务id
+  approvalStatus.value = $route.query.approvalStatus // 审批类型
+  // 编辑、详情获取详情页信息
+  if (typeValue.value === 'edit' || typeValue.value === 'detail') {
+    fetchReceiveApplyListDetail() // 获取详细信息
+  }
+
+  // 获取部门信息
+  fetchDeptTreeList()
+  // 获取人员列表--申请人使用
+  fetchUserList()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`设备领用申请-${textMap[typeValue]}`">
+      <template #btns>
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('agree')">
+          同意
+        </el-button>
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('reject')">
+          驳回
+        </el-button>
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('refuse')">
+          拒绝
+        </el-button>
+        <el-button v-if="typeValue === 'add'" type="primary" @click="submit">
+          提交
+        </el-button>
+        <el-button v-if="typeValue === 'add' || typeValue === 'edit'" type="primary" @click="save">
+          保存
+        </el-button>
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '3'" type="primary" @click="handleClick('revoke')">
+          撤回
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div class="create-check">
+      <div class="top-info">
+        <!-- 表单 -->
+        <div class="form-area">
+          <el-form
+            ref="ruleFormRef"
+            :model="form"
+            label-width="120px"
+            :rules="rules"
+          >
+            <el-row :gutter="24">
+              <el-col :span="6">
+                <el-form-item label="申请名称" prop="applyName">
+                  <el-input
+                    v-model="form.applyName"
+                    :placeholder="typeValue === 'detail' ? '' : '请输入申请名称'"
+                    clearable
+                    :disabled="typeValue === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="申请单位" prop="applyUnit">
+                  <dept-select
+                    v-model="form.applyUnit"
+                    placeholder="请选择申请单位"
+                    :data="useDeptList"
+                    :disabled="typeValue === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="申请人" prop="applyPerson">
+                  <el-select
+                    v-model="form.applyPerson"
+                    :disabled="typeValue === 'detail'"
+                    placeholder="请选择申请人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="领用时间" prop="time">
+                  <el-date-picker
+                    v-model="form.time"
+                    type="datetime"
+                    placeholder="请选择领用时间"
+                    format="YYYY-MM-DD hh:mm"
+                    value-format="YYYY-MM-DD hh:mm"
+                    :disabled="typeValue === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="申请说明" prop="applyDesc">
+                  <el-input v-model="form.applyDesc" type="textarea" autosize clearable :disabled="typeValue === 'detail'" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </div>
+      </div>
+      <!-- 表格 -->
+      <detail-block title="设备领用列表">
+        <template #btns>
+          <el-button v-if="typeValue !== 'detail'" type="primary" @click="multiAdd">
+            批量添加
+          </el-button>
+          <el-button v-if="typeValue !== 'detail'" type="primary" @click="addRow">
+            增加行
+          </el-button>
+          <el-button v-if="typeValue !== 'detail'" type="info" @click="delRow">
+            删除行
+          </el-button>
+        </template>
+        <el-table
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column v-if="typeValue !== 'detail'" type="selection" width="38" />
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          >
+            <template v-if="item.value === 'equipmentNo' && (typeValue === 'add' || typeValue === 'edit')" #default="scope">
+              <el-input v-model="scope.row.equipmentNo" placeholder="请选择设备" class="input">
+                <template #append>
+                  <el-button size="small" @click="handleSelect(scope.$index, scope.row)">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+
+      <detail-block v-if="typeValue === 'detail'" title="审批流程">
+        <approval-record :process-id="form.processId" />
+      </detail-block>
+    </div>
+    <select-device-dialog
+      :dialog-select-divice-visible="dialogSelectDiviceVisible"
+      :is-multi="isMulti"
+      @closeDialog="closeDialog"
+      @updateDeviceConfirm="updateDeviceConfirm"
+    />
+
+    <!-- 同意、驳回、拒绝对话框显示 -->
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.create-check {
+  margin-top: 10px;
+
+  .top-info {
+    display: flex;
+    flex-direction: column;
+    width: 100%;
+    padding-right: 10px;
+    border-radius: 10px;
+    background-color: #fff;
+    // padding: 10px;
+
+    .title-button {
+      display: flex;
+      align-items: center;
+
+      &::before {
+        content: "";
+        flex: 1;
+      }
+
+      .button-group {
+        flex: 1;
+        display: flex;
+        justify-content: flex-end;
+      }
+    }
+
+    .form-area {
+      margin-top: 40px;
+    }
+  }
+}
+</style>

diff --git a/src/api/customer/overtime.ts b/src/api/customer/overtime.ts
deleted file mode 100644
index 9f349d6..0000000
--- a/src/api/customer/overtime.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * 到期样品接口
- */
-import request from '../index'
-import type { IOvertimeListQuery } from '@/views/customer/sample/overTime/overtime_list_interface'
-const prefix = '/meter'
-
-// 列表查询
-export function getOverTimeList(data: IOvertimeListQuery) {
-  return request({
-    url: `${prefix}/sample/overtime/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 导出列表
-export function exportOverTimeList(data: Omit<IOvertimeListQuery, 'limit' | 'offset'>) {
-  return request({
-    url: `${prefix}/sample/overtime/listExport`,
-    method: 'post',
-    responseType: 'blob',
-    data,
-  })
-}
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index 2610494..21a9c9e 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -59,3 +59,20 @@
   })
 }
 
+// 查询检定记录
+export function getMesureRecords(data: { id: string }) {
+  return request({
+    url: `${prefix}/sample/mesureRecordsBySampleId`,
+    method: 'post',
+    data,
+  })
+}
+
+// 查询检定证书
+export function getCertification(data: { id: string }) {
+  return request({
+    url: `${prefix}/sample/certificationBySampleId`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components.d.ts b/src/components.d.ts
index 227585d..90f2dde 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -21,6 +21,7 @@
     BarCodeBind: typeof import('./components/BarCodeBind/index.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
+    ButtonBox: typeof import('./components/buttonBox/buttonBox.vue')['default']
     CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default']
     CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
diff --git a/src/components/buttonBox/buttonBox.vue b/src/components/buttonBox/buttonBox.vue
new file mode 100644
index 0000000..cf93686
--- /dev/null
+++ b/src/components/buttonBox/buttonBox.vue
@@ -0,0 +1,49 @@
+<!-- 列表页右上角按钮组 -->
+<script lang="ts" setup name="ButtonBox">
+import type { PropType } from 'vue'
+import { ref } from 'vue'
+import type { IMenu } from '../../views/device/receive/receive'
+
+const props = defineProps({
+  active: String,
+  menu: {
+    type: Array as PropType<IMenu[]>,
+  },
+})
+const emits = defineEmits(['changeCurrentButton'])
+
+const current = ref('')
+watch(current, (newValue) => {
+  emits('changeCurrentButton', newValue)
+})
+watch(() => props.active, (newValue) => {
+  current.value = newValue!
+  console.log('pppppp', newValue)
+})
+</script>
+
+<template>
+  <div class="container">
+    <div class="btns">
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.id" :label="item.id">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 69px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 36f5104..fb6758e 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -481,7 +481,7 @@
       {
         path: 'applyList',
         name: 'ApplyList',
-        component: () => import('@/views/device/receive/applyList.vue'),
+        component: () => import('@/views/device/receive/apply/applyList.vue'),
         meta: {
           title: '设备领用申请',
           icon: 'ep:key',
@@ -491,7 +491,7 @@
       {
         path: ':type',
         name: 'ApplyListDetail',
-        component: () => import('@/views/device/receive/createOrCheck.vue'),
+        component: () => import('@/views/device/receive/apply/applyEdit.vue'),
         meta: {
           title: '设备领用申请',
           icon: 'ep:key',
@@ -503,7 +503,7 @@
       {
         path: 'solveList',
         name: 'SolveList',
-        component: () => import('@/views/device/receive/solveList.vue'),
+        component: () => import('@/views/device/receive/solve/solveList.vue'),
         meta: {
           title: '设备领用处理',
           icon: 'ep:key',
@@ -513,7 +513,7 @@
       {
         path: 'solveDetail',
         name: 'SolveListDetail',
-        component: () => import('@/views/device/receive/solveComponent/detail.vue'),
+        component: () => import('@/views/device/receive/solve/solveDetail.vue'),
         meta: {
           title: '设备领用处理',
           icon: 'ep:key',
diff --git a/src/views/customer/bench/bench.vue b/src/views/customer/bench/bench.vue
index 6b502fc..3b8f274 100644
--- a/src/views/customer/bench/bench.vue
+++ b/src/views/customer/bench/bench.vue
@@ -1,15 +1,53 @@
 <script lang="ts" setup name="DeviceBench">
-import { getCurrentInstance, ref } from 'vue'
+import { ref } from 'vue'
 import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
 import type { planReturn } from './bench-interface'
 import Linechart from '@/components/Echart/LineChart.vue'
 import type { lineDataI } from '@/components/Echart/echart-interface'
 import { getCustomerExpireData, getHighQualityCustomerList, getSampleAddData, getSampleExpireData } from '@/api/customer/bench'
+import { getSampleList } from '@/api/customer/sampleList'
+import type { IOvertimeListQuery } from '@/views/customer/sample/overTime/overtime_list_interface'
+import { getAdviceList } from '@/api/customer/advice'
+import type { IAdvice, IAdviceQuery } from '@/views/customer/advice/advice_interface'
 
+const reg = /(\d{4})\年(\d{2})月/ // 把2022年3月转为2022-03
 // 每个展示块高度
 const blockHeight = ref(300)
 const blockWidth = ref(400)
-const { proxy } = getCurrentInstance() as any
+
+// 到期样品查询条件
+const dueSampleListQuery: Ref<IOvertimeListQuery> = ref({
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 型号
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  startTime: '', // 检定开始时间
+  endTime: '', // 检定结束时间
+  overtimeStatus: '1', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+  offset: 1,
+  limit: 20,
+})
+
+// 客户关系查询条件
+const customerRelationsListQuery: Ref<IAdviceQuery> = ref({
+  adviceNo: '', // 投诉编号
+  customerName: '', // 公司名称
+  customerNo: '', // 客户编号
+  startTime: '', // 投诉开始时间
+  endTime: '', // 投诉结束时间
+  offset: 1,
+  limit: 20,
+})
+
+const dueSampleTableLoading = ref(false) // 到期样品表格loading
+const customerRelationsTableLoading = ref(false) // 客户关系loading
+const sampleAddLoading = ref(false) // 样品新增趋势loading
+const customerAddLoading = ref(false) // 客户新增趋势loading
+const sampleExpireLoading = ref(false) // 样品到期趋势loading
+const highQualityCustomerLoading = ref(false) // 优质客户名单loading
+
 // 到期样品表格数据
 const dueSampleTableData = ref()
 // 到期样品表头
@@ -64,54 +102,81 @@
   blockWidth.value = (document.body.clientWidth - 180 - 20 - 20) / 3
   console.log(blockHeight.value, blockWidth.value - 20)
 }
+
 window.addEventListener('resize', () => {
   calcBlockSize()
 })
 
 // 获取样品新增趋势数据
 function fetchSampleAddData() {
+  sampleAddLoading.value = true
   getSampleAddData().then((res) => {
-    sampleAddXData.value = res.data.map((item: planReturn) => {
-      // return item.date.replace('年', '-')
-      return item.date
-    })
+    sampleAddXData.value = res.data.map((item: planReturn) => item.date.replace(reg, '$1-$2'))
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     sampleAddYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
-    sampleAddData.value = [{ name: '客户', data: yValue }]
+    sampleAddData.value = [{ name: '样品', data: yValue }]
+    sampleAddLoading.value = false
   })
 }
 
 // 获取样品到期趋势数据
 function fetchSampleExpireData() {
+  sampleExpireLoading.value = true
   getSampleExpireData().then((res) => {
-    sampleExpireXData.value = res.data.map((item: planReturn) => item.date)
+    sampleExpireXData.value = res.data.map((item: planReturn) => item.date.replace(reg, '$1-$2'))
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     sampleExpireYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
-    sampleExpireData.value = [{ name: '客户', data: yValue }]
+    sampleExpireData.value = [{ name: '样品', data: yValue }]
+    sampleExpireLoading.value = false
   })
 }
 
 // 获取优质客户名单
 function fetchHighQualityCustomerList() {
+  highQualityCustomerLoading.value = true
   getHighQualityCustomerList().then((res) => {
     highQualityCustomerTableData.value = res.data.rows
+    highQualityCustomerLoading.value = false
   })
 }
 // 获取客户新增趋势数据
 function fetchCustomerExpireData() {
+  customerAddLoading.value = true
   getCustomerExpireData().then((res) => {
-    customerAddXData.value = res.data.map((item: planReturn) => item.date)
+    customerAddXData.value = res.data.map((item: planReturn) => item.date.replace(reg, '$1-$2'))
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     customerAddYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
     customerAddData.value = [{ name: '客户', data: yValue }]
+    customerAddLoading.value = false
   })
 }
 
 // 获取到期样品表格数据
+function fetchDueSampleTableData() {
+  dueSampleTableLoading.value = true
+  getSampleList(dueSampleListQuery.value).then((response) => {
+    dueSampleTableData.value = response.data.rows
+    dueSampleTableLoading.value = false
+  })
+}
 // 获取客户关系表格数据
+function fetchcustomerRelationsTableData() {
+  customerRelationsTableLoading.value = true
+  getAdviceList(customerRelationsListQuery.value).then((res) => {
+    customerRelationsTabledata.value = res.data.rows.map((item: IAdvice) => {
+      return {
+        ...item,
+        adviceClass: item.adviceClass === '0' ? '建议' : item.adviceClass === '1' ? '投诉' : '其他',
+      }
+    })
+    customerRelationsTableLoading.value = false
+  })
+}
 
 onMounted(() => {
   calcBlockSize()
+  fetchDueSampleTableData() // 到期样品表格
+  fetchcustomerRelationsTableData() // 客户关系表格
   fetchSampleAddData()// 样品新增趋势
   fetchSampleExpireData()// 样品到期趋势
   fetchCustomerExpireData()// 客户新增趋势
@@ -125,6 +190,7 @@
       <el-row :gutter="10">
         <el-col :span="8">
           <bench-col
+            v-loading="dueSampleTableLoading"
             icon="icon-book"
             title="到期样品"
             path-url="/sample/overtime"
@@ -145,6 +211,7 @@
         </el-col>
         <el-col :span="8">
           <bench-col
+            v-loading="sampleAddLoading"
             icon="icon-line"
             title="样品新增趋势"
             :height="blockHeight"
@@ -159,6 +226,7 @@
         </el-col>
         <el-col :span="8">
           <bench-col
+            v-loading="sampleExpireLoading"
             icon="icon-line"
             title="样品到期趋势"
             :height="blockHeight"
@@ -177,6 +245,7 @@
       <el-row :gutter="10">
         <el-col :span="8">
           <bench-col
+            v-loading="customerRelationsTableLoading"
             icon="icon-book"
             title="客户关系"
             path-url="/customerManage/advice"
@@ -197,6 +266,7 @@
         </el-col>
         <el-col :span="8">
           <bench-col
+            v-loading="customerAddLoading"
             icon="icon-line"
             title="客户新增趋势"
             :height="blockHeight"
@@ -211,6 +281,7 @@
         </el-col>
         <el-col :span="8">
           <bench-col
+            v-loading="highQualityCustomerLoading"
             icon="icon-book"
             title="优质客户名单"
             :style="{ height: blockHeight }"
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index e7d1acb..359c94d 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -8,7 +8,7 @@
 import selectCustomer from './selectCustomer.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import { addSample, getCertification, getMesureRecords, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
@@ -69,6 +69,7 @@
   sampleName: '', // 样品名称
   sampleModel: '', // 样品型号
   manufacturingNo: '', // 出厂编号
+  customerId: '', // 委托方id
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   phone: '', // 委托方电话
@@ -138,12 +139,17 @@
 })
 
 // 获取检定记录
-const fetchMeasureRecords = function (query = null) {
-  dataList.value.measureRecords = []
+const fetchMeasureRecords = (query = null) => {
+  getMesureRecords({ id: infoId.value }).then((res) => {
+    dataList.value.measureRecords = res.data.rows
+  })
 }
+
 // 获取检定证书
-const fetchCertifications = function (query = null) {
-  dataList.value.certificationRecords = []
+const fetchCertifications = (query = null) => {
+  getCertification({ id: infoId.value }).then((res) => {
+    dataList.value.certificationRecords = res.data.rows
+  })
 }
 
 // 菜单
@@ -151,12 +157,12 @@
   {
     name: '检定记录',
     columns: [
-      { text: '委托单编号', value: 'orderCode' },
-      { text: '委托单日期', value: 'orderTime' },
-      { text: '委托方代码', value: 'customerCode' },
-      { text: '委托方名称', value: 'customerName' },
-      { text: '送检人', value: 'deliverer' },
-      { text: '送检日期', value: 'deliverTime' },
+      { text: '委托单编号', value: 'orderCode', align: 'center' },
+      { text: '委托单日期', value: 'orderTime', align: 'center' },
+      { text: '委托方代码', value: 'customerCode', align: 'center' },
+      { text: '委托方名称', value: 'customerName', align: 'center' },
+      { text: '送检人', value: 'deliverer', align: 'center' },
+      { text: '送检日期', value: 'deliverTime', align: 'center' },
     ],
     list: 'measureRecords',
     pagination: true,
@@ -165,11 +171,11 @@
   {
     name: '检定证书',
     columns: [
-      { text: '证书编号', value: 'certificationCode' },
-      { text: '证书名称', value: 'certificationName' },
-      { text: '证书类型', value: 'certificationType' },
-      { text: '证书出具日期', value: 'effectiveDate' },
-      { text: '证书有效期', value: 'expirationDate' },
+      { text: '证书编号', value: 'certificationCode', align: 'center' },
+      { text: '证书名称', value: 'certificationName', align: 'center' },
+      { text: '证书类型', value: 'certificationType', align: 'center' },
+      { text: '证书出具日期', value: 'effectiveDate', align: 'center' },
+      { text: '证书有效期', value: 'expirationDate', align: 'center' },
     ],
     list: 'certificationRecords',
     pagination: true,
@@ -233,18 +239,18 @@
 // 委托方代码获取焦点
 const customerNoFocus = () => {
   visible.value = true
-  console.log(visible.value)
 }
 
 // 选好委托方
 const confirmCheckout = (val: Array<ICustomer>) => {
   if (val && val.length) {
     const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo
-    dataForm.value.customerName = getValue.customerName
-    dataForm.value.phone = getValue.phone
-    dataForm.value.postalCode = getValue.postalCode
-    dataForm.value.customerAddress = getValue.briefName
+    dataForm.value.customerNo = getValue.customerNo // 委托方代码
+    dataForm.value.customerId = getValue.id // 委托方id
+    dataForm.value.customerName = getValue.customerName // 委托方名称
+    dataForm.value.phone = getValue.phone // 电话
+    dataForm.value.postalCode = getValue.postalCode // 邮编
+    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
   }
 }
 
@@ -296,6 +302,7 @@
 const getInfo = () => {
   getSapmleDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data
+    dataForm.value.ABC = res.data.abc
     for (const item of menu) {
       item.searchFunc()
     }
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index a2c4307..c3690d4 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -35,6 +35,7 @@
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center', width: '180px' },
 ])
 // 表格数据
@@ -47,6 +48,7 @@
 const checkoutList = ref<string[]>([])
 // 文件上传input
 const fileRef = ref()
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -62,6 +64,7 @@
     loadingTable.value = false
   })
 }
+
 // 多选发生改变时
 function handleSelectionChange(e: any) {
   checkoutList.value = e.map((item: { id: string }) => item.id)
@@ -71,6 +74,7 @@
 const handleEdit = (row: ISampleList, pageType: 'edit' | 'detail') => {
   $router.push(`/sample/${pageType}/${row.id}`)
 }
+
 // 点击删除
 const handleDelete = (row: ISampleList) => {
   ElMessageBox.confirm(
@@ -94,10 +98,12 @@
       })
     })
 }
+
 // 点击搜索
 const searchList = () => {
   fetchData(true)
 }
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -112,7 +118,7 @@
     offset: 1,
     limit: 20,
   }
-  timeRange.value = ['', '']
+  timeRange.value = ['', ''] // 置空筛选时间
   fetchData(true)
 }
 
@@ -138,10 +144,12 @@
     ElMessage.error('请上传pdf格式')
   }
 }
+
 // 模板下载
 const templateDownload = () => {
 
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -157,10 +165,12 @@
 const uploadAll = () => {
   fileRef.value.click()
 }
+
 // 新建样品
 const add = () => {
   $router.push('/sample/add')
 }
+
 // 导出
 const exportAll = () => {
   const loading = ElLoading.service({
@@ -293,11 +303,13 @@
         <template #columns>
           <el-table-column label="操作" align="center" fixed="right" width="120">
             <template #default="{ row }">
+              <!-- 有orderid(关联了委托书)不允许编辑 -->
               <el-button
                 v-if="proxy.hasPerm('/sample/list/update')"
                 size="small"
                 type="primary"
                 link
+                :disabled="`${row.orderId}` !== ''"
                 @click="handleEdit(row, 'edit')"
               >
                 编辑
@@ -310,11 +322,13 @@
               >
                 详情
               </el-button>
+              <!-- 检测中的样品不允许删除 -->
               <el-button
                 v-if="proxy.hasPerm('/sample/list/delete')"
                 size="small"
                 link
                 type="danger"
+                :disabled="row.sampleSatus !== '3'"
                 @click="handleDelete(row)"
               >
                 删除
diff --git a/src/views/customer/sample/list/sample_list_interface.ts b/src/views/customer/sample/list/sample_list_interface.ts
index 707c8b5..81498a5 100644
--- a/src/views/customer/sample/list/sample_list_interface.ts
+++ b/src/views/customer/sample/list/sample_list_interface.ts
@@ -33,6 +33,7 @@
   sampleModel: string // 样品型号
   manufacturingNo: string // 出厂编号
   customerNo: string // 委托方代码
+  customerId: string // 委托方id
   customerName: string // 委托方名称
   phone: string // 委托方电话
   postalCode: string // 委托方邮编
diff --git a/src/views/customer/sample/list/selectCustomer.vue b/src/views/customer/sample/list/selectCustomer.vue
index 5de352d..0eef7d0 100644
--- a/src/views/customer/sample/list/selectCustomer.vue
+++ b/src/views/customer/sample/list/selectCustomer.vue
@@ -6,7 +6,8 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getCustomerList } from '@/api/customer/customer'
 import { getDictByCode } from '@/api/system/dict'
-const props = defineProps({
+
+defineProps({
   visible: {
     type: Boolean,
     default: false,
@@ -14,18 +15,9 @@
 })
 const emits = defineEmits(['changeVisible', 'confirmCheckout'])
 
-const visibleDialog = computed({
-  get() {
-    return props.visible
-  },
-  set(val) {
-    emits('changeVisible', val)
-  },
-})
-
 // 查询条件
 const listQuery: Ref<ICustomerQuery> = ref({
-  bussinessSize: '', // 业务规模
+  businessSize: '', // 业务规模
   customerName: '', // 公司名称
   customerNo: '', // 客户编号
   grade: '', // 履约评级
@@ -37,40 +29,20 @@
   name: string
   value: string
 }
-// const companySizeList = ref<dictType[]>([]) // 公司规模列表
+
 const businessSizeList = ref<dictType[]>([]) // 业务规模列表
 const gradeList = ref<dictType[]>([]) // 履约评级列表
-// const evaluationList = ref<dictType[]>([]) // 整体评价列表
-function getDict() {
-  // // 获取公司规模
-  // getDictByCode('companySize').then((response) => {
-  //   companySizeList.value = response.data
-  // })
-  // 获取业务规模
-  getDictByCode('businessSize').then((response) => {
-    businessSizeList.value = response.data
-  })
-  // 获取履约评级
-  getDictByCode('grade').then((response) => {
-    gradeList.value = response.data
-  })
-  // // 获取整体评价
-  // getDictByCode('evaluation').then((response) => {
-  //   evaluationList.value = response.data
-  // })
-}
-getDict()
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '客户编号', value: 'customerNo', width: '160', align: 'center', fixed: true },
-  { text: '客户名称', value: 'customerName', width: '120', align: 'center', fixed: true },
-  { text: '公司规模', value: 'companySizeName', align: 'center', fixed: false },
-  { text: '业务规模', value: 'businessSizeName', align: 'center', fixed: false },
-  { text: '履约评级', value: 'gradeName', align: 'center', fixed: false },
-  { text: '整体评价', value: 'evaluationName', align: 'center', fixed: false },
-  { text: '公司地址', value: 'briefName', align: 'center', fixed: false },
-  { text: '创建时间', value: 'createTime', align: 'center', width: '180px', fixed: false },
-  { text: '备注', value: 'remark', align: 'center', fixed: false },
+  { text: '客户名称', value: 'customerName', align: 'center', fixed: true },
+  { text: '公司规模', value: 'companySizeName', width: '110', align: 'center' },
+  { text: '业务规模', value: 'businessSizeName', width: '130', align: 'center' },
+  { text: '履约评级', value: 'gradeName', width: '90', align: 'center' },
+  { text: '整体评价', value: 'evaluationName', width: '110', align: 'center' },
+  { text: '公司地址', value: 'fullAddress', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
+  { text: '备注', value: 'remark', align: 'center' },
 ])
 // 表格数据
 const list = ref<ICustomer[]>([])
@@ -81,44 +53,42 @@
 // 选中的内容
 const checkoutList = ref<string[]>([])
 
-// 数据查询
+function getDict() {
+  // 获取业务规模
+  getDictByCode('businessSize').then((response) => {
+    businessSizeList.value = response.data
+  })
+  // 获取履约评级
+  getDictByCode('grade').then((response) => {
+    gradeList.value = response.data
+  })
+}
+getDict()
+
+// 表格数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getCustomerList(listQuery.value).then((response) => {
-  //   // 模拟数据
-  //   response.data.rows = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', customerAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  //   list.value = response.data.rows.map((item: ICustomer) => {
-  //     if (item.companyProvinceName && item.companyCityName) {
-  //       item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-  //     }
-  //     else {
-  //       item.briefName = item.companyProvinceName || item.companyCityName
-  //     }
-  //     return item
-  //   })
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-
-  // 模拟数据
-  const response = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', customerAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' },
-    { bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', customerAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '2集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' },
-    { bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', customerAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '3集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  list.value = response.map((item: ICustomer) => {
-    if (item.companyProvinceName && item.companyCityName) {
-      item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-    }
-    else {
-      item.briefName = item.companyProvinceName || item.companyCityName
-    }
-    return item
+  getCustomerList(listQuery.value).then((response) => {
+    // 模拟数据
+    list.value = response.data.rows.map((item: ICustomer) => {
+      if (item.addressProvinceName && item.addressCityName) {
+        item.fullAddress = `${item.addressProvinceName}/${item.addressCityName}`
+      }
+      else if (item.addressProvinceName || item.addressCityName) {
+        item.fullAddress = item.addressProvinceName || item.addressCityName
+      }
+      else if (item.addressCountryName) {
+        item.fullAddress = item.addressCountryName
+      }
+      return item
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
   })
-  total.value = 50
-  loadingTable.value = false
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -131,7 +101,7 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    bussinessSize: '', // 业务规模
+    businessSize: '', // 业务规模
     customerName: '', // 公司名称
     customerNo: '', // 客户编号
     grade: '', // 履约评级
@@ -155,9 +125,9 @@
 const cancle = () => {
   emits('changeVisible', false)
 }
+
 // 点击确定
 const clickConfirm = () => {
-  console.log(checkoutList.value)
   if (!checkoutList.value.length) {
     ElMessage({
       message: '请选中',
diff --git a/src/views/customer/sample/overTime/detail.vue b/src/views/customer/sample/overTime/detail.vue
index f553724..1adcbf8 100644
--- a/src/views/customer/sample/overTime/detail.vue
+++ b/src/views/customer/sample/overTime/detail.vue
@@ -184,6 +184,7 @@
 const getInfo = () => {
   getSapmleDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data
+    dataForm.value.ABC = res.data.abc
     for (const item of menu) {
       item.searchFunc()
     }
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index c8f90a1..05fe276 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -19,8 +19,8 @@
   sampleModel: '', // 型号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
-  startTime: '1', // 检定开始时间
-  endTime: '1', // 检定结束时间
+  startTime: '', // 检定开始时间
+  endTime: '', // 检定结束时间
   overtimeStatus: '1', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
   offset: 1,
   limit: 20,
diff --git a/src/views/device/receive/apply/applyEdit.vue b/src/views/device/receive/apply/applyEdit.vue
new file mode 100644
index 0000000..5194bdb
--- /dev/null
+++ b/src/views/device/receive/apply/applyEdit.vue
@@ -0,0 +1,552 @@
+<script lang="ts" setup name="CreateOrCheck">
+import { onMounted, reactive, ref } from 'vue'
+import type { Ref } from 'vue'
+import dayjs from 'dayjs'
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { useRoute, useRouter } from 'vue-router'
+import type { IdeviceList, IdeviceListQuery } from '../receive'
+import SelectDeviceDialog from '../selectDeviceDialog.vue'
+import { toTreeList } from '@/utils/structure'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import {
+  getReceiveApplyListDetail,
+  saveAddReceiveApplyList,
+  saveEditReceiveApplyList,
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import type { userType } from '@/views/system/user/user-interface'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { getDeptTreeList } from '@/api/system/dept'
+import { getUserList } from '@/api/system/user'
+import { submitApproval } from '@/api/approval'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+
+const $route = useRoute()
+const approvalDialog = ref() // 审批对话框显隐
+const typeValue = ref() // add、edit、detail
+const approvalStatus = ref() // 审批类型
+const useDeptList = ref<deptType[]>([]) // 部门列表
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false)
+const isMulti = ref(false) // 是否批量添加(允许多选)
+const selectIndex = ref() // 点击选择的index--点击第几行
+const dialogSelectDiviceVisible = ref(false) // 控制选择设备对话框显隐
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+// 选中的内容
+const checkoutList = ref([])
+// 表单数据
+const form = ref({
+  taskId: '', // 任务id（审批用）
+  id: '',
+  processId: '', // 流程id--查询审批记录使用
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 领用时间
+  applyDesc: '', // 申请说明
+})
+const ruleFormRef = ref<FormInstance>() as any
+const list = ref<IdeviceList[]>([])// 表格数据
+
+// 查询条件
+const listQuery: Ref<IdeviceListQuery> = ref({
+  equipmentName: '', // 仪器名称
+  equipmentNo: '', // 设备编号
+  modelNo: '', // 型号
+  mesureRange: '', // 测量范围
+  useDeptName: '', // 使用部门
+  usePersonName: '', // 使用人
+  managerStateName: '', // 管理状态
+  validDate: '', // 有效日期
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '设备编号', value: 'equipmentNo', align: 'center', width: '230' },
+  { text: '设备名称', value: 'equipmentName', align: 'center' },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: '测量范围', value: 'mesureRange', align: 'center' },
+  { text: '使用部门', value: 'useDeptName', align: 'center' },
+  { text: '使用人', value: 'usePersonName', align: 'center' },
+  { text: '管理状态', value: 'managerStateName', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center' },
+])
+// 表单校验规则
+const rules = reactive<FormRules>({
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'change' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  time: [{ type: 'date', required: true, message: '领用时间不能为空', trigger: 'change' }],
+  applyDesc: [{ required: true, message: '申请说明不能为空', trigger: 'blur' }],
+})
+
+const $router = useRouter()
+// 点击关闭
+const close = () => {
+  $router.back()
+}
+
+const handleClick = (val: string) => {
+  if (val === 'agree') { // 同意
+    approvalDialog.value.initDialog('agree', form.value.taskId)
+  }
+  else if (val === 'reject') { // 驳回
+    approvalDialog.value.initDialog('reject', form.value.taskId)
+  }
+  else if (val === 'refuse') { // 拒绝
+    approvalDialog.value.initDialog('refuse', form.value.taskId)
+  }
+  else if (val === 'revoke') {
+    const params = {
+      taskId: form.value.taskId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认撤回该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        submitApproval('revoke', params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已撤回',
+          })
+        })
+        close()
+      })
+  }
+}
+
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+
+// 删除行
+const delRow = () => {
+  if (checkoutList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    checkoutList.value.forEach((item: IdeviceListQuery) => {
+      list.value.forEach((element, index) => {
+        if (element.equipmentNo === item.equipmentNo) {
+          list.value.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+
+// 增加行
+const addRow = () => {
+  const index = list.value.findIndex(item => !item.equipmentNo)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条设备信息')
+    return
+  }
+  list.value.push({
+    equipmentName: '', // 设备名称
+    equipmentNo: '', // 设备编号
+    modelNo: '', // 型号
+    mesureRange: '', // 测量范围
+    useDeptName: '', // 使用部门
+    usePersonName: '', // 使用人
+    managerStateName: '', // 管理状态
+    validDate: '', // 有效日期
+    equipmentId: '', // 设备ID
+  })
+}
+
+// 点击选择
+const handleSelect = (index: number, row: IdeviceList) => {
+  dialogSelectDiviceVisible.value = true // 选择设备对话框显隐
+  isMulti.value = false // 是否单选, false单选、true表格多选
+  selectIndex.value = index
+}
+
+// 点击批量添加
+const multiAdd = () => {
+  dialogSelectDiviceVisible.value = true
+  isMulti.value = true
+}
+
+// 选择设备对话框关闭
+const closeDialog = () => {
+  dialogSelectDiviceVisible.value = false
+}
+
+// 选择好设备了, 添加选好的设备到表格中
+const updateDeviceConfirm = (val: Array<IdeviceList>) => {
+  if (isMulti.value) { // 批量增加时push
+    val.forEach((item: IdeviceList) => {
+    // 只添加列表里不存在的
+      const index = list.value.findIndex((i: IdeviceList) => item.equipmentNo === i.equipmentNo)
+      if (index === -1) {
+        list.value.push(item)
+      }
+    })
+  }
+  else { // 单选替换
+    const index = list.value.findIndex((i: IdeviceList) => val[0].equipmentNo === i.equipmentNo)
+    if (index !== -1) {
+      ElMessage.warning('此设备已添加过')
+      return
+    }
+    list.value.splice(selectIndex.value, 1, val[0])
+  }
+}
+
+// 保存
+const save = () => {
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      // 保存之前清除空行、避免传给后端无用空对象
+      const index = list.value.findIndex((item: IdeviceList) => !item.equipmentNo)
+      if (index !== -1) {
+        list.value.splice(index, 1)
+      }
+      const params = {
+        applyName: form.value.applyName, // 申请名称
+        applyUnit: form.value.applyUnit, // 申请单位
+        applyPerson: form.value.applyPerson, // 申请人
+        time: form.value.time, // 领用时间
+        applyDesc: form.value.applyDesc, // 申请说明
+        applyType: '1', // 申请类型 领用1
+        id: form.value.id,
+        equipmentList: list.value.map((item) => {
+          return {
+            equipmentId: item.id!,
+          }
+        }),
+      }
+      // 新建
+      if (typeValue.value === 'add') {
+        saveAddReceiveApplyList(params).then((res) => {
+          form.value.id = res.data
+          ElMessage.success('保存成功')
+          loading.close()
+        })
+      }
+      // 保存
+      else if (typeValue.value === 'edit') {
+        saveEditReceiveApplyList(params).then((res) => {
+          form.value.id = res.data
+          ElMessage.success('保存成功')
+          loading.close()
+        })
+      }
+    }
+    else {
+      console.log('表单校验不通过')
+    }
+  })
+}
+
+// 提交表单
+const submit = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (form.value.id) {
+    const params = {
+      id: form.value.id,
+      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL, // 表单id
+    }
+    submitReceiveApplyList(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    })
+  }
+  else {
+    ElMessage.info('请先保存再提交！')
+  }
+}
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 获取使用部门
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res: any) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+// 审批结束回调
+const approvalSuccess = () => {
+  close()
+}
+
+// 编辑、详情--获取详细信息
+const fetchReceiveApplyListDetail = () => {
+  getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
+    form.value.applyUnit = res.data.applyUnit // 部门
+    form.value.applyName = res.data.applyName // 申请名称
+    form.value.applyPerson = res.data.applyPerson// 申请人
+    form.value.time = res.data.time // 领用时间
+    form.value.applyDesc = res.data.applyDesc // 申请说明
+    list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
+      return {
+        ...item,
+        validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+      }
+    })
+  })
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+onMounted(() => {
+  typeValue.value = $route.query.typeValue // 类型add、edit、detail
+  form.value.id = $route.query.id as string // id
+  form.value.taskId = $route.query.taskId as string // 任务id
+  form.value.processId = $route.query.processId as string // 任务id
+  approvalStatus.value = $route.query.approvalStatus // 审批类型
+  // 编辑、详情获取详情页信息
+  if (typeValue.value === 'edit' || typeValue.value === 'detail') {
+    fetchReceiveApplyListDetail() // 获取详细信息
+  }
+
+  // 获取部门信息
+  fetchDeptTreeList()
+  // 获取人员列表--申请人使用
+  fetchUserList()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`设备领用申请-${textMap[typeValue]}`">
+      <template #btns>
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('agree')">
+          同意
+        </el-button>
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('reject')">
+          驳回
+        </el-button>
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('refuse')">
+          拒绝
+        </el-button>
+        <el-button v-if="typeValue === 'add'" type="primary" @click="submit">
+          提交
+        </el-button>
+        <el-button v-if="typeValue === 'add' || typeValue === 'edit'" type="primary" @click="save">
+          保存
+        </el-button>
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '3'" type="primary" @click="handleClick('revoke')">
+          撤回
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div class="create-check">
+      <div class="top-info">
+        <!-- 表单 -->
+        <div class="form-area">
+          <el-form
+            ref="ruleFormRef"
+            :model="form"
+            label-width="120px"
+            :rules="rules"
+          >
+            <el-row :gutter="24">
+              <el-col :span="6">
+                <el-form-item label="申请名称" prop="applyName">
+                  <el-input
+                    v-model="form.applyName"
+                    :placeholder="typeValue === 'detail' ? '' : '请输入申请名称'"
+                    clearable
+                    :disabled="typeValue === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="申请单位" prop="applyUnit">
+                  <dept-select
+                    v-model="form.applyUnit"
+                    placeholder="请选择申请单位"
+                    :data="useDeptList"
+                    :disabled="typeValue === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="申请人" prop="applyPerson">
+                  <el-select
+                    v-model="form.applyPerson"
+                    :disabled="typeValue === 'detail'"
+                    placeholder="请选择申请人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="领用时间" prop="time">
+                  <el-date-picker
+                    v-model="form.time"
+                    type="datetime"
+                    placeholder="请选择领用时间"
+                    format="YYYY-MM-DD hh:mm"
+                    value-format="YYYY-MM-DD hh:mm"
+                    :disabled="typeValue === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="申请说明" prop="applyDesc">
+                  <el-input v-model="form.applyDesc" type="textarea" autosize clearable :disabled="typeValue === 'detail'" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </div>
+      </div>
+      <!-- 表格 -->
+      <detail-block title="设备领用列表">
+        <template #btns>
+          <el-button v-if="typeValue !== 'detail'" type="primary" @click="multiAdd">
+            批量添加
+          </el-button>
+          <el-button v-if="typeValue !== 'detail'" type="primary" @click="addRow">
+            增加行
+          </el-button>
+          <el-button v-if="typeValue !== 'detail'" type="info" @click="delRow">
+            删除行
+          </el-button>
+        </template>
+        <el-table
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column v-if="typeValue !== 'detail'" type="selection" width="38" />
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          >
+            <template v-if="item.value === 'equipmentNo' && (typeValue === 'add' || typeValue === 'edit')" #default="scope">
+              <el-input v-model="scope.row.equipmentNo" placeholder="请选择设备" class="input">
+                <template #append>
+                  <el-button size="small" @click="handleSelect(scope.$index, scope.row)">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+
+      <detail-block v-if="typeValue === 'detail'" title="审批流程">
+        <approval-record :process-id="form.processId" />
+      </detail-block>
+    </div>
+    <select-device-dialog
+      :dialog-select-divice-visible="dialogSelectDiviceVisible"
+      :is-multi="isMulti"
+      @closeDialog="closeDialog"
+      @updateDeviceConfirm="updateDeviceConfirm"
+    />
+
+    <!-- 同意、驳回、拒绝对话框显示 -->
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.create-check {
+  margin-top: 10px;
+
+  .top-info {
+    display: flex;
+    flex-direction: column;
+    width: 100%;
+    padding-right: 10px;
+    border-radius: 10px;
+    background-color: #fff;
+    // padding: 10px;
+
+    .title-button {
+      display: flex;
+      align-items: center;
+
+      &::before {
+        content: "";
+        flex: 1;
+      }
+
+      .button-group {
+        flex: 1;
+        display: flex;
+        justify-content: flex-end;
+      }
+    }
+
+    .form-area {
+      margin-top: 40px;
+    }
+  }
+}
+</style>
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
new file mode 100644
index 0000000..abf559c
--- /dev/null
+++ b/src/views/device/receive/apply/applyList.vue
@@ -0,0 +1,542 @@
+<script lang="ts" setup name="ApplyList">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+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 ButtonBox from '@/components/buttonBox/buttonBox.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { exportFile } from '@/utils/exportUtils'
+import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import {
+  delReceiveApplyList,
+  exportReceiveApplyList,
+  getReceiveApplyList,
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import { submitApproval } from '@/api/approval'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import type { userType } from '@/views/system/user/user-interface'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { getUserList } from '@/api/system/user'
+
+const loadingTable = ref(false) // 表格loading
+const active = ref('') // 选中的按钮
+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 listQuery: Ref<IlistQuery> = ref({
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  approvalStatus: active.value, // 	审批状态
+  processResult: '', // 	处置结果
+  applyType: '1', // 申请类型 领用1
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+  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 columns = ref<TableColumn[]>([
+  { text: '申请编号', value: 'applyNo', align: 'center' },
+  { text: '申请名称', value: 'applyName', align: 'center' },
+  { text: '申请部门', value: 'applyUnitName', align: 'center' },
+  { text: '申请人', value: 'applyPersonName', align: 'center' },
+  { text: '领用时间', value: 'time', align: 'center' },
+  { text: '申请说明', value: 'applyDesc', align: 'center' },
+  { text: '审批状态', value: 'approvalStatus', align: 'center' },
+])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 筛选时间段数据
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.startTime = timeRange.value[0] as string || ''
+  listQuery.value.endTime = timeRange.value[1] as string || ''
+  listQuery.value.approvalStatus = active.value
+  getReceiveApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IlistType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap[item.approvalStatus],
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: active.value, // 	审批状态
+    processResult: '', // 	处置结果
+    applyType: '1', // 申请类型 领用1
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', '']
+  fetchData(true)
+}
+
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+const $router = useRouter()
+
+// 新建
+const add = () => {
+  $router.push({ path: '/receive/add', query: { typeValue: 'add' } })
+}
+
+// 导出
+const exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    const params = {
+      applyNo: listQuery.value.applyNo, // 申请编号
+      applyName: listQuery.value.applyName, // 申请名称
+      applyUnit: listQuery.value.applyUnit, // 申请部门
+      applyPerson: listQuery.value.applyPerson, // 申请人
+      startTime: listQuery.value.startTime, // 申请开始日期
+      endTime: listQuery.value.endTime, // 申请结束日期
+      approvalStatus: listQuery.value.approvalStatus, // 	审批状态
+      processResult: listQuery.value.processResult, // 	处置结果
+      applyType: listQuery.value.applyType, // 申请类型 领用0
+      createUser: listQuery.value.createUser, // 创建人
+      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+      offset: 1,
+      limit: 20,
+      ids: checkoutList.value,
+    }
+    // 调导出接口
+    exportReceiveApplyList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备领用申请列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备领用申请列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: IlistType) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备领用申请列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 操作
+const handleEdit = (row: IlistType, val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      taskId: row.taskId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        submitApproval('revoke', params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+        })
+        fetchData(true)
+      })
+  }
+  else if (val === '删除') {
+    ElMessageBox.confirm(
+      '确认删除该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        delReceiveApplyList({ id: row.id, taskId: row.taskId }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '提交') {
+    ElMessageBox.confirm(
+      '确认提交该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        submitReceiveApplyList({ id: row.id, formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已提交',
+          })
+        })
+        fetchData(true)
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', row.taskId)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', row.taskId)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', row.taskId)
+  }
+  else if (val === '查看' || val === '编辑') {
+    $router.push({
+      path: `/receive/${title}`,
+      query: {
+        typeValue: title,
+        approvalStatus: approvalStatusReserveMap[row.approvalStatus],
+        id: row.id,
+        taskId: row.taskId,
+        processId: row.processId, // 查询审批记录使用
+      },
+    })
+  }
+}
+// 按钮切换
+const changeCurrentButton = (val: string) => {
+  active.value = val
+  window.sessionStorage.setItem('buttonBoxActive', val)
+  clearList()
+}
+
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 获取用户列表(增加模糊查询)
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 获取使用部门
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res: any) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+onMounted(() => {
+  if (window.sessionStorage.getItem('buttonBoxActive')) {
+    active.value = window.sessionStorage.getItem('buttonBoxActive')!
+  }
+  else {
+    active.value = '0' // 全部
+  }
+  nextTick(() => {
+    fetchData(true) // 获取表格数据
+    // 获取使用部门
+    fetchDeptTreeList() // 获取使用部门
+    fetchUserList() // 获取人员列表
+  })
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyNo"
+          placeholder="申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyName"
+          placeholder="申请名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.applyPerson"
+          placeholder="请选择申请人"
+          style="width: 100%;"
+          filterable
+          remote
+          remote-show-suffix
+          :remote-method="remoteMethod"
+          :loading="applyPersonLoading"
+        >
+          <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY-MM-DD hh:mm"
+          value-format="YYYY-MM-DD hh:mm"
+          start-placeholder="领用开始时间"
+          end-placeholder="领用结束时间"
+        />
+      </search-item>
+    </search-area>
+
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @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="220" fixed="right">
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="handleEdit(row, '查看', 'detail')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (active === '0' || active === '2')"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (active === '0' || active === '2')"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (active === '0' || active === '2')"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '编辑', 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (active === '0' || active === '3')"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (active !== '4' && active !== '5')"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatus === '未通过' || row.approvalStatus === '已通过'"
+                @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+    <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
+

diff --git a/src/api/customer/overtime.ts b/src/api/customer/overtime.ts
deleted file mode 100644
index 9f349d6..0000000
--- a/src/api/customer/overtime.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * 到期样品接口
- */
-import request from '../index'
-import type { IOvertimeListQuery } from '@/views/customer/sample/overTime/overtime_list_interface'
-const prefix = '/meter'
-
-// 列表查询
-export function getOverTimeList(data: IOvertimeListQuery) {
-  return request({
-    url: `${prefix}/sample/overtime/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 导出列表
-export function exportOverTimeList(data: Omit<IOvertimeListQuery, 'limit' | 'offset'>) {
-  return request({
-    url: `${prefix}/sample/overtime/listExport`,
-    method: 'post',
-    responseType: 'blob',
-    data,
-  })
-}
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index 2610494..21a9c9e 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -59,3 +59,20 @@
   })
 }
 
+// 查询检定记录
+export function getMesureRecords(data: { id: string }) {
+  return request({
+    url: `${prefix}/sample/mesureRecordsBySampleId`,
+    method: 'post',
+    data,
+  })
+}
+
+// 查询检定证书
+export function getCertification(data: { id: string }) {
+  return request({
+    url: `${prefix}/sample/certificationBySampleId`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components.d.ts b/src/components.d.ts
index 227585d..90f2dde 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -21,6 +21,7 @@
     BarCodeBind: typeof import('./components/BarCodeBind/index.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
+    ButtonBox: typeof import('./components/buttonBox/buttonBox.vue')['default']
     CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default']
     CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
diff --git a/src/components/buttonBox/buttonBox.vue b/src/components/buttonBox/buttonBox.vue
new file mode 100644
index 0000000..cf93686
--- /dev/null
+++ b/src/components/buttonBox/buttonBox.vue
@@ -0,0 +1,49 @@
+<!-- 列表页右上角按钮组 -->
+<script lang="ts" setup name="ButtonBox">
+import type { PropType } from 'vue'
+import { ref } from 'vue'
+import type { IMenu } from '../../views/device/receive/receive'
+
+const props = defineProps({
+  active: String,
+  menu: {
+    type: Array as PropType<IMenu[]>,
+  },
+})
+const emits = defineEmits(['changeCurrentButton'])
+
+const current = ref('')
+watch(current, (newValue) => {
+  emits('changeCurrentButton', newValue)
+})
+watch(() => props.active, (newValue) => {
+  current.value = newValue!
+  console.log('pppppp', newValue)
+})
+</script>
+
+<template>
+  <div class="container">
+    <div class="btns">
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.id" :label="item.id">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 69px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 36f5104..fb6758e 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -481,7 +481,7 @@
       {
         path: 'applyList',
         name: 'ApplyList',
-        component: () => import('@/views/device/receive/applyList.vue'),
+        component: () => import('@/views/device/receive/apply/applyList.vue'),
         meta: {
           title: '设备领用申请',
           icon: 'ep:key',
@@ -491,7 +491,7 @@
       {
         path: ':type',
         name: 'ApplyListDetail',
-        component: () => import('@/views/device/receive/createOrCheck.vue'),
+        component: () => import('@/views/device/receive/apply/applyEdit.vue'),
         meta: {
           title: '设备领用申请',
           icon: 'ep:key',
@@ -503,7 +503,7 @@
       {
         path: 'solveList',
         name: 'SolveList',
-        component: () => import('@/views/device/receive/solveList.vue'),
+        component: () => import('@/views/device/receive/solve/solveList.vue'),
         meta: {
           title: '设备领用处理',
           icon: 'ep:key',
@@ -513,7 +513,7 @@
       {
         path: 'solveDetail',
         name: 'SolveListDetail',
-        component: () => import('@/views/device/receive/solveComponent/detail.vue'),
+        component: () => import('@/views/device/receive/solve/solveDetail.vue'),
         meta: {
           title: '设备领用处理',
           icon: 'ep:key',
diff --git a/src/views/customer/bench/bench.vue b/src/views/customer/bench/bench.vue
index 6b502fc..3b8f274 100644
--- a/src/views/customer/bench/bench.vue
+++ b/src/views/customer/bench/bench.vue
@@ -1,15 +1,53 @@
 <script lang="ts" setup name="DeviceBench">
-import { getCurrentInstance, ref } from 'vue'
+import { ref } from 'vue'
 import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
 import type { planReturn } from './bench-interface'
 import Linechart from '@/components/Echart/LineChart.vue'
 import type { lineDataI } from '@/components/Echart/echart-interface'
 import { getCustomerExpireData, getHighQualityCustomerList, getSampleAddData, getSampleExpireData } from '@/api/customer/bench'
+import { getSampleList } from '@/api/customer/sampleList'
+import type { IOvertimeListQuery } from '@/views/customer/sample/overTime/overtime_list_interface'
+import { getAdviceList } from '@/api/customer/advice'
+import type { IAdvice, IAdviceQuery } from '@/views/customer/advice/advice_interface'
 
+const reg = /(\d{4})\年(\d{2})月/ // 把2022年3月转为2022-03
 // 每个展示块高度
 const blockHeight = ref(300)
 const blockWidth = ref(400)
-const { proxy } = getCurrentInstance() as any
+
+// 到期样品查询条件
+const dueSampleListQuery: Ref<IOvertimeListQuery> = ref({
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 型号
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  startTime: '', // 检定开始时间
+  endTime: '', // 检定结束时间
+  overtimeStatus: '1', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+  offset: 1,
+  limit: 20,
+})
+
+// 客户关系查询条件
+const customerRelationsListQuery: Ref<IAdviceQuery> = ref({
+  adviceNo: '', // 投诉编号
+  customerName: '', // 公司名称
+  customerNo: '', // 客户编号
+  startTime: '', // 投诉开始时间
+  endTime: '', // 投诉结束时间
+  offset: 1,
+  limit: 20,
+})
+
+const dueSampleTableLoading = ref(false) // 到期样品表格loading
+const customerRelationsTableLoading = ref(false) // 客户关系loading
+const sampleAddLoading = ref(false) // 样品新增趋势loading
+const customerAddLoading = ref(false) // 客户新增趋势loading
+const sampleExpireLoading = ref(false) // 样品到期趋势loading
+const highQualityCustomerLoading = ref(false) // 优质客户名单loading
+
 // 到期样品表格数据
 const dueSampleTableData = ref()
 // 到期样品表头
@@ -64,54 +102,81 @@
   blockWidth.value = (document.body.clientWidth - 180 - 20 - 20) / 3
   console.log(blockHeight.value, blockWidth.value - 20)
 }
+
 window.addEventListener('resize', () => {
   calcBlockSize()
 })
 
 // 获取样品新增趋势数据
 function fetchSampleAddData() {
+  sampleAddLoading.value = true
   getSampleAddData().then((res) => {
-    sampleAddXData.value = res.data.map((item: planReturn) => {
-      // return item.date.replace('年', '-')
-      return item.date
-    })
+    sampleAddXData.value = res.data.map((item: planReturn) => item.date.replace(reg, '$1-$2'))
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     sampleAddYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
-    sampleAddData.value = [{ name: '客户', data: yValue }]
+    sampleAddData.value = [{ name: '样品', data: yValue }]
+    sampleAddLoading.value = false
   })
 }
 
 // 获取样品到期趋势数据
 function fetchSampleExpireData() {
+  sampleExpireLoading.value = true
   getSampleExpireData().then((res) => {
-    sampleExpireXData.value = res.data.map((item: planReturn) => item.date)
+    sampleExpireXData.value = res.data.map((item: planReturn) => item.date.replace(reg, '$1-$2'))
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     sampleExpireYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
-    sampleExpireData.value = [{ name: '客户', data: yValue }]
+    sampleExpireData.value = [{ name: '样品', data: yValue }]
+    sampleExpireLoading.value = false
   })
 }
 
 // 获取优质客户名单
 function fetchHighQualityCustomerList() {
+  highQualityCustomerLoading.value = true
   getHighQualityCustomerList().then((res) => {
     highQualityCustomerTableData.value = res.data.rows
+    highQualityCustomerLoading.value = false
   })
 }
 // 获取客户新增趋势数据
 function fetchCustomerExpireData() {
+  customerAddLoading.value = true
   getCustomerExpireData().then((res) => {
-    customerAddXData.value = res.data.map((item: planReturn) => item.date)
+    customerAddXData.value = res.data.map((item: planReturn) => item.date.replace(reg, '$1-$2'))
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     customerAddYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
     customerAddData.value = [{ name: '客户', data: yValue }]
+    customerAddLoading.value = false
   })
 }
 
 // 获取到期样品表格数据
+function fetchDueSampleTableData() {
+  dueSampleTableLoading.value = true
+  getSampleList(dueSampleListQuery.value).then((response) => {
+    dueSampleTableData.value = response.data.rows
+    dueSampleTableLoading.value = false
+  })
+}
 // 获取客户关系表格数据
+function fetchcustomerRelationsTableData() {
+  customerRelationsTableLoading.value = true
+  getAdviceList(customerRelationsListQuery.value).then((res) => {
+    customerRelationsTabledata.value = res.data.rows.map((item: IAdvice) => {
+      return {
+        ...item,
+        adviceClass: item.adviceClass === '0' ? '建议' : item.adviceClass === '1' ? '投诉' : '其他',
+      }
+    })
+    customerRelationsTableLoading.value = false
+  })
+}
 
 onMounted(() => {
   calcBlockSize()
+  fetchDueSampleTableData() // 到期样品表格
+  fetchcustomerRelationsTableData() // 客户关系表格
   fetchSampleAddData()// 样品新增趋势
   fetchSampleExpireData()// 样品到期趋势
   fetchCustomerExpireData()// 客户新增趋势
@@ -125,6 +190,7 @@
       <el-row :gutter="10">
         <el-col :span="8">
           <bench-col
+            v-loading="dueSampleTableLoading"
             icon="icon-book"
             title="到期样品"
             path-url="/sample/overtime"
@@ -145,6 +211,7 @@
         </el-col>
         <el-col :span="8">
           <bench-col
+            v-loading="sampleAddLoading"
             icon="icon-line"
             title="样品新增趋势"
             :height="blockHeight"
@@ -159,6 +226,7 @@
         </el-col>
         <el-col :span="8">
           <bench-col
+            v-loading="sampleExpireLoading"
             icon="icon-line"
             title="样品到期趋势"
             :height="blockHeight"
@@ -177,6 +245,7 @@
       <el-row :gutter="10">
         <el-col :span="8">
           <bench-col
+            v-loading="customerRelationsTableLoading"
             icon="icon-book"
             title="客户关系"
             path-url="/customerManage/advice"
@@ -197,6 +266,7 @@
         </el-col>
         <el-col :span="8">
           <bench-col
+            v-loading="customerAddLoading"
             icon="icon-line"
             title="客户新增趋势"
             :height="blockHeight"
@@ -211,6 +281,7 @@
         </el-col>
         <el-col :span="8">
           <bench-col
+            v-loading="highQualityCustomerLoading"
             icon="icon-book"
             title="优质客户名单"
             :style="{ height: blockHeight }"
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index e7d1acb..359c94d 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -8,7 +8,7 @@
 import selectCustomer from './selectCustomer.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import { addSample, getCertification, getMesureRecords, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
@@ -69,6 +69,7 @@
   sampleName: '', // 样品名称
   sampleModel: '', // 样品型号
   manufacturingNo: '', // 出厂编号
+  customerId: '', // 委托方id
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   phone: '', // 委托方电话
@@ -138,12 +139,17 @@
 })
 
 // 获取检定记录
-const fetchMeasureRecords = function (query = null) {
-  dataList.value.measureRecords = []
+const fetchMeasureRecords = (query = null) => {
+  getMesureRecords({ id: infoId.value }).then((res) => {
+    dataList.value.measureRecords = res.data.rows
+  })
 }
+
 // 获取检定证书
-const fetchCertifications = function (query = null) {
-  dataList.value.certificationRecords = []
+const fetchCertifications = (query = null) => {
+  getCertification({ id: infoId.value }).then((res) => {
+    dataList.value.certificationRecords = res.data.rows
+  })
 }
 
 // 菜单
@@ -151,12 +157,12 @@
   {
     name: '检定记录',
     columns: [
-      { text: '委托单编号', value: 'orderCode' },
-      { text: '委托单日期', value: 'orderTime' },
-      { text: '委托方代码', value: 'customerCode' },
-      { text: '委托方名称', value: 'customerName' },
-      { text: '送检人', value: 'deliverer' },
-      { text: '送检日期', value: 'deliverTime' },
+      { text: '委托单编号', value: 'orderCode', align: 'center' },
+      { text: '委托单日期', value: 'orderTime', align: 'center' },
+      { text: '委托方代码', value: 'customerCode', align: 'center' },
+      { text: '委托方名称', value: 'customerName', align: 'center' },
+      { text: '送检人', value: 'deliverer', align: 'center' },
+      { text: '送检日期', value: 'deliverTime', align: 'center' },
     ],
     list: 'measureRecords',
     pagination: true,
@@ -165,11 +171,11 @@
   {
     name: '检定证书',
     columns: [
-      { text: '证书编号', value: 'certificationCode' },
-      { text: '证书名称', value: 'certificationName' },
-      { text: '证书类型', value: 'certificationType' },
-      { text: '证书出具日期', value: 'effectiveDate' },
-      { text: '证书有效期', value: 'expirationDate' },
+      { text: '证书编号', value: 'certificationCode', align: 'center' },
+      { text: '证书名称', value: 'certificationName', align: 'center' },
+      { text: '证书类型', value: 'certificationType', align: 'center' },
+      { text: '证书出具日期', value: 'effectiveDate', align: 'center' },
+      { text: '证书有效期', value: 'expirationDate', align: 'center' },
     ],
     list: 'certificationRecords',
     pagination: true,
@@ -233,18 +239,18 @@
 // 委托方代码获取焦点
 const customerNoFocus = () => {
   visible.value = true
-  console.log(visible.value)
 }
 
 // 选好委托方
 const confirmCheckout = (val: Array<ICustomer>) => {
   if (val && val.length) {
     const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo
-    dataForm.value.customerName = getValue.customerName
-    dataForm.value.phone = getValue.phone
-    dataForm.value.postalCode = getValue.postalCode
-    dataForm.value.customerAddress = getValue.briefName
+    dataForm.value.customerNo = getValue.customerNo // 委托方代码
+    dataForm.value.customerId = getValue.id // 委托方id
+    dataForm.value.customerName = getValue.customerName // 委托方名称
+    dataForm.value.phone = getValue.phone // 电话
+    dataForm.value.postalCode = getValue.postalCode // 邮编
+    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
   }
 }
 
@@ -296,6 +302,7 @@
 const getInfo = () => {
   getSapmleDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data
+    dataForm.value.ABC = res.data.abc
     for (const item of menu) {
       item.searchFunc()
     }
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index a2c4307..c3690d4 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -35,6 +35,7 @@
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center', width: '180px' },
 ])
 // 表格数据
@@ -47,6 +48,7 @@
 const checkoutList = ref<string[]>([])
 // 文件上传input
 const fileRef = ref()
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -62,6 +64,7 @@
     loadingTable.value = false
   })
 }
+
 // 多选发生改变时
 function handleSelectionChange(e: any) {
   checkoutList.value = e.map((item: { id: string }) => item.id)
@@ -71,6 +74,7 @@
 const handleEdit = (row: ISampleList, pageType: 'edit' | 'detail') => {
   $router.push(`/sample/${pageType}/${row.id}`)
 }
+
 // 点击删除
 const handleDelete = (row: ISampleList) => {
   ElMessageBox.confirm(
@@ -94,10 +98,12 @@
       })
     })
 }
+
 // 点击搜索
 const searchList = () => {
   fetchData(true)
 }
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -112,7 +118,7 @@
     offset: 1,
     limit: 20,
   }
-  timeRange.value = ['', '']
+  timeRange.value = ['', ''] // 置空筛选时间
   fetchData(true)
 }
 
@@ -138,10 +144,12 @@
     ElMessage.error('请上传pdf格式')
   }
 }
+
 // 模板下载
 const templateDownload = () => {
 
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -157,10 +165,12 @@
 const uploadAll = () => {
   fileRef.value.click()
 }
+
 // 新建样品
 const add = () => {
   $router.push('/sample/add')
 }
+
 // 导出
 const exportAll = () => {
   const loading = ElLoading.service({
@@ -293,11 +303,13 @@
         <template #columns>
           <el-table-column label="操作" align="center" fixed="right" width="120">
             <template #default="{ row }">
+              <!-- 有orderid(关联了委托书)不允许编辑 -->
               <el-button
                 v-if="proxy.hasPerm('/sample/list/update')"
                 size="small"
                 type="primary"
                 link
+                :disabled="`${row.orderId}` !== ''"
                 @click="handleEdit(row, 'edit')"
               >
                 编辑
@@ -310,11 +322,13 @@
               >
                 详情
               </el-button>
+              <!-- 检测中的样品不允许删除 -->
               <el-button
                 v-if="proxy.hasPerm('/sample/list/delete')"
                 size="small"
                 link
                 type="danger"
+                :disabled="row.sampleSatus !== '3'"
                 @click="handleDelete(row)"
               >
                 删除
diff --git a/src/views/customer/sample/list/sample_list_interface.ts b/src/views/customer/sample/list/sample_list_interface.ts
index 707c8b5..81498a5 100644
--- a/src/views/customer/sample/list/sample_list_interface.ts
+++ b/src/views/customer/sample/list/sample_list_interface.ts
@@ -33,6 +33,7 @@
   sampleModel: string // 样品型号
   manufacturingNo: string // 出厂编号
   customerNo: string // 委托方代码
+  customerId: string // 委托方id
   customerName: string // 委托方名称
   phone: string // 委托方电话
   postalCode: string // 委托方邮编
diff --git a/src/views/customer/sample/list/selectCustomer.vue b/src/views/customer/sample/list/selectCustomer.vue
index 5de352d..0eef7d0 100644
--- a/src/views/customer/sample/list/selectCustomer.vue
+++ b/src/views/customer/sample/list/selectCustomer.vue
@@ -6,7 +6,8 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getCustomerList } from '@/api/customer/customer'
 import { getDictByCode } from '@/api/system/dict'
-const props = defineProps({
+
+defineProps({
   visible: {
     type: Boolean,
     default: false,
@@ -14,18 +15,9 @@
 })
 const emits = defineEmits(['changeVisible', 'confirmCheckout'])
 
-const visibleDialog = computed({
-  get() {
-    return props.visible
-  },
-  set(val) {
-    emits('changeVisible', val)
-  },
-})
-
 // 查询条件
 const listQuery: Ref<ICustomerQuery> = ref({
-  bussinessSize: '', // 业务规模
+  businessSize: '', // 业务规模
   customerName: '', // 公司名称
   customerNo: '', // 客户编号
   grade: '', // 履约评级
@@ -37,40 +29,20 @@
   name: string
   value: string
 }
-// const companySizeList = ref<dictType[]>([]) // 公司规模列表
+
 const businessSizeList = ref<dictType[]>([]) // 业务规模列表
 const gradeList = ref<dictType[]>([]) // 履约评级列表
-// const evaluationList = ref<dictType[]>([]) // 整体评价列表
-function getDict() {
-  // // 获取公司规模
-  // getDictByCode('companySize').then((response) => {
-  //   companySizeList.value = response.data
-  // })
-  // 获取业务规模
-  getDictByCode('businessSize').then((response) => {
-    businessSizeList.value = response.data
-  })
-  // 获取履约评级
-  getDictByCode('grade').then((response) => {
-    gradeList.value = response.data
-  })
-  // // 获取整体评价
-  // getDictByCode('evaluation').then((response) => {
-  //   evaluationList.value = response.data
-  // })
-}
-getDict()
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '客户编号', value: 'customerNo', width: '160', align: 'center', fixed: true },
-  { text: '客户名称', value: 'customerName', width: '120', align: 'center', fixed: true },
-  { text: '公司规模', value: 'companySizeName', align: 'center', fixed: false },
-  { text: '业务规模', value: 'businessSizeName', align: 'center', fixed: false },
-  { text: '履约评级', value: 'gradeName', align: 'center', fixed: false },
-  { text: '整体评价', value: 'evaluationName', align: 'center', fixed: false },
-  { text: '公司地址', value: 'briefName', align: 'center', fixed: false },
-  { text: '创建时间', value: 'createTime', align: 'center', width: '180px', fixed: false },
-  { text: '备注', value: 'remark', align: 'center', fixed: false },
+  { text: '客户名称', value: 'customerName', align: 'center', fixed: true },
+  { text: '公司规模', value: 'companySizeName', width: '110', align: 'center' },
+  { text: '业务规模', value: 'businessSizeName', width: '130', align: 'center' },
+  { text: '履约评级', value: 'gradeName', width: '90', align: 'center' },
+  { text: '整体评价', value: 'evaluationName', width: '110', align: 'center' },
+  { text: '公司地址', value: 'fullAddress', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
+  { text: '备注', value: 'remark', align: 'center' },
 ])
 // 表格数据
 const list = ref<ICustomer[]>([])
@@ -81,44 +53,42 @@
 // 选中的内容
 const checkoutList = ref<string[]>([])
 
-// 数据查询
+function getDict() {
+  // 获取业务规模
+  getDictByCode('businessSize').then((response) => {
+    businessSizeList.value = response.data
+  })
+  // 获取履约评级
+  getDictByCode('grade').then((response) => {
+    gradeList.value = response.data
+  })
+}
+getDict()
+
+// 表格数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getCustomerList(listQuery.value).then((response) => {
-  //   // 模拟数据
-  //   response.data.rows = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', customerAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  //   list.value = response.data.rows.map((item: ICustomer) => {
-  //     if (item.companyProvinceName && item.companyCityName) {
-  //       item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-  //     }
-  //     else {
-  //       item.briefName = item.companyProvinceName || item.companyCityName
-  //     }
-  //     return item
-  //   })
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-
-  // 模拟数据
-  const response = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', customerAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' },
-    { bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', customerAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '2集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' },
-    { bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', customerAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '3集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  list.value = response.map((item: ICustomer) => {
-    if (item.companyProvinceName && item.companyCityName) {
-      item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-    }
-    else {
-      item.briefName = item.companyProvinceName || item.companyCityName
-    }
-    return item
+  getCustomerList(listQuery.value).then((response) => {
+    // 模拟数据
+    list.value = response.data.rows.map((item: ICustomer) => {
+      if (item.addressProvinceName && item.addressCityName) {
+        item.fullAddress = `${item.addressProvinceName}/${item.addressCityName}`
+      }
+      else if (item.addressProvinceName || item.addressCityName) {
+        item.fullAddress = item.addressProvinceName || item.addressCityName
+      }
+      else if (item.addressCountryName) {
+        item.fullAddress = item.addressCountryName
+      }
+      return item
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
   })
-  total.value = 50
-  loadingTable.value = false
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -131,7 +101,7 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    bussinessSize: '', // 业务规模
+    businessSize: '', // 业务规模
     customerName: '', // 公司名称
     customerNo: '', // 客户编号
     grade: '', // 履约评级
@@ -155,9 +125,9 @@
 const cancle = () => {
   emits('changeVisible', false)
 }
+
 // 点击确定
 const clickConfirm = () => {
-  console.log(checkoutList.value)
   if (!checkoutList.value.length) {
     ElMessage({
       message: '请选中',
diff --git a/src/views/customer/sample/overTime/detail.vue b/src/views/customer/sample/overTime/detail.vue
index f553724..1adcbf8 100644
--- a/src/views/customer/sample/overTime/detail.vue
+++ b/src/views/customer/sample/overTime/detail.vue
@@ -184,6 +184,7 @@
 const getInfo = () => {
   getSapmleDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data
+    dataForm.value.ABC = res.data.abc
     for (const item of menu) {
       item.searchFunc()
     }
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index c8f90a1..05fe276 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -19,8 +19,8 @@
   sampleModel: '', // 型号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
-  startTime: '1', // 检定开始时间
-  endTime: '1', // 检定结束时间
+  startTime: '', // 检定开始时间
+  endTime: '', // 检定结束时间
   overtimeStatus: '1', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
   offset: 1,
   limit: 20,
diff --git a/src/views/device/receive/apply/applyEdit.vue b/src/views/device/receive/apply/applyEdit.vue
new file mode 100644
index 0000000..5194bdb
--- /dev/null
+++ b/src/views/device/receive/apply/applyEdit.vue
@@ -0,0 +1,552 @@
+<script lang="ts" setup name="CreateOrCheck">
+import { onMounted, reactive, ref } from 'vue'
+import type { Ref } from 'vue'
+import dayjs from 'dayjs'
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { useRoute, useRouter } from 'vue-router'
+import type { IdeviceList, IdeviceListQuery } from '../receive'
+import SelectDeviceDialog from '../selectDeviceDialog.vue'
+import { toTreeList } from '@/utils/structure'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import {
+  getReceiveApplyListDetail,
+  saveAddReceiveApplyList,
+  saveEditReceiveApplyList,
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import type { userType } from '@/views/system/user/user-interface'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { getDeptTreeList } from '@/api/system/dept'
+import { getUserList } from '@/api/system/user'
+import { submitApproval } from '@/api/approval'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+
+const $route = useRoute()
+const approvalDialog = ref() // 审批对话框显隐
+const typeValue = ref() // add、edit、detail
+const approvalStatus = ref() // 审批类型
+const useDeptList = ref<deptType[]>([]) // 部门列表
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false)
+const isMulti = ref(false) // 是否批量添加(允许多选)
+const selectIndex = ref() // 点击选择的index--点击第几行
+const dialogSelectDiviceVisible = ref(false) // 控制选择设备对话框显隐
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+// 选中的内容
+const checkoutList = ref([])
+// 表单数据
+const form = ref({
+  taskId: '', // 任务id（审批用）
+  id: '',
+  processId: '', // 流程id--查询审批记录使用
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 领用时间
+  applyDesc: '', // 申请说明
+})
+const ruleFormRef = ref<FormInstance>() as any
+const list = ref<IdeviceList[]>([])// 表格数据
+
+// 查询条件
+const listQuery: Ref<IdeviceListQuery> = ref({
+  equipmentName: '', // 仪器名称
+  equipmentNo: '', // 设备编号
+  modelNo: '', // 型号
+  mesureRange: '', // 测量范围
+  useDeptName: '', // 使用部门
+  usePersonName: '', // 使用人
+  managerStateName: '', // 管理状态
+  validDate: '', // 有效日期
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '设备编号', value: 'equipmentNo', align: 'center', width: '230' },
+  { text: '设备名称', value: 'equipmentName', align: 'center' },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: '测量范围', value: 'mesureRange', align: 'center' },
+  { text: '使用部门', value: 'useDeptName', align: 'center' },
+  { text: '使用人', value: 'usePersonName', align: 'center' },
+  { text: '管理状态', value: 'managerStateName', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center' },
+])
+// 表单校验规则
+const rules = reactive<FormRules>({
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'change' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  time: [{ type: 'date', required: true, message: '领用时间不能为空', trigger: 'change' }],
+  applyDesc: [{ required: true, message: '申请说明不能为空', trigger: 'blur' }],
+})
+
+const $router = useRouter()
+// 点击关闭
+const close = () => {
+  $router.back()
+}
+
+const handleClick = (val: string) => {
+  if (val === 'agree') { // 同意
+    approvalDialog.value.initDialog('agree', form.value.taskId)
+  }
+  else if (val === 'reject') { // 驳回
+    approvalDialog.value.initDialog('reject', form.value.taskId)
+  }
+  else if (val === 'refuse') { // 拒绝
+    approvalDialog.value.initDialog('refuse', form.value.taskId)
+  }
+  else if (val === 'revoke') {
+    const params = {
+      taskId: form.value.taskId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认撤回该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        submitApproval('revoke', params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已撤回',
+          })
+        })
+        close()
+      })
+  }
+}
+
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+
+// 删除行
+const delRow = () => {
+  if (checkoutList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    checkoutList.value.forEach((item: IdeviceListQuery) => {
+      list.value.forEach((element, index) => {
+        if (element.equipmentNo === item.equipmentNo) {
+          list.value.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+
+// 增加行
+const addRow = () => {
+  const index = list.value.findIndex(item => !item.equipmentNo)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条设备信息')
+    return
+  }
+  list.value.push({
+    equipmentName: '', // 设备名称
+    equipmentNo: '', // 设备编号
+    modelNo: '', // 型号
+    mesureRange: '', // 测量范围
+    useDeptName: '', // 使用部门
+    usePersonName: '', // 使用人
+    managerStateName: '', // 管理状态
+    validDate: '', // 有效日期
+    equipmentId: '', // 设备ID
+  })
+}
+
+// 点击选择
+const handleSelect = (index: number, row: IdeviceList) => {
+  dialogSelectDiviceVisible.value = true // 选择设备对话框显隐
+  isMulti.value = false // 是否单选, false单选、true表格多选
+  selectIndex.value = index
+}
+
+// 点击批量添加
+const multiAdd = () => {
+  dialogSelectDiviceVisible.value = true
+  isMulti.value = true
+}
+
+// 选择设备对话框关闭
+const closeDialog = () => {
+  dialogSelectDiviceVisible.value = false
+}
+
+// 选择好设备了, 添加选好的设备到表格中
+const updateDeviceConfirm = (val: Array<IdeviceList>) => {
+  if (isMulti.value) { // 批量增加时push
+    val.forEach((item: IdeviceList) => {
+    // 只添加列表里不存在的
+      const index = list.value.findIndex((i: IdeviceList) => item.equipmentNo === i.equipmentNo)
+      if (index === -1) {
+        list.value.push(item)
+      }
+    })
+  }
+  else { // 单选替换
+    const index = list.value.findIndex((i: IdeviceList) => val[0].equipmentNo === i.equipmentNo)
+    if (index !== -1) {
+      ElMessage.warning('此设备已添加过')
+      return
+    }
+    list.value.splice(selectIndex.value, 1, val[0])
+  }
+}
+
+// 保存
+const save = () => {
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      // 保存之前清除空行、避免传给后端无用空对象
+      const index = list.value.findIndex((item: IdeviceList) => !item.equipmentNo)
+      if (index !== -1) {
+        list.value.splice(index, 1)
+      }
+      const params = {
+        applyName: form.value.applyName, // 申请名称
+        applyUnit: form.value.applyUnit, // 申请单位
+        applyPerson: form.value.applyPerson, // 申请人
+        time: form.value.time, // 领用时间
+        applyDesc: form.value.applyDesc, // 申请说明
+        applyType: '1', // 申请类型 领用1
+        id: form.value.id,
+        equipmentList: list.value.map((item) => {
+          return {
+            equipmentId: item.id!,
+          }
+        }),
+      }
+      // 新建
+      if (typeValue.value === 'add') {
+        saveAddReceiveApplyList(params).then((res) => {
+          form.value.id = res.data
+          ElMessage.success('保存成功')
+          loading.close()
+        })
+      }
+      // 保存
+      else if (typeValue.value === 'edit') {
+        saveEditReceiveApplyList(params).then((res) => {
+          form.value.id = res.data
+          ElMessage.success('保存成功')
+          loading.close()
+        })
+      }
+    }
+    else {
+      console.log('表单校验不通过')
+    }
+  })
+}
+
+// 提交表单
+const submit = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (form.value.id) {
+    const params = {
+      id: form.value.id,
+      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL, // 表单id
+    }
+    submitReceiveApplyList(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    })
+  }
+  else {
+    ElMessage.info('请先保存再提交！')
+  }
+}
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 获取使用部门
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res: any) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+// 审批结束回调
+const approvalSuccess = () => {
+  close()
+}
+
+// 编辑、详情--获取详细信息
+const fetchReceiveApplyListDetail = () => {
+  getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
+    form.value.applyUnit = res.data.applyUnit // 部门
+    form.value.applyName = res.data.applyName // 申请名称
+    form.value.applyPerson = res.data.applyPerson// 申请人
+    form.value.time = res.data.time // 领用时间
+    form.value.applyDesc = res.data.applyDesc // 申请说明
+    list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
+      return {
+        ...item,
+        validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+      }
+    })
+  })
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+onMounted(() => {
+  typeValue.value = $route.query.typeValue // 类型add、edit、detail
+  form.value.id = $route.query.id as string // id
+  form.value.taskId = $route.query.taskId as string // 任务id
+  form.value.processId = $route.query.processId as string // 任务id
+  approvalStatus.value = $route.query.approvalStatus // 审批类型
+  // 编辑、详情获取详情页信息
+  if (typeValue.value === 'edit' || typeValue.value === 'detail') {
+    fetchReceiveApplyListDetail() // 获取详细信息
+  }
+
+  // 获取部门信息
+  fetchDeptTreeList()
+  // 获取人员列表--申请人使用
+  fetchUserList()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`设备领用申请-${textMap[typeValue]}`">
+      <template #btns>
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('agree')">
+          同意
+        </el-button>
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('reject')">
+          驳回
+        </el-button>
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('refuse')">
+          拒绝
+        </el-button>
+        <el-button v-if="typeValue === 'add'" type="primary" @click="submit">
+          提交
+        </el-button>
+        <el-button v-if="typeValue === 'add' || typeValue === 'edit'" type="primary" @click="save">
+          保存
+        </el-button>
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '3'" type="primary" @click="handleClick('revoke')">
+          撤回
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div class="create-check">
+      <div class="top-info">
+        <!-- 表单 -->
+        <div class="form-area">
+          <el-form
+            ref="ruleFormRef"
+            :model="form"
+            label-width="120px"
+            :rules="rules"
+          >
+            <el-row :gutter="24">
+              <el-col :span="6">
+                <el-form-item label="申请名称" prop="applyName">
+                  <el-input
+                    v-model="form.applyName"
+                    :placeholder="typeValue === 'detail' ? '' : '请输入申请名称'"
+                    clearable
+                    :disabled="typeValue === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="申请单位" prop="applyUnit">
+                  <dept-select
+                    v-model="form.applyUnit"
+                    placeholder="请选择申请单位"
+                    :data="useDeptList"
+                    :disabled="typeValue === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="申请人" prop="applyPerson">
+                  <el-select
+                    v-model="form.applyPerson"
+                    :disabled="typeValue === 'detail'"
+                    placeholder="请选择申请人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="领用时间" prop="time">
+                  <el-date-picker
+                    v-model="form.time"
+                    type="datetime"
+                    placeholder="请选择领用时间"
+                    format="YYYY-MM-DD hh:mm"
+                    value-format="YYYY-MM-DD hh:mm"
+                    :disabled="typeValue === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="申请说明" prop="applyDesc">
+                  <el-input v-model="form.applyDesc" type="textarea" autosize clearable :disabled="typeValue === 'detail'" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </div>
+      </div>
+      <!-- 表格 -->
+      <detail-block title="设备领用列表">
+        <template #btns>
+          <el-button v-if="typeValue !== 'detail'" type="primary" @click="multiAdd">
+            批量添加
+          </el-button>
+          <el-button v-if="typeValue !== 'detail'" type="primary" @click="addRow">
+            增加行
+          </el-button>
+          <el-button v-if="typeValue !== 'detail'" type="info" @click="delRow">
+            删除行
+          </el-button>
+        </template>
+        <el-table
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column v-if="typeValue !== 'detail'" type="selection" width="38" />
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          >
+            <template v-if="item.value === 'equipmentNo' && (typeValue === 'add' || typeValue === 'edit')" #default="scope">
+              <el-input v-model="scope.row.equipmentNo" placeholder="请选择设备" class="input">
+                <template #append>
+                  <el-button size="small" @click="handleSelect(scope.$index, scope.row)">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+
+      <detail-block v-if="typeValue === 'detail'" title="审批流程">
+        <approval-record :process-id="form.processId" />
+      </detail-block>
+    </div>
+    <select-device-dialog
+      :dialog-select-divice-visible="dialogSelectDiviceVisible"
+      :is-multi="isMulti"
+      @closeDialog="closeDialog"
+      @updateDeviceConfirm="updateDeviceConfirm"
+    />
+
+    <!-- 同意、驳回、拒绝对话框显示 -->
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.create-check {
+  margin-top: 10px;
+
+  .top-info {
+    display: flex;
+    flex-direction: column;
+    width: 100%;
+    padding-right: 10px;
+    border-radius: 10px;
+    background-color: #fff;
+    // padding: 10px;
+
+    .title-button {
+      display: flex;
+      align-items: center;
+
+      &::before {
+        content: "";
+        flex: 1;
+      }
+
+      .button-group {
+        flex: 1;
+        display: flex;
+        justify-content: flex-end;
+      }
+    }
+
+    .form-area {
+      margin-top: 40px;
+    }
+  }
+}
+</style>
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
new file mode 100644
index 0000000..abf559c
--- /dev/null
+++ b/src/views/device/receive/apply/applyList.vue
@@ -0,0 +1,542 @@
+<script lang="ts" setup name="ApplyList">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+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 ButtonBox from '@/components/buttonBox/buttonBox.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { exportFile } from '@/utils/exportUtils'
+import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import {
+  delReceiveApplyList,
+  exportReceiveApplyList,
+  getReceiveApplyList,
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import { submitApproval } from '@/api/approval'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import type { userType } from '@/views/system/user/user-interface'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { getUserList } from '@/api/system/user'
+
+const loadingTable = ref(false) // 表格loading
+const active = ref('') // 选中的按钮
+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 listQuery: Ref<IlistQuery> = ref({
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  approvalStatus: active.value, // 	审批状态
+  processResult: '', // 	处置结果
+  applyType: '1', // 申请类型 领用1
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+  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 columns = ref<TableColumn[]>([
+  { text: '申请编号', value: 'applyNo', align: 'center' },
+  { text: '申请名称', value: 'applyName', align: 'center' },
+  { text: '申请部门', value: 'applyUnitName', align: 'center' },
+  { text: '申请人', value: 'applyPersonName', align: 'center' },
+  { text: '领用时间', value: 'time', align: 'center' },
+  { text: '申请说明', value: 'applyDesc', align: 'center' },
+  { text: '审批状态', value: 'approvalStatus', align: 'center' },
+])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 筛选时间段数据
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.startTime = timeRange.value[0] as string || ''
+  listQuery.value.endTime = timeRange.value[1] as string || ''
+  listQuery.value.approvalStatus = active.value
+  getReceiveApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IlistType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap[item.approvalStatus],
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: active.value, // 	审批状态
+    processResult: '', // 	处置结果
+    applyType: '1', // 申请类型 领用1
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', '']
+  fetchData(true)
+}
+
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+const $router = useRouter()
+
+// 新建
+const add = () => {
+  $router.push({ path: '/receive/add', query: { typeValue: 'add' } })
+}
+
+// 导出
+const exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    const params = {
+      applyNo: listQuery.value.applyNo, // 申请编号
+      applyName: listQuery.value.applyName, // 申请名称
+      applyUnit: listQuery.value.applyUnit, // 申请部门
+      applyPerson: listQuery.value.applyPerson, // 申请人
+      startTime: listQuery.value.startTime, // 申请开始日期
+      endTime: listQuery.value.endTime, // 申请结束日期
+      approvalStatus: listQuery.value.approvalStatus, // 	审批状态
+      processResult: listQuery.value.processResult, // 	处置结果
+      applyType: listQuery.value.applyType, // 申请类型 领用0
+      createUser: listQuery.value.createUser, // 创建人
+      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+      offset: 1,
+      limit: 20,
+      ids: checkoutList.value,
+    }
+    // 调导出接口
+    exportReceiveApplyList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备领用申请列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备领用申请列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: IlistType) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备领用申请列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 操作
+const handleEdit = (row: IlistType, val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      taskId: row.taskId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        submitApproval('revoke', params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+        })
+        fetchData(true)
+      })
+  }
+  else if (val === '删除') {
+    ElMessageBox.confirm(
+      '确认删除该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        delReceiveApplyList({ id: row.id, taskId: row.taskId }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '提交') {
+    ElMessageBox.confirm(
+      '确认提交该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        submitReceiveApplyList({ id: row.id, formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已提交',
+          })
+        })
+        fetchData(true)
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', row.taskId)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', row.taskId)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', row.taskId)
+  }
+  else if (val === '查看' || val === '编辑') {
+    $router.push({
+      path: `/receive/${title}`,
+      query: {
+        typeValue: title,
+        approvalStatus: approvalStatusReserveMap[row.approvalStatus],
+        id: row.id,
+        taskId: row.taskId,
+        processId: row.processId, // 查询审批记录使用
+      },
+    })
+  }
+}
+// 按钮切换
+const changeCurrentButton = (val: string) => {
+  active.value = val
+  window.sessionStorage.setItem('buttonBoxActive', val)
+  clearList()
+}
+
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 获取用户列表(增加模糊查询)
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 获取使用部门
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res: any) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+onMounted(() => {
+  if (window.sessionStorage.getItem('buttonBoxActive')) {
+    active.value = window.sessionStorage.getItem('buttonBoxActive')!
+  }
+  else {
+    active.value = '0' // 全部
+  }
+  nextTick(() => {
+    fetchData(true) // 获取表格数据
+    // 获取使用部门
+    fetchDeptTreeList() // 获取使用部门
+    fetchUserList() // 获取人员列表
+  })
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyNo"
+          placeholder="申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyName"
+          placeholder="申请名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.applyPerson"
+          placeholder="请选择申请人"
+          style="width: 100%;"
+          filterable
+          remote
+          remote-show-suffix
+          :remote-method="remoteMethod"
+          :loading="applyPersonLoading"
+        >
+          <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY-MM-DD hh:mm"
+          value-format="YYYY-MM-DD hh:mm"
+          start-placeholder="领用开始时间"
+          end-placeholder="领用结束时间"
+        />
+      </search-item>
+    </search-area>
+
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @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="220" fixed="right">
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="handleEdit(row, '查看', 'detail')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (active === '0' || active === '2')"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (active === '0' || active === '2')"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (active === '0' || active === '2')"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '编辑', 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (active === '0' || active === '3')"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (active !== '4' && active !== '5')"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatus === '未通过' || row.approvalStatus === '已通过'"
+                @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+    <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
+
diff --git a/src/views/device/receive/applyList.vue b/src/views/device/receive/applyList.vue
deleted file mode 100644
index 63e1ee8..0000000
--- a/src/views/device/receive/applyList.vue
+++ /dev/null
@@ -1,523 +0,0 @@
-<script lang="ts" setup name="ApplyList">
-import { ref } from 'vue'
-import type { Ref } from 'vue'
-import type { DateModelType } from 'element-plus'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { useRouter } from 'vue-router'
-import type { IlistQuery, IlistType } from '@/views/device/receive/receive'
-import ButtonBox from '@/views/device/receive/buttonBox.vue'
-import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-import { exportFile } from '@/utils/exportUtils'
-import { printJSON } from '@/utils/printUtils'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
-import {
-  delReceiveApplyList,
-  exportReceiveApplyList,
-  getReceiveApplyList,
-  submitReceiveApplyList,
-} from '@/api/device/receive'
-import { submitApproval } from '@/api/approval'
-import { getDeptTreeList } from '@/api/system/dept'
-import { toTreeList } from '@/utils/structure'
-import type { userType } from '@/views/system/user/user-interface'
-import type { deptType } from '@/views/device/standingBook/standingBook-interface'
-import { getUserList } from '@/api/system/user'
-
-const loadingTable = ref(false) // 表格loading
-const active = ref('0') // 选中的按钮
-const approvalDialog = ref() // 审批对话框显隐
-const useDeptList = ref<deptType[]>([]) // 部门列表
-const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
-const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
-const applyPersonLoading = ref(false) // 申请人模糊搜索框loading
-
-// 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  applyNo: '', // 申请编号
-  applyName: '', // 申请名称
-  applyUnit: '', // 申请部门id
-  applyUnitName: '', // 申请部门名称
-  applyPerson: '', // 申请人id
-  applyPersonName: '', // 申请人姓名
-  startTime: '', // 领用开始日期
-  endTime: '', // 领用结束日期
-  approvalStatus: '', // 	审批状态
-  processResult: '', // 	处置结果
-  applyType: '1', // 申请类型 领用1
-  createUser: '', // 创建人
-  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
-  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 columns = ref<TableColumn[]>([
-  { text: '申请编号', value: 'applyNo', align: 'center' },
-  { text: '申请名称', value: 'applyName', align: 'center' },
-  { text: '申请部门', value: 'applyUnitName', align: 'center' },
-  { text: '申请人', value: 'applyPersonName', align: 'center' },
-  { text: '领用时间', value: 'time', align: 'center' },
-  { text: '申请说明', value: 'applyDesc', align: 'center' },
-  { text: '审批状态', value: 'approvalStatus', align: 'center' },
-])
-// 选中的内容
-const checkoutList = ref<string[]>([])
-// 筛选时间段数据
-const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-
-// 数据查询
-function fetchData(isNowPage = false) {
-  loadingTable.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.value.offset = 1
-  }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
-  listQuery.value.approvalStatus = active.value
-  getReceiveApplyList(listQuery.value).then((response) => {
-    list.value = response.data.rows.map((item: IlistType) => {
-      return {
-        ...item,
-        approvalStatus: approvalStatusMap[item.approvalStatus],
-      }
-    })
-    total.value = parseInt(response.data.total)
-    loadingTable.value = false
-  })
-}
-
-// 重置
-const clearList = () => {
-  listQuery.value = {
-    applyNo: '', // 申请编号
-    applyName: '', // 申请名称
-    applyUnit: '', // 申请部门
-    applyPerson: '', // 申请人
-    startTime: '', // 申请开始日期
-    endTime: '', // 申请结束日期
-    approvalStatus: '', // 	审批状态
-    processResult: '', // 	处置结果
-    applyType: '1', // 申请类型 领用1
-    createUser: '', // 创建人
-    formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
-    offset: 1,
-    limit: 20,
-  }
-  timeRange.value = ['', '']
-  fetchData(true)
-}
-
-// 搜索
-const searchList = () => {
-  fetchData(true)
-}
-
-// 多选发生改变时
-const handleSelectionChange = (e: any) => {
-  checkoutList.value = e.map((item: { id: string }) => item.id)
-}
-const $router = useRouter()
-
-// 新建
-const add = () => {
-  $router.push({ path: '/receive/add', query: { typeValue: 'add' } })
-}
-
-// 导出
-const exportAll = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: '下载中请稍后',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (list.value.length > 0) {
-    const params = {
-      applyNo: listQuery.value.applyNo, // 申请编号
-      applyName: listQuery.value.applyName, // 申请名称
-      applyUnit: listQuery.value.applyUnit, // 申请部门
-      applyPerson: listQuery.value.applyPerson, // 申请人
-      startTime: listQuery.value.startTime, // 申请开始日期
-      endTime: listQuery.value.endTime, // 申请结束日期
-      approvalStatus: listQuery.value.approvalStatus, // 	审批状态
-      processResult: listQuery.value.processResult, // 	处置结果
-      applyType: listQuery.value.applyType, // 申请类型 领用0
-      createUser: listQuery.value.createUser, // 创建人
-      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
-      offset: 1,
-      limit: 20,
-      ids: checkoutList.value,
-    }
-    // 调导出接口
-    exportReceiveApplyList(params).then((res) => {
-      const blob = new Blob([res.data])
-      exportFile(blob, '设备领用申请列表.xlsx')
-    })
-  }
-  else {
-    ElMessage.warning('无数据可导出数据')
-  }
-  loading.close()
-}
-
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  fetchData(true)
-}
-
-// 打印列表
-function printList() {
-  // 打印列
-  const properties = columns.value.map((item) => {
-    return {
-      field: item.value,
-      displayName: item.text,
-    }
-  })
-  if (checkoutList.value.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '设备领用申请列表')
-  }
-  else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: IlistType) => checkoutList.value.includes(item.id))
-    printJSON(printList, properties, '设备领用申请列表')
-  }
-  else {
-    ElMessage.warning('无可打印内容')
-  }
-}
-
-// 操作
-const handleEdit = (row: IlistType, val: string, title = '') => {
-  if (val === '取消') {
-    const params = {
-      taskId: row.taskId!,
-      comments: '',
-    }
-    ElMessageBox.confirm(
-      '确认取消该审批吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        submitApproval('revoke', params).then((res) => {
-          ElMessage({
-            type: 'success',
-            message: '取消成功',
-          })
-        })
-        fetchData(true)
-      })
-  }
-  else if (val === '删除') {
-    ElMessageBox.confirm(
-      '确认删除该审批吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        delReceiveApplyList({ id: row.id, taskId: row.taskId }).then((res) => {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          fetchData(true)
-        })
-      })
-  }
-  else if (val === '提交') {
-    ElMessageBox.confirm(
-      '确认提交该审批吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        submitReceiveApplyList({ id: row.id, formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL }).then((res) => {
-          ElMessage({
-            type: 'success',
-            message: '已提交',
-          })
-        })
-        fetchData(true)
-      })
-  }
-  else if (val === '同意') {
-    approvalDialog.value.initDialog('agree', row.taskId)
-  }
-  else if (val === '驳回') {
-    approvalDialog.value.initDialog('reject', row.taskId)
-  }
-  else if (val === '拒绝') {
-    approvalDialog.value.initDialog('refuse', row.taskId)
-  }
-  else if (val === '查看' || val === '编辑') {
-    $router.push({
-      path: `/receive/${title}`,
-      query: {
-        typeValue: title,
-        approvalStatus: approvalStatusReserveMap[row.approvalStatus],
-        id: row.id,
-        taskId: row.taskId,
-        processId: row.processId, // 查询审批记录使用
-      },
-    })
-  }
-}
-// 按钮切换
-const changeCurrentButton = (val: string) => {
-  active.value = val
-  clearList()
-}
-
-// 审批结束回调
-const approvalSuccess = () => {
-  fetchData(true)
-}
-
-// 选择器模糊查询
-const remoteMethod = (query: string) => {
-  if (query) {
-    applyPersonLoading.value = true
-    setTimeout(() => {
-      applyPersonLoading.value = false
-      usePersonOptions.value = usePersonList.value.filter((item) => {
-        return item.name.toLowerCase().includes(query.toLowerCase())
-      })
-    }, 200)
-  }
-  else {
-    usePersonOptions.value = usePersonList.value
-  }
-}
-
-// 获取用户列表(增加模糊查询)
-const fetchUserList = () => {
-  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
-    usePersonList.value = res.data.rows
-    usePersonOptions.value = res.data.rows
-  })
-}
-
-// 获取使用部门
-const fetchDeptTreeList = () => {
-  getDeptTreeList().then((res: any) => {
-    if (res.data) { // 将列表转树结构
-      useDeptList.value = toTreeList(res.data, '0', true)
-    }
-  })
-}
-
-onMounted(() => {
-  fetchData(true)
-  // 获取使用部门
-  fetchDeptTreeList()
-  fetchUserList()
-})
-</script>
-
-<template>
-  <app-container>
-    <search-area
-      :need-clear="true"
-      @search="searchList" @clear="clearList"
-    >
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.applyNo"
-          placeholder="申请编号"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.applyName"
-          placeholder="申请名称"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
-      </search-item>
-      <search-item>
-        <el-select
-          v-model="listQuery.applyPerson"
-          placeholder="请选择申请人"
-          style="width: 100%;"
-          filterable
-          remote
-          remote-show-suffix
-          :remote-method="remoteMethod"
-          :loading="applyPersonLoading"
-        >
-          <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="timeRange"
-          type="daterange"
-          range-separator="到"
-          format="YYYY-MM-DD"
-          value-format="YYYY-MM-DD"
-          start-placeholder="领用开始日期"
-          end-placeholder="领用结束日期"
-        />
-      </search-item>
-    </search-area>
-
-    <table-container>
-      <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
-      </template>
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @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="220" fixed="right">
-            <template #default="{ row }">
-              <el-button
-                size="small"
-                type="primary"
-                link
-                @click="handleEdit(row, '查看', 'detail')"
-              >
-                查看
-              </el-button>
-              <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (active === '0' || active === '2')"
-                size="small"
-                link
-                type="primary"
-                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
-                @click="handleEdit(row, '同意')"
-              >
-                同意
-              </el-button>
-              <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (active === '0' || active === '2')"
-                size="small"
-                link
-                type="primary"
-                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
-                @click="handleEdit(row, '驳回')"
-              >
-                驳回
-              </el-button>
-              <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (active === '0' || active === '2')"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
-                @click="handleEdit(row, '拒绝')"
-              >
-                拒绝
-              </el-button>
-              <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
-                size="small"
-                link
-                type="primary"
-                @click="handleEdit(row, '编辑', 'edit')"
-              >
-                编辑
-              </el-button>
-              <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
-                size="small"
-                link
-                type="primary"
-                @click="handleEdit(row, '提交')"
-              >
-                提交
-              </el-button>
-              <!-- 是发起者且审批中可以取消 -->
-              <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (active === '0' || active === '3')"
-                size="small"
-                link
-                type="info"
-                :disabled="row.approvalStatus !== '审批中'"
-                @click="handleEdit(row, '取消')"
-              >
-                取消
-              </el-button>
-              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-              <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (active !== '4' && active !== '5')"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatus === '未通过' || row.approvalStatus === '已通过'"
-                @click="handleEdit(row, '删除')"
-              >
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <button-box :active="active" @changeCurrentButton="changeCurrentButton" />
-    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-  </app-container>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-</style>
-

diff --git a/src/api/customer/overtime.ts b/src/api/customer/overtime.ts
deleted file mode 100644
index 9f349d6..0000000
--- a/src/api/customer/overtime.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * 到期样品接口
- */
-import request from '../index'
-import type { IOvertimeListQuery } from '@/views/customer/sample/overTime/overtime_list_interface'
-const prefix = '/meter'
-
-// 列表查询
-export function getOverTimeList(data: IOvertimeListQuery) {
-  return request({
-    url: `${prefix}/sample/overtime/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 导出列表
-export function exportOverTimeList(data: Omit<IOvertimeListQuery, 'limit' | 'offset'>) {
-  return request({
-    url: `${prefix}/sample/overtime/listExport`,
-    method: 'post',
-    responseType: 'blob',
-    data,
-  })
-}
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index 2610494..21a9c9e 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -59,3 +59,20 @@
   })
 }
 
+// 查询检定记录
+export function getMesureRecords(data: { id: string }) {
+  return request({
+    url: `${prefix}/sample/mesureRecordsBySampleId`,
+    method: 'post',
+    data,
+  })
+}
+
+// 查询检定证书
+export function getCertification(data: { id: string }) {
+  return request({
+    url: `${prefix}/sample/certificationBySampleId`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components.d.ts b/src/components.d.ts
index 227585d..90f2dde 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -21,6 +21,7 @@
     BarCodeBind: typeof import('./components/BarCodeBind/index.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
+    ButtonBox: typeof import('./components/buttonBox/buttonBox.vue')['default']
     CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default']
     CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
diff --git a/src/components/buttonBox/buttonBox.vue b/src/components/buttonBox/buttonBox.vue
new file mode 100644
index 0000000..cf93686
--- /dev/null
+++ b/src/components/buttonBox/buttonBox.vue
@@ -0,0 +1,49 @@
+<!-- 列表页右上角按钮组 -->
+<script lang="ts" setup name="ButtonBox">
+import type { PropType } from 'vue'
+import { ref } from 'vue'
+import type { IMenu } from '../../views/device/receive/receive'
+
+const props = defineProps({
+  active: String,
+  menu: {
+    type: Array as PropType<IMenu[]>,
+  },
+})
+const emits = defineEmits(['changeCurrentButton'])
+
+const current = ref('')
+watch(current, (newValue) => {
+  emits('changeCurrentButton', newValue)
+})
+watch(() => props.active, (newValue) => {
+  current.value = newValue!
+  console.log('pppppp', newValue)
+})
+</script>
+
+<template>
+  <div class="container">
+    <div class="btns">
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.id" :label="item.id">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 69px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 36f5104..fb6758e 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -481,7 +481,7 @@
       {
         path: 'applyList',
         name: 'ApplyList',
-        component: () => import('@/views/device/receive/applyList.vue'),
+        component: () => import('@/views/device/receive/apply/applyList.vue'),
         meta: {
           title: '设备领用申请',
           icon: 'ep:key',
@@ -491,7 +491,7 @@
       {
         path: ':type',
         name: 'ApplyListDetail',
-        component: () => import('@/views/device/receive/createOrCheck.vue'),
+        component: () => import('@/views/device/receive/apply/applyEdit.vue'),
         meta: {
           title: '设备领用申请',
           icon: 'ep:key',
@@ -503,7 +503,7 @@
       {
         path: 'solveList',
         name: 'SolveList',
-        component: () => import('@/views/device/receive/solveList.vue'),
+        component: () => import('@/views/device/receive/solve/solveList.vue'),
         meta: {
           title: '设备领用处理',
           icon: 'ep:key',
@@ -513,7 +513,7 @@
       {
         path: 'solveDetail',
         name: 'SolveListDetail',
-        component: () => import('@/views/device/receive/solveComponent/detail.vue'),
+        component: () => import('@/views/device/receive/solve/solveDetail.vue'),
         meta: {
           title: '设备领用处理',
           icon: 'ep:key',
diff --git a/src/views/customer/bench/bench.vue b/src/views/customer/bench/bench.vue
index 6b502fc..3b8f274 100644
--- a/src/views/customer/bench/bench.vue
+++ b/src/views/customer/bench/bench.vue
@@ -1,15 +1,53 @@
 <script lang="ts" setup name="DeviceBench">
-import { getCurrentInstance, ref } from 'vue'
+import { ref } from 'vue'
 import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
 import type { planReturn } from './bench-interface'
 import Linechart from '@/components/Echart/LineChart.vue'
 import type { lineDataI } from '@/components/Echart/echart-interface'
 import { getCustomerExpireData, getHighQualityCustomerList, getSampleAddData, getSampleExpireData } from '@/api/customer/bench'
+import { getSampleList } from '@/api/customer/sampleList'
+import type { IOvertimeListQuery } from '@/views/customer/sample/overTime/overtime_list_interface'
+import { getAdviceList } from '@/api/customer/advice'
+import type { IAdvice, IAdviceQuery } from '@/views/customer/advice/advice_interface'
 
+const reg = /(\d{4})\年(\d{2})月/ // 把2022年3月转为2022-03
 // 每个展示块高度
 const blockHeight = ref(300)
 const blockWidth = ref(400)
-const { proxy } = getCurrentInstance() as any
+
+// 到期样品查询条件
+const dueSampleListQuery: Ref<IOvertimeListQuery> = ref({
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 型号
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  startTime: '', // 检定开始时间
+  endTime: '', // 检定结束时间
+  overtimeStatus: '1', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+  offset: 1,
+  limit: 20,
+})
+
+// 客户关系查询条件
+const customerRelationsListQuery: Ref<IAdviceQuery> = ref({
+  adviceNo: '', // 投诉编号
+  customerName: '', // 公司名称
+  customerNo: '', // 客户编号
+  startTime: '', // 投诉开始时间
+  endTime: '', // 投诉结束时间
+  offset: 1,
+  limit: 20,
+})
+
+const dueSampleTableLoading = ref(false) // 到期样品表格loading
+const customerRelationsTableLoading = ref(false) // 客户关系loading
+const sampleAddLoading = ref(false) // 样品新增趋势loading
+const customerAddLoading = ref(false) // 客户新增趋势loading
+const sampleExpireLoading = ref(false) // 样品到期趋势loading
+const highQualityCustomerLoading = ref(false) // 优质客户名单loading
+
 // 到期样品表格数据
 const dueSampleTableData = ref()
 // 到期样品表头
@@ -64,54 +102,81 @@
   blockWidth.value = (document.body.clientWidth - 180 - 20 - 20) / 3
   console.log(blockHeight.value, blockWidth.value - 20)
 }
+
 window.addEventListener('resize', () => {
   calcBlockSize()
 })
 
 // 获取样品新增趋势数据
 function fetchSampleAddData() {
+  sampleAddLoading.value = true
   getSampleAddData().then((res) => {
-    sampleAddXData.value = res.data.map((item: planReturn) => {
-      // return item.date.replace('年', '-')
-      return item.date
-    })
+    sampleAddXData.value = res.data.map((item: planReturn) => item.date.replace(reg, '$1-$2'))
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     sampleAddYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
-    sampleAddData.value = [{ name: '客户', data: yValue }]
+    sampleAddData.value = [{ name: '样品', data: yValue }]
+    sampleAddLoading.value = false
   })
 }
 
 // 获取样品到期趋势数据
 function fetchSampleExpireData() {
+  sampleExpireLoading.value = true
   getSampleExpireData().then((res) => {
-    sampleExpireXData.value = res.data.map((item: planReturn) => item.date)
+    sampleExpireXData.value = res.data.map((item: planReturn) => item.date.replace(reg, '$1-$2'))
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     sampleExpireYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
-    sampleExpireData.value = [{ name: '客户', data: yValue }]
+    sampleExpireData.value = [{ name: '样品', data: yValue }]
+    sampleExpireLoading.value = false
   })
 }
 
 // 获取优质客户名单
 function fetchHighQualityCustomerList() {
+  highQualityCustomerLoading.value = true
   getHighQualityCustomerList().then((res) => {
     highQualityCustomerTableData.value = res.data.rows
+    highQualityCustomerLoading.value = false
   })
 }
 // 获取客户新增趋势数据
 function fetchCustomerExpireData() {
+  customerAddLoading.value = true
   getCustomerExpireData().then((res) => {
-    customerAddXData.value = res.data.map((item: planReturn) => item.date)
+    customerAddXData.value = res.data.map((item: planReturn) => item.date.replace(reg, '$1-$2'))
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     customerAddYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
     customerAddData.value = [{ name: '客户', data: yValue }]
+    customerAddLoading.value = false
   })
 }
 
 // 获取到期样品表格数据
+function fetchDueSampleTableData() {
+  dueSampleTableLoading.value = true
+  getSampleList(dueSampleListQuery.value).then((response) => {
+    dueSampleTableData.value = response.data.rows
+    dueSampleTableLoading.value = false
+  })
+}
 // 获取客户关系表格数据
+function fetchcustomerRelationsTableData() {
+  customerRelationsTableLoading.value = true
+  getAdviceList(customerRelationsListQuery.value).then((res) => {
+    customerRelationsTabledata.value = res.data.rows.map((item: IAdvice) => {
+      return {
+        ...item,
+        adviceClass: item.adviceClass === '0' ? '建议' : item.adviceClass === '1' ? '投诉' : '其他',
+      }
+    })
+    customerRelationsTableLoading.value = false
+  })
+}
 
 onMounted(() => {
   calcBlockSize()
+  fetchDueSampleTableData() // 到期样品表格
+  fetchcustomerRelationsTableData() // 客户关系表格
   fetchSampleAddData()// 样品新增趋势
   fetchSampleExpireData()// 样品到期趋势
   fetchCustomerExpireData()// 客户新增趋势
@@ -125,6 +190,7 @@
       <el-row :gutter="10">
         <el-col :span="8">
           <bench-col
+            v-loading="dueSampleTableLoading"
             icon="icon-book"
             title="到期样品"
             path-url="/sample/overtime"
@@ -145,6 +211,7 @@
         </el-col>
         <el-col :span="8">
           <bench-col
+            v-loading="sampleAddLoading"
             icon="icon-line"
             title="样品新增趋势"
             :height="blockHeight"
@@ -159,6 +226,7 @@
         </el-col>
         <el-col :span="8">
           <bench-col
+            v-loading="sampleExpireLoading"
             icon="icon-line"
             title="样品到期趋势"
             :height="blockHeight"
@@ -177,6 +245,7 @@
       <el-row :gutter="10">
         <el-col :span="8">
           <bench-col
+            v-loading="customerRelationsTableLoading"
             icon="icon-book"
             title="客户关系"
             path-url="/customerManage/advice"
@@ -197,6 +266,7 @@
         </el-col>
         <el-col :span="8">
           <bench-col
+            v-loading="customerAddLoading"
             icon="icon-line"
             title="客户新增趋势"
             :height="blockHeight"
@@ -211,6 +281,7 @@
         </el-col>
         <el-col :span="8">
           <bench-col
+            v-loading="highQualityCustomerLoading"
             icon="icon-book"
             title="优质客户名单"
             :style="{ height: blockHeight }"
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index e7d1acb..359c94d 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -8,7 +8,7 @@
 import selectCustomer from './selectCustomer.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import { addSample, getCertification, getMesureRecords, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
@@ -69,6 +69,7 @@
   sampleName: '', // 样品名称
   sampleModel: '', // 样品型号
   manufacturingNo: '', // 出厂编号
+  customerId: '', // 委托方id
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   phone: '', // 委托方电话
@@ -138,12 +139,17 @@
 })
 
 // 获取检定记录
-const fetchMeasureRecords = function (query = null) {
-  dataList.value.measureRecords = []
+const fetchMeasureRecords = (query = null) => {
+  getMesureRecords({ id: infoId.value }).then((res) => {
+    dataList.value.measureRecords = res.data.rows
+  })
 }
+
 // 获取检定证书
-const fetchCertifications = function (query = null) {
-  dataList.value.certificationRecords = []
+const fetchCertifications = (query = null) => {
+  getCertification({ id: infoId.value }).then((res) => {
+    dataList.value.certificationRecords = res.data.rows
+  })
 }
 
 // 菜单
@@ -151,12 +157,12 @@
   {
     name: '检定记录',
     columns: [
-      { text: '委托单编号', value: 'orderCode' },
-      { text: '委托单日期', value: 'orderTime' },
-      { text: '委托方代码', value: 'customerCode' },
-      { text: '委托方名称', value: 'customerName' },
-      { text: '送检人', value: 'deliverer' },
-      { text: '送检日期', value: 'deliverTime' },
+      { text: '委托单编号', value: 'orderCode', align: 'center' },
+      { text: '委托单日期', value: 'orderTime', align: 'center' },
+      { text: '委托方代码', value: 'customerCode', align: 'center' },
+      { text: '委托方名称', value: 'customerName', align: 'center' },
+      { text: '送检人', value: 'deliverer', align: 'center' },
+      { text: '送检日期', value: 'deliverTime', align: 'center' },
     ],
     list: 'measureRecords',
     pagination: true,
@@ -165,11 +171,11 @@
   {
     name: '检定证书',
     columns: [
-      { text: '证书编号', value: 'certificationCode' },
-      { text: '证书名称', value: 'certificationName' },
-      { text: '证书类型', value: 'certificationType' },
-      { text: '证书出具日期', value: 'effectiveDate' },
-      { text: '证书有效期', value: 'expirationDate' },
+      { text: '证书编号', value: 'certificationCode', align: 'center' },
+      { text: '证书名称', value: 'certificationName', align: 'center' },
+      { text: '证书类型', value: 'certificationType', align: 'center' },
+      { text: '证书出具日期', value: 'effectiveDate', align: 'center' },
+      { text: '证书有效期', value: 'expirationDate', align: 'center' },
     ],
     list: 'certificationRecords',
     pagination: true,
@@ -233,18 +239,18 @@
 // 委托方代码获取焦点
 const customerNoFocus = () => {
   visible.value = true
-  console.log(visible.value)
 }
 
 // 选好委托方
 const confirmCheckout = (val: Array<ICustomer>) => {
   if (val && val.length) {
     const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo
-    dataForm.value.customerName = getValue.customerName
-    dataForm.value.phone = getValue.phone
-    dataForm.value.postalCode = getValue.postalCode
-    dataForm.value.customerAddress = getValue.briefName
+    dataForm.value.customerNo = getValue.customerNo // 委托方代码
+    dataForm.value.customerId = getValue.id // 委托方id
+    dataForm.value.customerName = getValue.customerName // 委托方名称
+    dataForm.value.phone = getValue.phone // 电话
+    dataForm.value.postalCode = getValue.postalCode // 邮编
+    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
   }
 }
 
@@ -296,6 +302,7 @@
 const getInfo = () => {
   getSapmleDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data
+    dataForm.value.ABC = res.data.abc
     for (const item of menu) {
       item.searchFunc()
     }
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index a2c4307..c3690d4 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -35,6 +35,7 @@
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center', width: '180px' },
 ])
 // 表格数据
@@ -47,6 +48,7 @@
 const checkoutList = ref<string[]>([])
 // 文件上传input
 const fileRef = ref()
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -62,6 +64,7 @@
     loadingTable.value = false
   })
 }
+
 // 多选发生改变时
 function handleSelectionChange(e: any) {
   checkoutList.value = e.map((item: { id: string }) => item.id)
@@ -71,6 +74,7 @@
 const handleEdit = (row: ISampleList, pageType: 'edit' | 'detail') => {
   $router.push(`/sample/${pageType}/${row.id}`)
 }
+
 // 点击删除
 const handleDelete = (row: ISampleList) => {
   ElMessageBox.confirm(
@@ -94,10 +98,12 @@
       })
     })
 }
+
 // 点击搜索
 const searchList = () => {
   fetchData(true)
 }
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -112,7 +118,7 @@
     offset: 1,
     limit: 20,
   }
-  timeRange.value = ['', '']
+  timeRange.value = ['', ''] // 置空筛选时间
   fetchData(true)
 }
 
@@ -138,10 +144,12 @@
     ElMessage.error('请上传pdf格式')
   }
 }
+
 // 模板下载
 const templateDownload = () => {
 
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -157,10 +165,12 @@
 const uploadAll = () => {
   fileRef.value.click()
 }
+
 // 新建样品
 const add = () => {
   $router.push('/sample/add')
 }
+
 // 导出
 const exportAll = () => {
   const loading = ElLoading.service({
@@ -293,11 +303,13 @@
         <template #columns>
           <el-table-column label="操作" align="center" fixed="right" width="120">
             <template #default="{ row }">
+              <!-- 有orderid(关联了委托书)不允许编辑 -->
               <el-button
                 v-if="proxy.hasPerm('/sample/list/update')"
                 size="small"
                 type="primary"
                 link
+                :disabled="`${row.orderId}` !== ''"
                 @click="handleEdit(row, 'edit')"
               >
                 编辑
@@ -310,11 +322,13 @@
               >
                 详情
               </el-button>
+              <!-- 检测中的样品不允许删除 -->
               <el-button
                 v-if="proxy.hasPerm('/sample/list/delete')"
                 size="small"
                 link
                 type="danger"
+                :disabled="row.sampleSatus !== '3'"
                 @click="handleDelete(row)"
               >
                 删除
diff --git a/src/views/customer/sample/list/sample_list_interface.ts b/src/views/customer/sample/list/sample_list_interface.ts
index 707c8b5..81498a5 100644
--- a/src/views/customer/sample/list/sample_list_interface.ts
+++ b/src/views/customer/sample/list/sample_list_interface.ts
@@ -33,6 +33,7 @@
   sampleModel: string // 样品型号
   manufacturingNo: string // 出厂编号
   customerNo: string // 委托方代码
+  customerId: string // 委托方id
   customerName: string // 委托方名称
   phone: string // 委托方电话
   postalCode: string // 委托方邮编
diff --git a/src/views/customer/sample/list/selectCustomer.vue b/src/views/customer/sample/list/selectCustomer.vue
index 5de352d..0eef7d0 100644
--- a/src/views/customer/sample/list/selectCustomer.vue
+++ b/src/views/customer/sample/list/selectCustomer.vue
@@ -6,7 +6,8 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getCustomerList } from '@/api/customer/customer'
 import { getDictByCode } from '@/api/system/dict'
-const props = defineProps({
+
+defineProps({
   visible: {
     type: Boolean,
     default: false,
@@ -14,18 +15,9 @@
 })
 const emits = defineEmits(['changeVisible', 'confirmCheckout'])
 
-const visibleDialog = computed({
-  get() {
-    return props.visible
-  },
-  set(val) {
-    emits('changeVisible', val)
-  },
-})
-
 // 查询条件
 const listQuery: Ref<ICustomerQuery> = ref({
-  bussinessSize: '', // 业务规模
+  businessSize: '', // 业务规模
   customerName: '', // 公司名称
   customerNo: '', // 客户编号
   grade: '', // 履约评级
@@ -37,40 +29,20 @@
   name: string
   value: string
 }
-// const companySizeList = ref<dictType[]>([]) // 公司规模列表
+
 const businessSizeList = ref<dictType[]>([]) // 业务规模列表
 const gradeList = ref<dictType[]>([]) // 履约评级列表
-// const evaluationList = ref<dictType[]>([]) // 整体评价列表
-function getDict() {
-  // // 获取公司规模
-  // getDictByCode('companySize').then((response) => {
-  //   companySizeList.value = response.data
-  // })
-  // 获取业务规模
-  getDictByCode('businessSize').then((response) => {
-    businessSizeList.value = response.data
-  })
-  // 获取履约评级
-  getDictByCode('grade').then((response) => {
-    gradeList.value = response.data
-  })
-  // // 获取整体评价
-  // getDictByCode('evaluation').then((response) => {
-  //   evaluationList.value = response.data
-  // })
-}
-getDict()
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '客户编号', value: 'customerNo', width: '160', align: 'center', fixed: true },
-  { text: '客户名称', value: 'customerName', width: '120', align: 'center', fixed: true },
-  { text: '公司规模', value: 'companySizeName', align: 'center', fixed: false },
-  { text: '业务规模', value: 'businessSizeName', align: 'center', fixed: false },
-  { text: '履约评级', value: 'gradeName', align: 'center', fixed: false },
-  { text: '整体评价', value: 'evaluationName', align: 'center', fixed: false },
-  { text: '公司地址', value: 'briefName', align: 'center', fixed: false },
-  { text: '创建时间', value: 'createTime', align: 'center', width: '180px', fixed: false },
-  { text: '备注', value: 'remark', align: 'center', fixed: false },
+  { text: '客户名称', value: 'customerName', align: 'center', fixed: true },
+  { text: '公司规模', value: 'companySizeName', width: '110', align: 'center' },
+  { text: '业务规模', value: 'businessSizeName', width: '130', align: 'center' },
+  { text: '履约评级', value: 'gradeName', width: '90', align: 'center' },
+  { text: '整体评价', value: 'evaluationName', width: '110', align: 'center' },
+  { text: '公司地址', value: 'fullAddress', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
+  { text: '备注', value: 'remark', align: 'center' },
 ])
 // 表格数据
 const list = ref<ICustomer[]>([])
@@ -81,44 +53,42 @@
 // 选中的内容
 const checkoutList = ref<string[]>([])
 
-// 数据查询
+function getDict() {
+  // 获取业务规模
+  getDictByCode('businessSize').then((response) => {
+    businessSizeList.value = response.data
+  })
+  // 获取履约评级
+  getDictByCode('grade').then((response) => {
+    gradeList.value = response.data
+  })
+}
+getDict()
+
+// 表格数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getCustomerList(listQuery.value).then((response) => {
-  //   // 模拟数据
-  //   response.data.rows = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', customerAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  //   list.value = response.data.rows.map((item: ICustomer) => {
-  //     if (item.companyProvinceName && item.companyCityName) {
-  //       item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-  //     }
-  //     else {
-  //       item.briefName = item.companyProvinceName || item.companyCityName
-  //     }
-  //     return item
-  //   })
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-
-  // 模拟数据
-  const response = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', customerAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' },
-    { bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', customerAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '2集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' },
-    { bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', customerAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '3集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  list.value = response.map((item: ICustomer) => {
-    if (item.companyProvinceName && item.companyCityName) {
-      item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-    }
-    else {
-      item.briefName = item.companyProvinceName || item.companyCityName
-    }
-    return item
+  getCustomerList(listQuery.value).then((response) => {
+    // 模拟数据
+    list.value = response.data.rows.map((item: ICustomer) => {
+      if (item.addressProvinceName && item.addressCityName) {
+        item.fullAddress = `${item.addressProvinceName}/${item.addressCityName}`
+      }
+      else if (item.addressProvinceName || item.addressCityName) {
+        item.fullAddress = item.addressProvinceName || item.addressCityName
+      }
+      else if (item.addressCountryName) {
+        item.fullAddress = item.addressCountryName
+      }
+      return item
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
   })
-  total.value = 50
-  loadingTable.value = false
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -131,7 +101,7 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    bussinessSize: '', // 业务规模
+    businessSize: '', // 业务规模
     customerName: '', // 公司名称
     customerNo: '', // 客户编号
     grade: '', // 履约评级
@@ -155,9 +125,9 @@
 const cancle = () => {
   emits('changeVisible', false)
 }
+
 // 点击确定
 const clickConfirm = () => {
-  console.log(checkoutList.value)
   if (!checkoutList.value.length) {
     ElMessage({
       message: '请选中',
diff --git a/src/views/customer/sample/overTime/detail.vue b/src/views/customer/sample/overTime/detail.vue
index f553724..1adcbf8 100644
--- a/src/views/customer/sample/overTime/detail.vue
+++ b/src/views/customer/sample/overTime/detail.vue
@@ -184,6 +184,7 @@
 const getInfo = () => {
   getSapmleDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data
+    dataForm.value.ABC = res.data.abc
     for (const item of menu) {
       item.searchFunc()
     }
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index c8f90a1..05fe276 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -19,8 +19,8 @@
   sampleModel: '', // 型号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
-  startTime: '1', // 检定开始时间
-  endTime: '1', // 检定结束时间
+  startTime: '', // 检定开始时间
+  endTime: '', // 检定结束时间
   overtimeStatus: '1', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
   offset: 1,
   limit: 20,
diff --git a/src/views/device/receive/apply/applyEdit.vue b/src/views/device/receive/apply/applyEdit.vue
new file mode 100644
index 0000000..5194bdb
--- /dev/null
+++ b/src/views/device/receive/apply/applyEdit.vue
@@ -0,0 +1,552 @@
+<script lang="ts" setup name="CreateOrCheck">
+import { onMounted, reactive, ref } from 'vue'
+import type { Ref } from 'vue'
+import dayjs from 'dayjs'
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { useRoute, useRouter } from 'vue-router'
+import type { IdeviceList, IdeviceListQuery } from '../receive'
+import SelectDeviceDialog from '../selectDeviceDialog.vue'
+import { toTreeList } from '@/utils/structure'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import {
+  getReceiveApplyListDetail,
+  saveAddReceiveApplyList,
+  saveEditReceiveApplyList,
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import type { userType } from '@/views/system/user/user-interface'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { getDeptTreeList } from '@/api/system/dept'
+import { getUserList } from '@/api/system/user'
+import { submitApproval } from '@/api/approval'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+
+const $route = useRoute()
+const approvalDialog = ref() // 审批对话框显隐
+const typeValue = ref() // add、edit、detail
+const approvalStatus = ref() // 审批类型
+const useDeptList = ref<deptType[]>([]) // 部门列表
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false)
+const isMulti = ref(false) // 是否批量添加(允许多选)
+const selectIndex = ref() // 点击选择的index--点击第几行
+const dialogSelectDiviceVisible = ref(false) // 控制选择设备对话框显隐
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+// 选中的内容
+const checkoutList = ref([])
+// 表单数据
+const form = ref({
+  taskId: '', // 任务id（审批用）
+  id: '',
+  processId: '', // 流程id--查询审批记录使用
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 领用时间
+  applyDesc: '', // 申请说明
+})
+const ruleFormRef = ref<FormInstance>() as any
+const list = ref<IdeviceList[]>([])// 表格数据
+
+// 查询条件
+const listQuery: Ref<IdeviceListQuery> = ref({
+  equipmentName: '', // 仪器名称
+  equipmentNo: '', // 设备编号
+  modelNo: '', // 型号
+  mesureRange: '', // 测量范围
+  useDeptName: '', // 使用部门
+  usePersonName: '', // 使用人
+  managerStateName: '', // 管理状态
+  validDate: '', // 有效日期
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '设备编号', value: 'equipmentNo', align: 'center', width: '230' },
+  { text: '设备名称', value: 'equipmentName', align: 'center' },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: '测量范围', value: 'mesureRange', align: 'center' },
+  { text: '使用部门', value: 'useDeptName', align: 'center' },
+  { text: '使用人', value: 'usePersonName', align: 'center' },
+  { text: '管理状态', value: 'managerStateName', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center' },
+])
+// 表单校验规则
+const rules = reactive<FormRules>({
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'change' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  time: [{ type: 'date', required: true, message: '领用时间不能为空', trigger: 'change' }],
+  applyDesc: [{ required: true, message: '申请说明不能为空', trigger: 'blur' }],
+})
+
+const $router = useRouter()
+// 点击关闭
+const close = () => {
+  $router.back()
+}
+
+const handleClick = (val: string) => {
+  if (val === 'agree') { // 同意
+    approvalDialog.value.initDialog('agree', form.value.taskId)
+  }
+  else if (val === 'reject') { // 驳回
+    approvalDialog.value.initDialog('reject', form.value.taskId)
+  }
+  else if (val === 'refuse') { // 拒绝
+    approvalDialog.value.initDialog('refuse', form.value.taskId)
+  }
+  else if (val === 'revoke') {
+    const params = {
+      taskId: form.value.taskId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认撤回该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        submitApproval('revoke', params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已撤回',
+          })
+        })
+        close()
+      })
+  }
+}
+
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+
+// 删除行
+const delRow = () => {
+  if (checkoutList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    checkoutList.value.forEach((item: IdeviceListQuery) => {
+      list.value.forEach((element, index) => {
+        if (element.equipmentNo === item.equipmentNo) {
+          list.value.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+
+// 增加行
+const addRow = () => {
+  const index = list.value.findIndex(item => !item.equipmentNo)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条设备信息')
+    return
+  }
+  list.value.push({
+    equipmentName: '', // 设备名称
+    equipmentNo: '', // 设备编号
+    modelNo: '', // 型号
+    mesureRange: '', // 测量范围
+    useDeptName: '', // 使用部门
+    usePersonName: '', // 使用人
+    managerStateName: '', // 管理状态
+    validDate: '', // 有效日期
+    equipmentId: '', // 设备ID
+  })
+}
+
+// 点击选择
+const handleSelect = (index: number, row: IdeviceList) => {
+  dialogSelectDiviceVisible.value = true // 选择设备对话框显隐
+  isMulti.value = false // 是否单选, false单选、true表格多选
+  selectIndex.value = index
+}
+
+// 点击批量添加
+const multiAdd = () => {
+  dialogSelectDiviceVisible.value = true
+  isMulti.value = true
+}
+
+// 选择设备对话框关闭
+const closeDialog = () => {
+  dialogSelectDiviceVisible.value = false
+}
+
+// 选择好设备了, 添加选好的设备到表格中
+const updateDeviceConfirm = (val: Array<IdeviceList>) => {
+  if (isMulti.value) { // 批量增加时push
+    val.forEach((item: IdeviceList) => {
+    // 只添加列表里不存在的
+      const index = list.value.findIndex((i: IdeviceList) => item.equipmentNo === i.equipmentNo)
+      if (index === -1) {
+        list.value.push(item)
+      }
+    })
+  }
+  else { // 单选替换
+    const index = list.value.findIndex((i: IdeviceList) => val[0].equipmentNo === i.equipmentNo)
+    if (index !== -1) {
+      ElMessage.warning('此设备已添加过')
+      return
+    }
+    list.value.splice(selectIndex.value, 1, val[0])
+  }
+}
+
+// 保存
+const save = () => {
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      // 保存之前清除空行、避免传给后端无用空对象
+      const index = list.value.findIndex((item: IdeviceList) => !item.equipmentNo)
+      if (index !== -1) {
+        list.value.splice(index, 1)
+      }
+      const params = {
+        applyName: form.value.applyName, // 申请名称
+        applyUnit: form.value.applyUnit, // 申请单位
+        applyPerson: form.value.applyPerson, // 申请人
+        time: form.value.time, // 领用时间
+        applyDesc: form.value.applyDesc, // 申请说明
+        applyType: '1', // 申请类型 领用1
+        id: form.value.id,
+        equipmentList: list.value.map((item) => {
+          return {
+            equipmentId: item.id!,
+          }
+        }),
+      }
+      // 新建
+      if (typeValue.value === 'add') {
+        saveAddReceiveApplyList(params).then((res) => {
+          form.value.id = res.data
+          ElMessage.success('保存成功')
+          loading.close()
+        })
+      }
+      // 保存
+      else if (typeValue.value === 'edit') {
+        saveEditReceiveApplyList(params).then((res) => {
+          form.value.id = res.data
+          ElMessage.success('保存成功')
+          loading.close()
+        })
+      }
+    }
+    else {
+      console.log('表单校验不通过')
+    }
+  })
+}
+
+// 提交表单
+const submit = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (form.value.id) {
+    const params = {
+      id: form.value.id,
+      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL, // 表单id
+    }
+    submitReceiveApplyList(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    })
+  }
+  else {
+    ElMessage.info('请先保存再提交！')
+  }
+}
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 获取使用部门
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res: any) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+// 审批结束回调
+const approvalSuccess = () => {
+  close()
+}
+
+// 编辑、详情--获取详细信息
+const fetchReceiveApplyListDetail = () => {
+  getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
+    form.value.applyUnit = res.data.applyUnit // 部门
+    form.value.applyName = res.data.applyName // 申请名称
+    form.value.applyPerson = res.data.applyPerson// 申请人
+    form.value.time = res.data.time // 领用时间
+    form.value.applyDesc = res.data.applyDesc // 申请说明
+    list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
+      return {
+        ...item,
+        validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+      }
+    })
+  })
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+onMounted(() => {
+  typeValue.value = $route.query.typeValue // 类型add、edit、detail
+  form.value.id = $route.query.id as string // id
+  form.value.taskId = $route.query.taskId as string // 任务id
+  form.value.processId = $route.query.processId as string // 任务id
+  approvalStatus.value = $route.query.approvalStatus // 审批类型
+  // 编辑、详情获取详情页信息
+  if (typeValue.value === 'edit' || typeValue.value === 'detail') {
+    fetchReceiveApplyListDetail() // 获取详细信息
+  }
+
+  // 获取部门信息
+  fetchDeptTreeList()
+  // 获取人员列表--申请人使用
+  fetchUserList()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`设备领用申请-${textMap[typeValue]}`">
+      <template #btns>
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('agree')">
+          同意
+        </el-button>
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('reject')">
+          驳回
+        </el-button>
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('refuse')">
+          拒绝
+        </el-button>
+        <el-button v-if="typeValue === 'add'" type="primary" @click="submit">
+          提交
+        </el-button>
+        <el-button v-if="typeValue === 'add' || typeValue === 'edit'" type="primary" @click="save">
+          保存
+        </el-button>
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '3'" type="primary" @click="handleClick('revoke')">
+          撤回
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div class="create-check">
+      <div class="top-info">
+        <!-- 表单 -->
+        <div class="form-area">
+          <el-form
+            ref="ruleFormRef"
+            :model="form"
+            label-width="120px"
+            :rules="rules"
+          >
+            <el-row :gutter="24">
+              <el-col :span="6">
+                <el-form-item label="申请名称" prop="applyName">
+                  <el-input
+                    v-model="form.applyName"
+                    :placeholder="typeValue === 'detail' ? '' : '请输入申请名称'"
+                    clearable
+                    :disabled="typeValue === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="申请单位" prop="applyUnit">
+                  <dept-select
+                    v-model="form.applyUnit"
+                    placeholder="请选择申请单位"
+                    :data="useDeptList"
+                    :disabled="typeValue === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="申请人" prop="applyPerson">
+                  <el-select
+                    v-model="form.applyPerson"
+                    :disabled="typeValue === 'detail'"
+                    placeholder="请选择申请人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="领用时间" prop="time">
+                  <el-date-picker
+                    v-model="form.time"
+                    type="datetime"
+                    placeholder="请选择领用时间"
+                    format="YYYY-MM-DD hh:mm"
+                    value-format="YYYY-MM-DD hh:mm"
+                    :disabled="typeValue === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="申请说明" prop="applyDesc">
+                  <el-input v-model="form.applyDesc" type="textarea" autosize clearable :disabled="typeValue === 'detail'" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </div>
+      </div>
+      <!-- 表格 -->
+      <detail-block title="设备领用列表">
+        <template #btns>
+          <el-button v-if="typeValue !== 'detail'" type="primary" @click="multiAdd">
+            批量添加
+          </el-button>
+          <el-button v-if="typeValue !== 'detail'" type="primary" @click="addRow">
+            增加行
+          </el-button>
+          <el-button v-if="typeValue !== 'detail'" type="info" @click="delRow">
+            删除行
+          </el-button>
+        </template>
+        <el-table
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column v-if="typeValue !== 'detail'" type="selection" width="38" />
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          >
+            <template v-if="item.value === 'equipmentNo' && (typeValue === 'add' || typeValue === 'edit')" #default="scope">
+              <el-input v-model="scope.row.equipmentNo" placeholder="请选择设备" class="input">
+                <template #append>
+                  <el-button size="small" @click="handleSelect(scope.$index, scope.row)">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+
+      <detail-block v-if="typeValue === 'detail'" title="审批流程">
+        <approval-record :process-id="form.processId" />
+      </detail-block>
+    </div>
+    <select-device-dialog
+      :dialog-select-divice-visible="dialogSelectDiviceVisible"
+      :is-multi="isMulti"
+      @closeDialog="closeDialog"
+      @updateDeviceConfirm="updateDeviceConfirm"
+    />
+
+    <!-- 同意、驳回、拒绝对话框显示 -->
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.create-check {
+  margin-top: 10px;
+
+  .top-info {
+    display: flex;
+    flex-direction: column;
+    width: 100%;
+    padding-right: 10px;
+    border-radius: 10px;
+    background-color: #fff;
+    // padding: 10px;
+
+    .title-button {
+      display: flex;
+      align-items: center;
+
+      &::before {
+        content: "";
+        flex: 1;
+      }
+
+      .button-group {
+        flex: 1;
+        display: flex;
+        justify-content: flex-end;
+      }
+    }
+
+    .form-area {
+      margin-top: 40px;
+    }
+  }
+}
+</style>
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
new file mode 100644
index 0000000..abf559c
--- /dev/null
+++ b/src/views/device/receive/apply/applyList.vue
@@ -0,0 +1,542 @@
+<script lang="ts" setup name="ApplyList">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+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 ButtonBox from '@/components/buttonBox/buttonBox.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { exportFile } from '@/utils/exportUtils'
+import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import {
+  delReceiveApplyList,
+  exportReceiveApplyList,
+  getReceiveApplyList,
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import { submitApproval } from '@/api/approval'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import type { userType } from '@/views/system/user/user-interface'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { getUserList } from '@/api/system/user'
+
+const loadingTable = ref(false) // 表格loading
+const active = ref('') // 选中的按钮
+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 listQuery: Ref<IlistQuery> = ref({
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  approvalStatus: active.value, // 	审批状态
+  processResult: '', // 	处置结果
+  applyType: '1', // 申请类型 领用1
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+  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 columns = ref<TableColumn[]>([
+  { text: '申请编号', value: 'applyNo', align: 'center' },
+  { text: '申请名称', value: 'applyName', align: 'center' },
+  { text: '申请部门', value: 'applyUnitName', align: 'center' },
+  { text: '申请人', value: 'applyPersonName', align: 'center' },
+  { text: '领用时间', value: 'time', align: 'center' },
+  { text: '申请说明', value: 'applyDesc', align: 'center' },
+  { text: '审批状态', value: 'approvalStatus', align: 'center' },
+])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 筛选时间段数据
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.startTime = timeRange.value[0] as string || ''
+  listQuery.value.endTime = timeRange.value[1] as string || ''
+  listQuery.value.approvalStatus = active.value
+  getReceiveApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IlistType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap[item.approvalStatus],
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: active.value, // 	审批状态
+    processResult: '', // 	处置结果
+    applyType: '1', // 申请类型 领用1
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', '']
+  fetchData(true)
+}
+
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+const $router = useRouter()
+
+// 新建
+const add = () => {
+  $router.push({ path: '/receive/add', query: { typeValue: 'add' } })
+}
+
+// 导出
+const exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    const params = {
+      applyNo: listQuery.value.applyNo, // 申请编号
+      applyName: listQuery.value.applyName, // 申请名称
+      applyUnit: listQuery.value.applyUnit, // 申请部门
+      applyPerson: listQuery.value.applyPerson, // 申请人
+      startTime: listQuery.value.startTime, // 申请开始日期
+      endTime: listQuery.value.endTime, // 申请结束日期
+      approvalStatus: listQuery.value.approvalStatus, // 	审批状态
+      processResult: listQuery.value.processResult, // 	处置结果
+      applyType: listQuery.value.applyType, // 申请类型 领用0
+      createUser: listQuery.value.createUser, // 创建人
+      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+      offset: 1,
+      limit: 20,
+      ids: checkoutList.value,
+    }
+    // 调导出接口
+    exportReceiveApplyList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备领用申请列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备领用申请列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: IlistType) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备领用申请列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 操作
+const handleEdit = (row: IlistType, val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      taskId: row.taskId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        submitApproval('revoke', params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+        })
+        fetchData(true)
+      })
+  }
+  else if (val === '删除') {
+    ElMessageBox.confirm(
+      '确认删除该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        delReceiveApplyList({ id: row.id, taskId: row.taskId }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '提交') {
+    ElMessageBox.confirm(
+      '确认提交该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        submitReceiveApplyList({ id: row.id, formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已提交',
+          })
+        })
+        fetchData(true)
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', row.taskId)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', row.taskId)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', row.taskId)
+  }
+  else if (val === '查看' || val === '编辑') {
+    $router.push({
+      path: `/receive/${title}`,
+      query: {
+        typeValue: title,
+        approvalStatus: approvalStatusReserveMap[row.approvalStatus],
+        id: row.id,
+        taskId: row.taskId,
+        processId: row.processId, // 查询审批记录使用
+      },
+    })
+  }
+}
+// 按钮切换
+const changeCurrentButton = (val: string) => {
+  active.value = val
+  window.sessionStorage.setItem('buttonBoxActive', val)
+  clearList()
+}
+
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 获取用户列表(增加模糊查询)
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 获取使用部门
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res: any) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+onMounted(() => {
+  if (window.sessionStorage.getItem('buttonBoxActive')) {
+    active.value = window.sessionStorage.getItem('buttonBoxActive')!
+  }
+  else {
+    active.value = '0' // 全部
+  }
+  nextTick(() => {
+    fetchData(true) // 获取表格数据
+    // 获取使用部门
+    fetchDeptTreeList() // 获取使用部门
+    fetchUserList() // 获取人员列表
+  })
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyNo"
+          placeholder="申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyName"
+          placeholder="申请名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.applyPerson"
+          placeholder="请选择申请人"
+          style="width: 100%;"
+          filterable
+          remote
+          remote-show-suffix
+          :remote-method="remoteMethod"
+          :loading="applyPersonLoading"
+        >
+          <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY-MM-DD hh:mm"
+          value-format="YYYY-MM-DD hh:mm"
+          start-placeholder="领用开始时间"
+          end-placeholder="领用结束时间"
+        />
+      </search-item>
+    </search-area>
+
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @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="220" fixed="right">
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="handleEdit(row, '查看', 'detail')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (active === '0' || active === '2')"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (active === '0' || active === '2')"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (active === '0' || active === '2')"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '编辑', 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (active === '0' || active === '3')"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (active !== '4' && active !== '5')"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatus === '未通过' || row.approvalStatus === '已通过'"
+                @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+    <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
+
diff --git a/src/views/device/receive/applyList.vue b/src/views/device/receive/applyList.vue
deleted file mode 100644
index 63e1ee8..0000000
--- a/src/views/device/receive/applyList.vue
+++ /dev/null
@@ -1,523 +0,0 @@
-<script lang="ts" setup name="ApplyList">
-import { ref } from 'vue'
-import type { Ref } from 'vue'
-import type { DateModelType } from 'element-plus'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { useRouter } from 'vue-router'
-import type { IlistQuery, IlistType } from '@/views/device/receive/receive'
-import ButtonBox from '@/views/device/receive/buttonBox.vue'
-import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-import { exportFile } from '@/utils/exportUtils'
-import { printJSON } from '@/utils/printUtils'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
-import {
-  delReceiveApplyList,
-  exportReceiveApplyList,
-  getReceiveApplyList,
-  submitReceiveApplyList,
-} from '@/api/device/receive'
-import { submitApproval } from '@/api/approval'
-import { getDeptTreeList } from '@/api/system/dept'
-import { toTreeList } from '@/utils/structure'
-import type { userType } from '@/views/system/user/user-interface'
-import type { deptType } from '@/views/device/standingBook/standingBook-interface'
-import { getUserList } from '@/api/system/user'
-
-const loadingTable = ref(false) // 表格loading
-const active = ref('0') // 选中的按钮
-const approvalDialog = ref() // 审批对话框显隐
-const useDeptList = ref<deptType[]>([]) // 部门列表
-const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
-const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
-const applyPersonLoading = ref(false) // 申请人模糊搜索框loading
-
-// 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  applyNo: '', // 申请编号
-  applyName: '', // 申请名称
-  applyUnit: '', // 申请部门id
-  applyUnitName: '', // 申请部门名称
-  applyPerson: '', // 申请人id
-  applyPersonName: '', // 申请人姓名
-  startTime: '', // 领用开始日期
-  endTime: '', // 领用结束日期
-  approvalStatus: '', // 	审批状态
-  processResult: '', // 	处置结果
-  applyType: '1', // 申请类型 领用1
-  createUser: '', // 创建人
-  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
-  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 columns = ref<TableColumn[]>([
-  { text: '申请编号', value: 'applyNo', align: 'center' },
-  { text: '申请名称', value: 'applyName', align: 'center' },
-  { text: '申请部门', value: 'applyUnitName', align: 'center' },
-  { text: '申请人', value: 'applyPersonName', align: 'center' },
-  { text: '领用时间', value: 'time', align: 'center' },
-  { text: '申请说明', value: 'applyDesc', align: 'center' },
-  { text: '审批状态', value: 'approvalStatus', align: 'center' },
-])
-// 选中的内容
-const checkoutList = ref<string[]>([])
-// 筛选时间段数据
-const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-
-// 数据查询
-function fetchData(isNowPage = false) {
-  loadingTable.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.value.offset = 1
-  }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
-  listQuery.value.approvalStatus = active.value
-  getReceiveApplyList(listQuery.value).then((response) => {
-    list.value = response.data.rows.map((item: IlistType) => {
-      return {
-        ...item,
-        approvalStatus: approvalStatusMap[item.approvalStatus],
-      }
-    })
-    total.value = parseInt(response.data.total)
-    loadingTable.value = false
-  })
-}
-
-// 重置
-const clearList = () => {
-  listQuery.value = {
-    applyNo: '', // 申请编号
-    applyName: '', // 申请名称
-    applyUnit: '', // 申请部门
-    applyPerson: '', // 申请人
-    startTime: '', // 申请开始日期
-    endTime: '', // 申请结束日期
-    approvalStatus: '', // 	审批状态
-    processResult: '', // 	处置结果
-    applyType: '1', // 申请类型 领用1
-    createUser: '', // 创建人
-    formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
-    offset: 1,
-    limit: 20,
-  }
-  timeRange.value = ['', '']
-  fetchData(true)
-}
-
-// 搜索
-const searchList = () => {
-  fetchData(true)
-}
-
-// 多选发生改变时
-const handleSelectionChange = (e: any) => {
-  checkoutList.value = e.map((item: { id: string }) => item.id)
-}
-const $router = useRouter()
-
-// 新建
-const add = () => {
-  $router.push({ path: '/receive/add', query: { typeValue: 'add' } })
-}
-
-// 导出
-const exportAll = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: '下载中请稍后',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (list.value.length > 0) {
-    const params = {
-      applyNo: listQuery.value.applyNo, // 申请编号
-      applyName: listQuery.value.applyName, // 申请名称
-      applyUnit: listQuery.value.applyUnit, // 申请部门
-      applyPerson: listQuery.value.applyPerson, // 申请人
-      startTime: listQuery.value.startTime, // 申请开始日期
-      endTime: listQuery.value.endTime, // 申请结束日期
-      approvalStatus: listQuery.value.approvalStatus, // 	审批状态
-      processResult: listQuery.value.processResult, // 	处置结果
-      applyType: listQuery.value.applyType, // 申请类型 领用0
-      createUser: listQuery.value.createUser, // 创建人
-      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
-      offset: 1,
-      limit: 20,
-      ids: checkoutList.value,
-    }
-    // 调导出接口
-    exportReceiveApplyList(params).then((res) => {
-      const blob = new Blob([res.data])
-      exportFile(blob, '设备领用申请列表.xlsx')
-    })
-  }
-  else {
-    ElMessage.warning('无数据可导出数据')
-  }
-  loading.close()
-}
-
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  fetchData(true)
-}
-
-// 打印列表
-function printList() {
-  // 打印列
-  const properties = columns.value.map((item) => {
-    return {
-      field: item.value,
-      displayName: item.text,
-    }
-  })
-  if (checkoutList.value.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '设备领用申请列表')
-  }
-  else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: IlistType) => checkoutList.value.includes(item.id))
-    printJSON(printList, properties, '设备领用申请列表')
-  }
-  else {
-    ElMessage.warning('无可打印内容')
-  }
-}
-
-// 操作
-const handleEdit = (row: IlistType, val: string, title = '') => {
-  if (val === '取消') {
-    const params = {
-      taskId: row.taskId!,
-      comments: '',
-    }
-    ElMessageBox.confirm(
-      '确认取消该审批吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        submitApproval('revoke', params).then((res) => {
-          ElMessage({
-            type: 'success',
-            message: '取消成功',
-          })
-        })
-        fetchData(true)
-      })
-  }
-  else if (val === '删除') {
-    ElMessageBox.confirm(
-      '确认删除该审批吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        delReceiveApplyList({ id: row.id, taskId: row.taskId }).then((res) => {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          fetchData(true)
-        })
-      })
-  }
-  else if (val === '提交') {
-    ElMessageBox.confirm(
-      '确认提交该审批吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        submitReceiveApplyList({ id: row.id, formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL }).then((res) => {
-          ElMessage({
-            type: 'success',
-            message: '已提交',
-          })
-        })
-        fetchData(true)
-      })
-  }
-  else if (val === '同意') {
-    approvalDialog.value.initDialog('agree', row.taskId)
-  }
-  else if (val === '驳回') {
-    approvalDialog.value.initDialog('reject', row.taskId)
-  }
-  else if (val === '拒绝') {
-    approvalDialog.value.initDialog('refuse', row.taskId)
-  }
-  else if (val === '查看' || val === '编辑') {
-    $router.push({
-      path: `/receive/${title}`,
-      query: {
-        typeValue: title,
-        approvalStatus: approvalStatusReserveMap[row.approvalStatus],
-        id: row.id,
-        taskId: row.taskId,
-        processId: row.processId, // 查询审批记录使用
-      },
-    })
-  }
-}
-// 按钮切换
-const changeCurrentButton = (val: string) => {
-  active.value = val
-  clearList()
-}
-
-// 审批结束回调
-const approvalSuccess = () => {
-  fetchData(true)
-}
-
-// 选择器模糊查询
-const remoteMethod = (query: string) => {
-  if (query) {
-    applyPersonLoading.value = true
-    setTimeout(() => {
-      applyPersonLoading.value = false
-      usePersonOptions.value = usePersonList.value.filter((item) => {
-        return item.name.toLowerCase().includes(query.toLowerCase())
-      })
-    }, 200)
-  }
-  else {
-    usePersonOptions.value = usePersonList.value
-  }
-}
-
-// 获取用户列表(增加模糊查询)
-const fetchUserList = () => {
-  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
-    usePersonList.value = res.data.rows
-    usePersonOptions.value = res.data.rows
-  })
-}
-
-// 获取使用部门
-const fetchDeptTreeList = () => {
-  getDeptTreeList().then((res: any) => {
-    if (res.data) { // 将列表转树结构
-      useDeptList.value = toTreeList(res.data, '0', true)
-    }
-  })
-}
-
-onMounted(() => {
-  fetchData(true)
-  // 获取使用部门
-  fetchDeptTreeList()
-  fetchUserList()
-})
-</script>
-
-<template>
-  <app-container>
-    <search-area
-      :need-clear="true"
-      @search="searchList" @clear="clearList"
-    >
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.applyNo"
-          placeholder="申请编号"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.applyName"
-          placeholder="申请名称"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
-      </search-item>
-      <search-item>
-        <el-select
-          v-model="listQuery.applyPerson"
-          placeholder="请选择申请人"
-          style="width: 100%;"
-          filterable
-          remote
-          remote-show-suffix
-          :remote-method="remoteMethod"
-          :loading="applyPersonLoading"
-        >
-          <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="timeRange"
-          type="daterange"
-          range-separator="到"
-          format="YYYY-MM-DD"
-          value-format="YYYY-MM-DD"
-          start-placeholder="领用开始日期"
-          end-placeholder="领用结束日期"
-        />
-      </search-item>
-    </search-area>
-
-    <table-container>
-      <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
-      </template>
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @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="220" fixed="right">
-            <template #default="{ row }">
-              <el-button
-                size="small"
-                type="primary"
-                link
-                @click="handleEdit(row, '查看', 'detail')"
-              >
-                查看
-              </el-button>
-              <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (active === '0' || active === '2')"
-                size="small"
-                link
-                type="primary"
-                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
-                @click="handleEdit(row, '同意')"
-              >
-                同意
-              </el-button>
-              <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (active === '0' || active === '2')"
-                size="small"
-                link
-                type="primary"
-                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
-                @click="handleEdit(row, '驳回')"
-              >
-                驳回
-              </el-button>
-              <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (active === '0' || active === '2')"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
-                @click="handleEdit(row, '拒绝')"
-              >
-                拒绝
-              </el-button>
-              <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
-                size="small"
-                link
-                type="primary"
-                @click="handleEdit(row, '编辑', 'edit')"
-              >
-                编辑
-              </el-button>
-              <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
-                size="small"
-                link
-                type="primary"
-                @click="handleEdit(row, '提交')"
-              >
-                提交
-              </el-button>
-              <!-- 是发起者且审批中可以取消 -->
-              <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (active === '0' || active === '3')"
-                size="small"
-                link
-                type="info"
-                :disabled="row.approvalStatus !== '审批中'"
-                @click="handleEdit(row, '取消')"
-              >
-                取消
-              </el-button>
-              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-              <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (active !== '4' && active !== '5')"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatus === '未通过' || row.approvalStatus === '已通过'"
-                @click="handleEdit(row, '删除')"
-              >
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <button-box :active="active" @changeCurrentButton="changeCurrentButton" />
-    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-  </app-container>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-</style>
-
diff --git a/src/views/device/receive/buttonBox.vue b/src/views/device/receive/buttonBox.vue
deleted file mode 100644
index 4205fa8..0000000
--- a/src/views/device/receive/buttonBox.vue
+++ /dev/null
@@ -1,46 +0,0 @@
-<script lang="ts" setup name="ButtonBox">
-import { ref } from 'vue'
-const emits = defineEmits(['changeCurrentButton'])
-const menu = [
-  { name: '全部', id: '0' },
-  { name: '草稿箱', id: '1' },
-  { name: '待审批', id: '2' },
-  { name: '审批中', id: '3' },
-  { name: '已通过', id: '4' },
-  { name: '未通过', id: '5' },
-  { name: '已取消', id: '6' },
-]
-const current = ref('0')
-watch(current, (newValue) => {
-  emits('changeCurrentButton', newValue)
-})
-</script>
-
-<template>
-  <div class="container">
-    <div class="btns">
-      <!-- 三级菜单 -->
-      <el-radio-group v-model="current">
-        <el-radio-button v-for="item in menu" :key="item.id" :label="item.id">
-          {{ item.name }}
-        </el-radio-button>
-      </el-radio-group>
-    </div>
-    <!-- 展示区域 -->
-    <!-- <component :is="currentComp" /> -->
-  </div>
-</template>
-
-<style lang="scss" scoped>
-.container {
-  position: relative;
-
-  .btns {
-    position: fixed;
-    top: 69px;
-    right: 15px;
-    z-index: 999;
-  }
-}
-</style>
-

diff --git a/src/api/customer/overtime.ts b/src/api/customer/overtime.ts
deleted file mode 100644
index 9f349d6..0000000
--- a/src/api/customer/overtime.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * 到期样品接口
- */
-import request from '../index'
-import type { IOvertimeListQuery } from '@/views/customer/sample/overTime/overtime_list_interface'
-const prefix = '/meter'
-
-// 列表查询
-export function getOverTimeList(data: IOvertimeListQuery) {
-  return request({
-    url: `${prefix}/sample/overtime/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 导出列表
-export function exportOverTimeList(data: Omit<IOvertimeListQuery, 'limit' | 'offset'>) {
-  return request({
-    url: `${prefix}/sample/overtime/listExport`,
-    method: 'post',
-    responseType: 'blob',
-    data,
-  })
-}
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index 2610494..21a9c9e 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -59,3 +59,20 @@
   })
 }
 
+// 查询检定记录
+export function getMesureRecords(data: { id: string }) {
+  return request({
+    url: `${prefix}/sample/mesureRecordsBySampleId`,
+    method: 'post',
+    data,
+  })
+}
+
+// 查询检定证书
+export function getCertification(data: { id: string }) {
+  return request({
+    url: `${prefix}/sample/certificationBySampleId`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components.d.ts b/src/components.d.ts
index 227585d..90f2dde 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -21,6 +21,7 @@
     BarCodeBind: typeof import('./components/BarCodeBind/index.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
+    ButtonBox: typeof import('./components/buttonBox/buttonBox.vue')['default']
     CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default']
     CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
diff --git a/src/components/buttonBox/buttonBox.vue b/src/components/buttonBox/buttonBox.vue
new file mode 100644
index 0000000..cf93686
--- /dev/null
+++ b/src/components/buttonBox/buttonBox.vue
@@ -0,0 +1,49 @@
+<!-- 列表页右上角按钮组 -->
+<script lang="ts" setup name="ButtonBox">
+import type { PropType } from 'vue'
+import { ref } from 'vue'
+import type { IMenu } from '../../views/device/receive/receive'
+
+const props = defineProps({
+  active: String,
+  menu: {
+    type: Array as PropType<IMenu[]>,
+  },
+})
+const emits = defineEmits(['changeCurrentButton'])
+
+const current = ref('')
+watch(current, (newValue) => {
+  emits('changeCurrentButton', newValue)
+})
+watch(() => props.active, (newValue) => {
+  current.value = newValue!
+  console.log('pppppp', newValue)
+})
+</script>
+
+<template>
+  <div class="container">
+    <div class="btns">
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.id" :label="item.id">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 69px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 36f5104..fb6758e 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -481,7 +481,7 @@
       {
         path: 'applyList',
         name: 'ApplyList',
-        component: () => import('@/views/device/receive/applyList.vue'),
+        component: () => import('@/views/device/receive/apply/applyList.vue'),
         meta: {
           title: '设备领用申请',
           icon: 'ep:key',
@@ -491,7 +491,7 @@
       {
         path: ':type',
         name: 'ApplyListDetail',
-        component: () => import('@/views/device/receive/createOrCheck.vue'),
+        component: () => import('@/views/device/receive/apply/applyEdit.vue'),
         meta: {
           title: '设备领用申请',
           icon: 'ep:key',
@@ -503,7 +503,7 @@
       {
         path: 'solveList',
         name: 'SolveList',
-        component: () => import('@/views/device/receive/solveList.vue'),
+        component: () => import('@/views/device/receive/solve/solveList.vue'),
         meta: {
           title: '设备领用处理',
           icon: 'ep:key',
@@ -513,7 +513,7 @@
       {
         path: 'solveDetail',
         name: 'SolveListDetail',
-        component: () => import('@/views/device/receive/solveComponent/detail.vue'),
+        component: () => import('@/views/device/receive/solve/solveDetail.vue'),
         meta: {
           title: '设备领用处理',
           icon: 'ep:key',
diff --git a/src/views/customer/bench/bench.vue b/src/views/customer/bench/bench.vue
index 6b502fc..3b8f274 100644
--- a/src/views/customer/bench/bench.vue
+++ b/src/views/customer/bench/bench.vue
@@ -1,15 +1,53 @@
 <script lang="ts" setup name="DeviceBench">
-import { getCurrentInstance, ref } from 'vue'
+import { ref } from 'vue'
 import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
 import type { planReturn } from './bench-interface'
 import Linechart from '@/components/Echart/LineChart.vue'
 import type { lineDataI } from '@/components/Echart/echart-interface'
 import { getCustomerExpireData, getHighQualityCustomerList, getSampleAddData, getSampleExpireData } from '@/api/customer/bench'
+import { getSampleList } from '@/api/customer/sampleList'
+import type { IOvertimeListQuery } from '@/views/customer/sample/overTime/overtime_list_interface'
+import { getAdviceList } from '@/api/customer/advice'
+import type { IAdvice, IAdviceQuery } from '@/views/customer/advice/advice_interface'
 
+const reg = /(\d{4})\年(\d{2})月/ // 把2022年3月转为2022-03
 // 每个展示块高度
 const blockHeight = ref(300)
 const blockWidth = ref(400)
-const { proxy } = getCurrentInstance() as any
+
+// 到期样品查询条件
+const dueSampleListQuery: Ref<IOvertimeListQuery> = ref({
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 型号
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  startTime: '', // 检定开始时间
+  endTime: '', // 检定结束时间
+  overtimeStatus: '1', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+  offset: 1,
+  limit: 20,
+})
+
+// 客户关系查询条件
+const customerRelationsListQuery: Ref<IAdviceQuery> = ref({
+  adviceNo: '', // 投诉编号
+  customerName: '', // 公司名称
+  customerNo: '', // 客户编号
+  startTime: '', // 投诉开始时间
+  endTime: '', // 投诉结束时间
+  offset: 1,
+  limit: 20,
+})
+
+const dueSampleTableLoading = ref(false) // 到期样品表格loading
+const customerRelationsTableLoading = ref(false) // 客户关系loading
+const sampleAddLoading = ref(false) // 样品新增趋势loading
+const customerAddLoading = ref(false) // 客户新增趋势loading
+const sampleExpireLoading = ref(false) // 样品到期趋势loading
+const highQualityCustomerLoading = ref(false) // 优质客户名单loading
+
 // 到期样品表格数据
 const dueSampleTableData = ref()
 // 到期样品表头
@@ -64,54 +102,81 @@
   blockWidth.value = (document.body.clientWidth - 180 - 20 - 20) / 3
   console.log(blockHeight.value, blockWidth.value - 20)
 }
+
 window.addEventListener('resize', () => {
   calcBlockSize()
 })
 
 // 获取样品新增趋势数据
 function fetchSampleAddData() {
+  sampleAddLoading.value = true
   getSampleAddData().then((res) => {
-    sampleAddXData.value = res.data.map((item: planReturn) => {
-      // return item.date.replace('年', '-')
-      return item.date
-    })
+    sampleAddXData.value = res.data.map((item: planReturn) => item.date.replace(reg, '$1-$2'))
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     sampleAddYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
-    sampleAddData.value = [{ name: '客户', data: yValue }]
+    sampleAddData.value = [{ name: '样品', data: yValue }]
+    sampleAddLoading.value = false
   })
 }
 
 // 获取样品到期趋势数据
 function fetchSampleExpireData() {
+  sampleExpireLoading.value = true
   getSampleExpireData().then((res) => {
-    sampleExpireXData.value = res.data.map((item: planReturn) => item.date)
+    sampleExpireXData.value = res.data.map((item: planReturn) => item.date.replace(reg, '$1-$2'))
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     sampleExpireYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
-    sampleExpireData.value = [{ name: '客户', data: yValue }]
+    sampleExpireData.value = [{ name: '样品', data: yValue }]
+    sampleExpireLoading.value = false
   })
 }
 
 // 获取优质客户名单
 function fetchHighQualityCustomerList() {
+  highQualityCustomerLoading.value = true
   getHighQualityCustomerList().then((res) => {
     highQualityCustomerTableData.value = res.data.rows
+    highQualityCustomerLoading.value = false
   })
 }
 // 获取客户新增趋势数据
 function fetchCustomerExpireData() {
+  customerAddLoading.value = true
   getCustomerExpireData().then((res) => {
-    customerAddXData.value = res.data.map((item: planReturn) => item.date)
+    customerAddXData.value = res.data.map((item: planReturn) => item.date.replace(reg, '$1-$2'))
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     customerAddYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
     customerAddData.value = [{ name: '客户', data: yValue }]
+    customerAddLoading.value = false
   })
 }
 
 // 获取到期样品表格数据
+function fetchDueSampleTableData() {
+  dueSampleTableLoading.value = true
+  getSampleList(dueSampleListQuery.value).then((response) => {
+    dueSampleTableData.value = response.data.rows
+    dueSampleTableLoading.value = false
+  })
+}
 // 获取客户关系表格数据
+function fetchcustomerRelationsTableData() {
+  customerRelationsTableLoading.value = true
+  getAdviceList(customerRelationsListQuery.value).then((res) => {
+    customerRelationsTabledata.value = res.data.rows.map((item: IAdvice) => {
+      return {
+        ...item,
+        adviceClass: item.adviceClass === '0' ? '建议' : item.adviceClass === '1' ? '投诉' : '其他',
+      }
+    })
+    customerRelationsTableLoading.value = false
+  })
+}
 
 onMounted(() => {
   calcBlockSize()
+  fetchDueSampleTableData() // 到期样品表格
+  fetchcustomerRelationsTableData() // 客户关系表格
   fetchSampleAddData()// 样品新增趋势
   fetchSampleExpireData()// 样品到期趋势
   fetchCustomerExpireData()// 客户新增趋势
@@ -125,6 +190,7 @@
       <el-row :gutter="10">
         <el-col :span="8">
           <bench-col
+            v-loading="dueSampleTableLoading"
             icon="icon-book"
             title="到期样品"
             path-url="/sample/overtime"
@@ -145,6 +211,7 @@
         </el-col>
         <el-col :span="8">
           <bench-col
+            v-loading="sampleAddLoading"
             icon="icon-line"
             title="样品新增趋势"
             :height="blockHeight"
@@ -159,6 +226,7 @@
         </el-col>
         <el-col :span="8">
           <bench-col
+            v-loading="sampleExpireLoading"
             icon="icon-line"
             title="样品到期趋势"
             :height="blockHeight"
@@ -177,6 +245,7 @@
       <el-row :gutter="10">
         <el-col :span="8">
           <bench-col
+            v-loading="customerRelationsTableLoading"
             icon="icon-book"
             title="客户关系"
             path-url="/customerManage/advice"
@@ -197,6 +266,7 @@
         </el-col>
         <el-col :span="8">
           <bench-col
+            v-loading="customerAddLoading"
             icon="icon-line"
             title="客户新增趋势"
             :height="blockHeight"
@@ -211,6 +281,7 @@
         </el-col>
         <el-col :span="8">
           <bench-col
+            v-loading="highQualityCustomerLoading"
             icon="icon-book"
             title="优质客户名单"
             :style="{ height: blockHeight }"
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index e7d1acb..359c94d 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -8,7 +8,7 @@
 import selectCustomer from './selectCustomer.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import { addSample, getCertification, getMesureRecords, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
@@ -69,6 +69,7 @@
   sampleName: '', // 样品名称
   sampleModel: '', // 样品型号
   manufacturingNo: '', // 出厂编号
+  customerId: '', // 委托方id
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   phone: '', // 委托方电话
@@ -138,12 +139,17 @@
 })
 
 // 获取检定记录
-const fetchMeasureRecords = function (query = null) {
-  dataList.value.measureRecords = []
+const fetchMeasureRecords = (query = null) => {
+  getMesureRecords({ id: infoId.value }).then((res) => {
+    dataList.value.measureRecords = res.data.rows
+  })
 }
+
 // 获取检定证书
-const fetchCertifications = function (query = null) {
-  dataList.value.certificationRecords = []
+const fetchCertifications = (query = null) => {
+  getCertification({ id: infoId.value }).then((res) => {
+    dataList.value.certificationRecords = res.data.rows
+  })
 }
 
 // 菜单
@@ -151,12 +157,12 @@
   {
     name: '检定记录',
     columns: [
-      { text: '委托单编号', value: 'orderCode' },
-      { text: '委托单日期', value: 'orderTime' },
-      { text: '委托方代码', value: 'customerCode' },
-      { text: '委托方名称', value: 'customerName' },
-      { text: '送检人', value: 'deliverer' },
-      { text: '送检日期', value: 'deliverTime' },
+      { text: '委托单编号', value: 'orderCode', align: 'center' },
+      { text: '委托单日期', value: 'orderTime', align: 'center' },
+      { text: '委托方代码', value: 'customerCode', align: 'center' },
+      { text: '委托方名称', value: 'customerName', align: 'center' },
+      { text: '送检人', value: 'deliverer', align: 'center' },
+      { text: '送检日期', value: 'deliverTime', align: 'center' },
     ],
     list: 'measureRecords',
     pagination: true,
@@ -165,11 +171,11 @@
   {
     name: '检定证书',
     columns: [
-      { text: '证书编号', value: 'certificationCode' },
-      { text: '证书名称', value: 'certificationName' },
-      { text: '证书类型', value: 'certificationType' },
-      { text: '证书出具日期', value: 'effectiveDate' },
-      { text: '证书有效期', value: 'expirationDate' },
+      { text: '证书编号', value: 'certificationCode', align: 'center' },
+      { text: '证书名称', value: 'certificationName', align: 'center' },
+      { text: '证书类型', value: 'certificationType', align: 'center' },
+      { text: '证书出具日期', value: 'effectiveDate', align: 'center' },
+      { text: '证书有效期', value: 'expirationDate', align: 'center' },
     ],
     list: 'certificationRecords',
     pagination: true,
@@ -233,18 +239,18 @@
 // 委托方代码获取焦点
 const customerNoFocus = () => {
   visible.value = true
-  console.log(visible.value)
 }
 
 // 选好委托方
 const confirmCheckout = (val: Array<ICustomer>) => {
   if (val && val.length) {
     const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo
-    dataForm.value.customerName = getValue.customerName
-    dataForm.value.phone = getValue.phone
-    dataForm.value.postalCode = getValue.postalCode
-    dataForm.value.customerAddress = getValue.briefName
+    dataForm.value.customerNo = getValue.customerNo // 委托方代码
+    dataForm.value.customerId = getValue.id // 委托方id
+    dataForm.value.customerName = getValue.customerName // 委托方名称
+    dataForm.value.phone = getValue.phone // 电话
+    dataForm.value.postalCode = getValue.postalCode // 邮编
+    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
   }
 }
 
@@ -296,6 +302,7 @@
 const getInfo = () => {
   getSapmleDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data
+    dataForm.value.ABC = res.data.abc
     for (const item of menu) {
       item.searchFunc()
     }
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index a2c4307..c3690d4 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -35,6 +35,7 @@
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center', width: '180px' },
 ])
 // 表格数据
@@ -47,6 +48,7 @@
 const checkoutList = ref<string[]>([])
 // 文件上传input
 const fileRef = ref()
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -62,6 +64,7 @@
     loadingTable.value = false
   })
 }
+
 // 多选发生改变时
 function handleSelectionChange(e: any) {
   checkoutList.value = e.map((item: { id: string }) => item.id)
@@ -71,6 +74,7 @@
 const handleEdit = (row: ISampleList, pageType: 'edit' | 'detail') => {
   $router.push(`/sample/${pageType}/${row.id}`)
 }
+
 // 点击删除
 const handleDelete = (row: ISampleList) => {
   ElMessageBox.confirm(
@@ -94,10 +98,12 @@
       })
     })
 }
+
 // 点击搜索
 const searchList = () => {
   fetchData(true)
 }
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -112,7 +118,7 @@
     offset: 1,
     limit: 20,
   }
-  timeRange.value = ['', '']
+  timeRange.value = ['', ''] // 置空筛选时间
   fetchData(true)
 }
 
@@ -138,10 +144,12 @@
     ElMessage.error('请上传pdf格式')
   }
 }
+
 // 模板下载
 const templateDownload = () => {
 
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -157,10 +165,12 @@
 const uploadAll = () => {
   fileRef.value.click()
 }
+
 // 新建样品
 const add = () => {
   $router.push('/sample/add')
 }
+
 // 导出
 const exportAll = () => {
   const loading = ElLoading.service({
@@ -293,11 +303,13 @@
         <template #columns>
           <el-table-column label="操作" align="center" fixed="right" width="120">
             <template #default="{ row }">
+              <!-- 有orderid(关联了委托书)不允许编辑 -->
               <el-button
                 v-if="proxy.hasPerm('/sample/list/update')"
                 size="small"
                 type="primary"
                 link
+                :disabled="`${row.orderId}` !== ''"
                 @click="handleEdit(row, 'edit')"
               >
                 编辑
@@ -310,11 +322,13 @@
               >
                 详情
               </el-button>
+              <!-- 检测中的样品不允许删除 -->
               <el-button
                 v-if="proxy.hasPerm('/sample/list/delete')"
                 size="small"
                 link
                 type="danger"
+                :disabled="row.sampleSatus !== '3'"
                 @click="handleDelete(row)"
               >
                 删除
diff --git a/src/views/customer/sample/list/sample_list_interface.ts b/src/views/customer/sample/list/sample_list_interface.ts
index 707c8b5..81498a5 100644
--- a/src/views/customer/sample/list/sample_list_interface.ts
+++ b/src/views/customer/sample/list/sample_list_interface.ts
@@ -33,6 +33,7 @@
   sampleModel: string // 样品型号
   manufacturingNo: string // 出厂编号
   customerNo: string // 委托方代码
+  customerId: string // 委托方id
   customerName: string // 委托方名称
   phone: string // 委托方电话
   postalCode: string // 委托方邮编
diff --git a/src/views/customer/sample/list/selectCustomer.vue b/src/views/customer/sample/list/selectCustomer.vue
index 5de352d..0eef7d0 100644
--- a/src/views/customer/sample/list/selectCustomer.vue
+++ b/src/views/customer/sample/list/selectCustomer.vue
@@ -6,7 +6,8 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getCustomerList } from '@/api/customer/customer'
 import { getDictByCode } from '@/api/system/dict'
-const props = defineProps({
+
+defineProps({
   visible: {
     type: Boolean,
     default: false,
@@ -14,18 +15,9 @@
 })
 const emits = defineEmits(['changeVisible', 'confirmCheckout'])
 
-const visibleDialog = computed({
-  get() {
-    return props.visible
-  },
-  set(val) {
-    emits('changeVisible', val)
-  },
-})
-
 // 查询条件
 const listQuery: Ref<ICustomerQuery> = ref({
-  bussinessSize: '', // 业务规模
+  businessSize: '', // 业务规模
   customerName: '', // 公司名称
   customerNo: '', // 客户编号
   grade: '', // 履约评级
@@ -37,40 +29,20 @@
   name: string
   value: string
 }
-// const companySizeList = ref<dictType[]>([]) // 公司规模列表
+
 const businessSizeList = ref<dictType[]>([]) // 业务规模列表
 const gradeList = ref<dictType[]>([]) // 履约评级列表
-// const evaluationList = ref<dictType[]>([]) // 整体评价列表
-function getDict() {
-  // // 获取公司规模
-  // getDictByCode('companySize').then((response) => {
-  //   companySizeList.value = response.data
-  // })
-  // 获取业务规模
-  getDictByCode('businessSize').then((response) => {
-    businessSizeList.value = response.data
-  })
-  // 获取履约评级
-  getDictByCode('grade').then((response) => {
-    gradeList.value = response.data
-  })
-  // // 获取整体评价
-  // getDictByCode('evaluation').then((response) => {
-  //   evaluationList.value = response.data
-  // })
-}
-getDict()
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '客户编号', value: 'customerNo', width: '160', align: 'center', fixed: true },
-  { text: '客户名称', value: 'customerName', width: '120', align: 'center', fixed: true },
-  { text: '公司规模', value: 'companySizeName', align: 'center', fixed: false },
-  { text: '业务规模', value: 'businessSizeName', align: 'center', fixed: false },
-  { text: '履约评级', value: 'gradeName', align: 'center', fixed: false },
-  { text: '整体评价', value: 'evaluationName', align: 'center', fixed: false },
-  { text: '公司地址', value: 'briefName', align: 'center', fixed: false },
-  { text: '创建时间', value: 'createTime', align: 'center', width: '180px', fixed: false },
-  { text: '备注', value: 'remark', align: 'center', fixed: false },
+  { text: '客户名称', value: 'customerName', align: 'center', fixed: true },
+  { text: '公司规模', value: 'companySizeName', width: '110', align: 'center' },
+  { text: '业务规模', value: 'businessSizeName', width: '130', align: 'center' },
+  { text: '履约评级', value: 'gradeName', width: '90', align: 'center' },
+  { text: '整体评价', value: 'evaluationName', width: '110', align: 'center' },
+  { text: '公司地址', value: 'fullAddress', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
+  { text: '备注', value: 'remark', align: 'center' },
 ])
 // 表格数据
 const list = ref<ICustomer[]>([])
@@ -81,44 +53,42 @@
 // 选中的内容
 const checkoutList = ref<string[]>([])
 
-// 数据查询
+function getDict() {
+  // 获取业务规模
+  getDictByCode('businessSize').then((response) => {
+    businessSizeList.value = response.data
+  })
+  // 获取履约评级
+  getDictByCode('grade').then((response) => {
+    gradeList.value = response.data
+  })
+}
+getDict()
+
+// 表格数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getCustomerList(listQuery.value).then((response) => {
-  //   // 模拟数据
-  //   response.data.rows = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', customerAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  //   list.value = response.data.rows.map((item: ICustomer) => {
-  //     if (item.companyProvinceName && item.companyCityName) {
-  //       item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-  //     }
-  //     else {
-  //       item.briefName = item.companyProvinceName || item.companyCityName
-  //     }
-  //     return item
-  //   })
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-
-  // 模拟数据
-  const response = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', customerAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' },
-    { bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', customerAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '2集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' },
-    { bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', customerAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '3集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  list.value = response.map((item: ICustomer) => {
-    if (item.companyProvinceName && item.companyCityName) {
-      item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-    }
-    else {
-      item.briefName = item.companyProvinceName || item.companyCityName
-    }
-    return item
+  getCustomerList(listQuery.value).then((response) => {
+    // 模拟数据
+    list.value = response.data.rows.map((item: ICustomer) => {
+      if (item.addressProvinceName && item.addressCityName) {
+        item.fullAddress = `${item.addressProvinceName}/${item.addressCityName}`
+      }
+      else if (item.addressProvinceName || item.addressCityName) {
+        item.fullAddress = item.addressProvinceName || item.addressCityName
+      }
+      else if (item.addressCountryName) {
+        item.fullAddress = item.addressCountryName
+      }
+      return item
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
   })
-  total.value = 50
-  loadingTable.value = false
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -131,7 +101,7 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    bussinessSize: '', // 业务规模
+    businessSize: '', // 业务规模
     customerName: '', // 公司名称
     customerNo: '', // 客户编号
     grade: '', // 履约评级
@@ -155,9 +125,9 @@
 const cancle = () => {
   emits('changeVisible', false)
 }
+
 // 点击确定
 const clickConfirm = () => {
-  console.log(checkoutList.value)
   if (!checkoutList.value.length) {
     ElMessage({
       message: '请选中',
diff --git a/src/views/customer/sample/overTime/detail.vue b/src/views/customer/sample/overTime/detail.vue
index f553724..1adcbf8 100644
--- a/src/views/customer/sample/overTime/detail.vue
+++ b/src/views/customer/sample/overTime/detail.vue
@@ -184,6 +184,7 @@
 const getInfo = () => {
   getSapmleDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data
+    dataForm.value.ABC = res.data.abc
     for (const item of menu) {
       item.searchFunc()
     }
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index c8f90a1..05fe276 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -19,8 +19,8 @@
   sampleModel: '', // 型号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
-  startTime: '1', // 检定开始时间
-  endTime: '1', // 检定结束时间
+  startTime: '', // 检定开始时间
+  endTime: '', // 检定结束时间
   overtimeStatus: '1', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
   offset: 1,
   limit: 20,
diff --git a/src/views/device/receive/apply/applyEdit.vue b/src/views/device/receive/apply/applyEdit.vue
new file mode 100644
index 0000000..5194bdb
--- /dev/null
+++ b/src/views/device/receive/apply/applyEdit.vue
@@ -0,0 +1,552 @@
+<script lang="ts" setup name="CreateOrCheck">
+import { onMounted, reactive, ref } from 'vue'
+import type { Ref } from 'vue'
+import dayjs from 'dayjs'
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { useRoute, useRouter } from 'vue-router'
+import type { IdeviceList, IdeviceListQuery } from '../receive'
+import SelectDeviceDialog from '../selectDeviceDialog.vue'
+import { toTreeList } from '@/utils/structure'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import {
+  getReceiveApplyListDetail,
+  saveAddReceiveApplyList,
+  saveEditReceiveApplyList,
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import type { userType } from '@/views/system/user/user-interface'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { getDeptTreeList } from '@/api/system/dept'
+import { getUserList } from '@/api/system/user'
+import { submitApproval } from '@/api/approval'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+
+const $route = useRoute()
+const approvalDialog = ref() // 审批对话框显隐
+const typeValue = ref() // add、edit、detail
+const approvalStatus = ref() // 审批类型
+const useDeptList = ref<deptType[]>([]) // 部门列表
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false)
+const isMulti = ref(false) // 是否批量添加(允许多选)
+const selectIndex = ref() // 点击选择的index--点击第几行
+const dialogSelectDiviceVisible = ref(false) // 控制选择设备对话框显隐
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+// 选中的内容
+const checkoutList = ref([])
+// 表单数据
+const form = ref({
+  taskId: '', // 任务id（审批用）
+  id: '',
+  processId: '', // 流程id--查询审批记录使用
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 领用时间
+  applyDesc: '', // 申请说明
+})
+const ruleFormRef = ref<FormInstance>() as any
+const list = ref<IdeviceList[]>([])// 表格数据
+
+// 查询条件
+const listQuery: Ref<IdeviceListQuery> = ref({
+  equipmentName: '', // 仪器名称
+  equipmentNo: '', // 设备编号
+  modelNo: '', // 型号
+  mesureRange: '', // 测量范围
+  useDeptName: '', // 使用部门
+  usePersonName: '', // 使用人
+  managerStateName: '', // 管理状态
+  validDate: '', // 有效日期
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '设备编号', value: 'equipmentNo', align: 'center', width: '230' },
+  { text: '设备名称', value: 'equipmentName', align: 'center' },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: '测量范围', value: 'mesureRange', align: 'center' },
+  { text: '使用部门', value: 'useDeptName', align: 'center' },
+  { text: '使用人', value: 'usePersonName', align: 'center' },
+  { text: '管理状态', value: 'managerStateName', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center' },
+])
+// 表单校验规则
+const rules = reactive<FormRules>({
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'change' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  time: [{ type: 'date', required: true, message: '领用时间不能为空', trigger: 'change' }],
+  applyDesc: [{ required: true, message: '申请说明不能为空', trigger: 'blur' }],
+})
+
+const $router = useRouter()
+// 点击关闭
+const close = () => {
+  $router.back()
+}
+
+const handleClick = (val: string) => {
+  if (val === 'agree') { // 同意
+    approvalDialog.value.initDialog('agree', form.value.taskId)
+  }
+  else if (val === 'reject') { // 驳回
+    approvalDialog.value.initDialog('reject', form.value.taskId)
+  }
+  else if (val === 'refuse') { // 拒绝
+    approvalDialog.value.initDialog('refuse', form.value.taskId)
+  }
+  else if (val === 'revoke') {
+    const params = {
+      taskId: form.value.taskId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认撤回该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        submitApproval('revoke', params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已撤回',
+          })
+        })
+        close()
+      })
+  }
+}
+
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+
+// 删除行
+const delRow = () => {
+  if (checkoutList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    checkoutList.value.forEach((item: IdeviceListQuery) => {
+      list.value.forEach((element, index) => {
+        if (element.equipmentNo === item.equipmentNo) {
+          list.value.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+
+// 增加行
+const addRow = () => {
+  const index = list.value.findIndex(item => !item.equipmentNo)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条设备信息')
+    return
+  }
+  list.value.push({
+    equipmentName: '', // 设备名称
+    equipmentNo: '', // 设备编号
+    modelNo: '', // 型号
+    mesureRange: '', // 测量范围
+    useDeptName: '', // 使用部门
+    usePersonName: '', // 使用人
+    managerStateName: '', // 管理状态
+    validDate: '', // 有效日期
+    equipmentId: '', // 设备ID
+  })
+}
+
+// 点击选择
+const handleSelect = (index: number, row: IdeviceList) => {
+  dialogSelectDiviceVisible.value = true // 选择设备对话框显隐
+  isMulti.value = false // 是否单选, false单选、true表格多选
+  selectIndex.value = index
+}
+
+// 点击批量添加
+const multiAdd = () => {
+  dialogSelectDiviceVisible.value = true
+  isMulti.value = true
+}
+
+// 选择设备对话框关闭
+const closeDialog = () => {
+  dialogSelectDiviceVisible.value = false
+}
+
+// 选择好设备了, 添加选好的设备到表格中
+const updateDeviceConfirm = (val: Array<IdeviceList>) => {
+  if (isMulti.value) { // 批量增加时push
+    val.forEach((item: IdeviceList) => {
+    // 只添加列表里不存在的
+      const index = list.value.findIndex((i: IdeviceList) => item.equipmentNo === i.equipmentNo)
+      if (index === -1) {
+        list.value.push(item)
+      }
+    })
+  }
+  else { // 单选替换
+    const index = list.value.findIndex((i: IdeviceList) => val[0].equipmentNo === i.equipmentNo)
+    if (index !== -1) {
+      ElMessage.warning('此设备已添加过')
+      return
+    }
+    list.value.splice(selectIndex.value, 1, val[0])
+  }
+}
+
+// 保存
+const save = () => {
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      // 保存之前清除空行、避免传给后端无用空对象
+      const index = list.value.findIndex((item: IdeviceList) => !item.equipmentNo)
+      if (index !== -1) {
+        list.value.splice(index, 1)
+      }
+      const params = {
+        applyName: form.value.applyName, // 申请名称
+        applyUnit: form.value.applyUnit, // 申请单位
+        applyPerson: form.value.applyPerson, // 申请人
+        time: form.value.time, // 领用时间
+        applyDesc: form.value.applyDesc, // 申请说明
+        applyType: '1', // 申请类型 领用1
+        id: form.value.id,
+        equipmentList: list.value.map((item) => {
+          return {
+            equipmentId: item.id!,
+          }
+        }),
+      }
+      // 新建
+      if (typeValue.value === 'add') {
+        saveAddReceiveApplyList(params).then((res) => {
+          form.value.id = res.data
+          ElMessage.success('保存成功')
+          loading.close()
+        })
+      }
+      // 保存
+      else if (typeValue.value === 'edit') {
+        saveEditReceiveApplyList(params).then((res) => {
+          form.value.id = res.data
+          ElMessage.success('保存成功')
+          loading.close()
+        })
+      }
+    }
+    else {
+      console.log('表单校验不通过')
+    }
+  })
+}
+
+// 提交表单
+const submit = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (form.value.id) {
+    const params = {
+      id: form.value.id,
+      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL, // 表单id
+    }
+    submitReceiveApplyList(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    })
+  }
+  else {
+    ElMessage.info('请先保存再提交！')
+  }
+}
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 获取使用部门
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res: any) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+// 审批结束回调
+const approvalSuccess = () => {
+  close()
+}
+
+// 编辑、详情--获取详细信息
+const fetchReceiveApplyListDetail = () => {
+  getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
+    form.value.applyUnit = res.data.applyUnit // 部门
+    form.value.applyName = res.data.applyName // 申请名称
+    form.value.applyPerson = res.data.applyPerson// 申请人
+    form.value.time = res.data.time // 领用时间
+    form.value.applyDesc = res.data.applyDesc // 申请说明
+    list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
+      return {
+        ...item,
+        validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+      }
+    })
+  })
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+onMounted(() => {
+  typeValue.value = $route.query.typeValue // 类型add、edit、detail
+  form.value.id = $route.query.id as string // id
+  form.value.taskId = $route.query.taskId as string // 任务id
+  form.value.processId = $route.query.processId as string // 任务id
+  approvalStatus.value = $route.query.approvalStatus // 审批类型
+  // 编辑、详情获取详情页信息
+  if (typeValue.value === 'edit' || typeValue.value === 'detail') {
+    fetchReceiveApplyListDetail() // 获取详细信息
+  }
+
+  // 获取部门信息
+  fetchDeptTreeList()
+  // 获取人员列表--申请人使用
+  fetchUserList()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`设备领用申请-${textMap[typeValue]}`">
+      <template #btns>
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('agree')">
+          同意
+        </el-button>
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('reject')">
+          驳回
+        </el-button>
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('refuse')">
+          拒绝
+        </el-button>
+        <el-button v-if="typeValue === 'add'" type="primary" @click="submit">
+          提交
+        </el-button>
+        <el-button v-if="typeValue === 'add' || typeValue === 'edit'" type="primary" @click="save">
+          保存
+        </el-button>
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '3'" type="primary" @click="handleClick('revoke')">
+          撤回
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div class="create-check">
+      <div class="top-info">
+        <!-- 表单 -->
+        <div class="form-area">
+          <el-form
+            ref="ruleFormRef"
+            :model="form"
+            label-width="120px"
+            :rules="rules"
+          >
+            <el-row :gutter="24">
+              <el-col :span="6">
+                <el-form-item label="申请名称" prop="applyName">
+                  <el-input
+                    v-model="form.applyName"
+                    :placeholder="typeValue === 'detail' ? '' : '请输入申请名称'"
+                    clearable
+                    :disabled="typeValue === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="申请单位" prop="applyUnit">
+                  <dept-select
+                    v-model="form.applyUnit"
+                    placeholder="请选择申请单位"
+                    :data="useDeptList"
+                    :disabled="typeValue === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="申请人" prop="applyPerson">
+                  <el-select
+                    v-model="form.applyPerson"
+                    :disabled="typeValue === 'detail'"
+                    placeholder="请选择申请人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="领用时间" prop="time">
+                  <el-date-picker
+                    v-model="form.time"
+                    type="datetime"
+                    placeholder="请选择领用时间"
+                    format="YYYY-MM-DD hh:mm"
+                    value-format="YYYY-MM-DD hh:mm"
+                    :disabled="typeValue === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="申请说明" prop="applyDesc">
+                  <el-input v-model="form.applyDesc" type="textarea" autosize clearable :disabled="typeValue === 'detail'" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </div>
+      </div>
+      <!-- 表格 -->
+      <detail-block title="设备领用列表">
+        <template #btns>
+          <el-button v-if="typeValue !== 'detail'" type="primary" @click="multiAdd">
+            批量添加
+          </el-button>
+          <el-button v-if="typeValue !== 'detail'" type="primary" @click="addRow">
+            增加行
+          </el-button>
+          <el-button v-if="typeValue !== 'detail'" type="info" @click="delRow">
+            删除行
+          </el-button>
+        </template>
+        <el-table
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column v-if="typeValue !== 'detail'" type="selection" width="38" />
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          >
+            <template v-if="item.value === 'equipmentNo' && (typeValue === 'add' || typeValue === 'edit')" #default="scope">
+              <el-input v-model="scope.row.equipmentNo" placeholder="请选择设备" class="input">
+                <template #append>
+                  <el-button size="small" @click="handleSelect(scope.$index, scope.row)">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+
+      <detail-block v-if="typeValue === 'detail'" title="审批流程">
+        <approval-record :process-id="form.processId" />
+      </detail-block>
+    </div>
+    <select-device-dialog
+      :dialog-select-divice-visible="dialogSelectDiviceVisible"
+      :is-multi="isMulti"
+      @closeDialog="closeDialog"
+      @updateDeviceConfirm="updateDeviceConfirm"
+    />
+
+    <!-- 同意、驳回、拒绝对话框显示 -->
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.create-check {
+  margin-top: 10px;
+
+  .top-info {
+    display: flex;
+    flex-direction: column;
+    width: 100%;
+    padding-right: 10px;
+    border-radius: 10px;
+    background-color: #fff;
+    // padding: 10px;
+
+    .title-button {
+      display: flex;
+      align-items: center;
+
+      &::before {
+        content: "";
+        flex: 1;
+      }
+
+      .button-group {
+        flex: 1;
+        display: flex;
+        justify-content: flex-end;
+      }
+    }
+
+    .form-area {
+      margin-top: 40px;
+    }
+  }
+}
+</style>
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
new file mode 100644
index 0000000..abf559c
--- /dev/null
+++ b/src/views/device/receive/apply/applyList.vue
@@ -0,0 +1,542 @@
+<script lang="ts" setup name="ApplyList">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+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 ButtonBox from '@/components/buttonBox/buttonBox.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { exportFile } from '@/utils/exportUtils'
+import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import {
+  delReceiveApplyList,
+  exportReceiveApplyList,
+  getReceiveApplyList,
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import { submitApproval } from '@/api/approval'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import type { userType } from '@/views/system/user/user-interface'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { getUserList } from '@/api/system/user'
+
+const loadingTable = ref(false) // 表格loading
+const active = ref('') // 选中的按钮
+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 listQuery: Ref<IlistQuery> = ref({
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  approvalStatus: active.value, // 	审批状态
+  processResult: '', // 	处置结果
+  applyType: '1', // 申请类型 领用1
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+  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 columns = ref<TableColumn[]>([
+  { text: '申请编号', value: 'applyNo', align: 'center' },
+  { text: '申请名称', value: 'applyName', align: 'center' },
+  { text: '申请部门', value: 'applyUnitName', align: 'center' },
+  { text: '申请人', value: 'applyPersonName', align: 'center' },
+  { text: '领用时间', value: 'time', align: 'center' },
+  { text: '申请说明', value: 'applyDesc', align: 'center' },
+  { text: '审批状态', value: 'approvalStatus', align: 'center' },
+])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 筛选时间段数据
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.startTime = timeRange.value[0] as string || ''
+  listQuery.value.endTime = timeRange.value[1] as string || ''
+  listQuery.value.approvalStatus = active.value
+  getReceiveApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IlistType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap[item.approvalStatus],
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: active.value, // 	审批状态
+    processResult: '', // 	处置结果
+    applyType: '1', // 申请类型 领用1
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', '']
+  fetchData(true)
+}
+
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+const $router = useRouter()
+
+// 新建
+const add = () => {
+  $router.push({ path: '/receive/add', query: { typeValue: 'add' } })
+}
+
+// 导出
+const exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    const params = {
+      applyNo: listQuery.value.applyNo, // 申请编号
+      applyName: listQuery.value.applyName, // 申请名称
+      applyUnit: listQuery.value.applyUnit, // 申请部门
+      applyPerson: listQuery.value.applyPerson, // 申请人
+      startTime: listQuery.value.startTime, // 申请开始日期
+      endTime: listQuery.value.endTime, // 申请结束日期
+      approvalStatus: listQuery.value.approvalStatus, // 	审批状态
+      processResult: listQuery.value.processResult, // 	处置结果
+      applyType: listQuery.value.applyType, // 申请类型 领用0
+      createUser: listQuery.value.createUser, // 创建人
+      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+      offset: 1,
+      limit: 20,
+      ids: checkoutList.value,
+    }
+    // 调导出接口
+    exportReceiveApplyList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备领用申请列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备领用申请列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: IlistType) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备领用申请列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 操作
+const handleEdit = (row: IlistType, val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      taskId: row.taskId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        submitApproval('revoke', params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+        })
+        fetchData(true)
+      })
+  }
+  else if (val === '删除') {
+    ElMessageBox.confirm(
+      '确认删除该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        delReceiveApplyList({ id: row.id, taskId: row.taskId }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '提交') {
+    ElMessageBox.confirm(
+      '确认提交该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        submitReceiveApplyList({ id: row.id, formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已提交',
+          })
+        })
+        fetchData(true)
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', row.taskId)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', row.taskId)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', row.taskId)
+  }
+  else if (val === '查看' || val === '编辑') {
+    $router.push({
+      path: `/receive/${title}`,
+      query: {
+        typeValue: title,
+        approvalStatus: approvalStatusReserveMap[row.approvalStatus],
+        id: row.id,
+        taskId: row.taskId,
+        processId: row.processId, // 查询审批记录使用
+      },
+    })
+  }
+}
+// 按钮切换
+const changeCurrentButton = (val: string) => {
+  active.value = val
+  window.sessionStorage.setItem('buttonBoxActive', val)
+  clearList()
+}
+
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 获取用户列表(增加模糊查询)
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 获取使用部门
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res: any) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+onMounted(() => {
+  if (window.sessionStorage.getItem('buttonBoxActive')) {
+    active.value = window.sessionStorage.getItem('buttonBoxActive')!
+  }
+  else {
+    active.value = '0' // 全部
+  }
+  nextTick(() => {
+    fetchData(true) // 获取表格数据
+    // 获取使用部门
+    fetchDeptTreeList() // 获取使用部门
+    fetchUserList() // 获取人员列表
+  })
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyNo"
+          placeholder="申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyName"
+          placeholder="申请名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.applyPerson"
+          placeholder="请选择申请人"
+          style="width: 100%;"
+          filterable
+          remote
+          remote-show-suffix
+          :remote-method="remoteMethod"
+          :loading="applyPersonLoading"
+        >
+          <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY-MM-DD hh:mm"
+          value-format="YYYY-MM-DD hh:mm"
+          start-placeholder="领用开始时间"
+          end-placeholder="领用结束时间"
+        />
+      </search-item>
+    </search-area>
+
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @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="220" fixed="right">
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="handleEdit(row, '查看', 'detail')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (active === '0' || active === '2')"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (active === '0' || active === '2')"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (active === '0' || active === '2')"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '编辑', 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (active === '0' || active === '3')"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (active !== '4' && active !== '5')"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatus === '未通过' || row.approvalStatus === '已通过'"
+                @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+    <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
+
diff --git a/src/views/device/receive/applyList.vue b/src/views/device/receive/applyList.vue
deleted file mode 100644
index 63e1ee8..0000000
--- a/src/views/device/receive/applyList.vue
+++ /dev/null
@@ -1,523 +0,0 @@
-<script lang="ts" setup name="ApplyList">
-import { ref } from 'vue'
-import type { Ref } from 'vue'
-import type { DateModelType } from 'element-plus'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { useRouter } from 'vue-router'
-import type { IlistQuery, IlistType } from '@/views/device/receive/receive'
-import ButtonBox from '@/views/device/receive/buttonBox.vue'
-import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-import { exportFile } from '@/utils/exportUtils'
-import { printJSON } from '@/utils/printUtils'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
-import {
-  delReceiveApplyList,
-  exportReceiveApplyList,
-  getReceiveApplyList,
-  submitReceiveApplyList,
-} from '@/api/device/receive'
-import { submitApproval } from '@/api/approval'
-import { getDeptTreeList } from '@/api/system/dept'
-import { toTreeList } from '@/utils/structure'
-import type { userType } from '@/views/system/user/user-interface'
-import type { deptType } from '@/views/device/standingBook/standingBook-interface'
-import { getUserList } from '@/api/system/user'
-
-const loadingTable = ref(false) // 表格loading
-const active = ref('0') // 选中的按钮
-const approvalDialog = ref() // 审批对话框显隐
-const useDeptList = ref<deptType[]>([]) // 部门列表
-const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
-const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
-const applyPersonLoading = ref(false) // 申请人模糊搜索框loading
-
-// 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  applyNo: '', // 申请编号
-  applyName: '', // 申请名称
-  applyUnit: '', // 申请部门id
-  applyUnitName: '', // 申请部门名称
-  applyPerson: '', // 申请人id
-  applyPersonName: '', // 申请人姓名
-  startTime: '', // 领用开始日期
-  endTime: '', // 领用结束日期
-  approvalStatus: '', // 	审批状态
-  processResult: '', // 	处置结果
-  applyType: '1', // 申请类型 领用1
-  createUser: '', // 创建人
-  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
-  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 columns = ref<TableColumn[]>([
-  { text: '申请编号', value: 'applyNo', align: 'center' },
-  { text: '申请名称', value: 'applyName', align: 'center' },
-  { text: '申请部门', value: 'applyUnitName', align: 'center' },
-  { text: '申请人', value: 'applyPersonName', align: 'center' },
-  { text: '领用时间', value: 'time', align: 'center' },
-  { text: '申请说明', value: 'applyDesc', align: 'center' },
-  { text: '审批状态', value: 'approvalStatus', align: 'center' },
-])
-// 选中的内容
-const checkoutList = ref<string[]>([])
-// 筛选时间段数据
-const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-
-// 数据查询
-function fetchData(isNowPage = false) {
-  loadingTable.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.value.offset = 1
-  }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
-  listQuery.value.approvalStatus = active.value
-  getReceiveApplyList(listQuery.value).then((response) => {
-    list.value = response.data.rows.map((item: IlistType) => {
-      return {
-        ...item,
-        approvalStatus: approvalStatusMap[item.approvalStatus],
-      }
-    })
-    total.value = parseInt(response.data.total)
-    loadingTable.value = false
-  })
-}
-
-// 重置
-const clearList = () => {
-  listQuery.value = {
-    applyNo: '', // 申请编号
-    applyName: '', // 申请名称
-    applyUnit: '', // 申请部门
-    applyPerson: '', // 申请人
-    startTime: '', // 申请开始日期
-    endTime: '', // 申请结束日期
-    approvalStatus: '', // 	审批状态
-    processResult: '', // 	处置结果
-    applyType: '1', // 申请类型 领用1
-    createUser: '', // 创建人
-    formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
-    offset: 1,
-    limit: 20,
-  }
-  timeRange.value = ['', '']
-  fetchData(true)
-}
-
-// 搜索
-const searchList = () => {
-  fetchData(true)
-}
-
-// 多选发生改变时
-const handleSelectionChange = (e: any) => {
-  checkoutList.value = e.map((item: { id: string }) => item.id)
-}
-const $router = useRouter()
-
-// 新建
-const add = () => {
-  $router.push({ path: '/receive/add', query: { typeValue: 'add' } })
-}
-
-// 导出
-const exportAll = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: '下载中请稍后',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (list.value.length > 0) {
-    const params = {
-      applyNo: listQuery.value.applyNo, // 申请编号
-      applyName: listQuery.value.applyName, // 申请名称
-      applyUnit: listQuery.value.applyUnit, // 申请部门
-      applyPerson: listQuery.value.applyPerson, // 申请人
-      startTime: listQuery.value.startTime, // 申请开始日期
-      endTime: listQuery.value.endTime, // 申请结束日期
-      approvalStatus: listQuery.value.approvalStatus, // 	审批状态
-      processResult: listQuery.value.processResult, // 	处置结果
-      applyType: listQuery.value.applyType, // 申请类型 领用0
-      createUser: listQuery.value.createUser, // 创建人
-      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
-      offset: 1,
-      limit: 20,
-      ids: checkoutList.value,
-    }
-    // 调导出接口
-    exportReceiveApplyList(params).then((res) => {
-      const blob = new Blob([res.data])
-      exportFile(blob, '设备领用申请列表.xlsx')
-    })
-  }
-  else {
-    ElMessage.warning('无数据可导出数据')
-  }
-  loading.close()
-}
-
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  fetchData(true)
-}
-
-// 打印列表
-function printList() {
-  // 打印列
-  const properties = columns.value.map((item) => {
-    return {
-      field: item.value,
-      displayName: item.text,
-    }
-  })
-  if (checkoutList.value.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '设备领用申请列表')
-  }
-  else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: IlistType) => checkoutList.value.includes(item.id))
-    printJSON(printList, properties, '设备领用申请列表')
-  }
-  else {
-    ElMessage.warning('无可打印内容')
-  }
-}
-
-// 操作
-const handleEdit = (row: IlistType, val: string, title = '') => {
-  if (val === '取消') {
-    const params = {
-      taskId: row.taskId!,
-      comments: '',
-    }
-    ElMessageBox.confirm(
-      '确认取消该审批吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        submitApproval('revoke', params).then((res) => {
-          ElMessage({
-            type: 'success',
-            message: '取消成功',
-          })
-        })
-        fetchData(true)
-      })
-  }
-  else if (val === '删除') {
-    ElMessageBox.confirm(
-      '确认删除该审批吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        delReceiveApplyList({ id: row.id, taskId: row.taskId }).then((res) => {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          fetchData(true)
-        })
-      })
-  }
-  else if (val === '提交') {
-    ElMessageBox.confirm(
-      '确认提交该审批吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        submitReceiveApplyList({ id: row.id, formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL }).then((res) => {
-          ElMessage({
-            type: 'success',
-            message: '已提交',
-          })
-        })
-        fetchData(true)
-      })
-  }
-  else if (val === '同意') {
-    approvalDialog.value.initDialog('agree', row.taskId)
-  }
-  else if (val === '驳回') {
-    approvalDialog.value.initDialog('reject', row.taskId)
-  }
-  else if (val === '拒绝') {
-    approvalDialog.value.initDialog('refuse', row.taskId)
-  }
-  else if (val === '查看' || val === '编辑') {
-    $router.push({
-      path: `/receive/${title}`,
-      query: {
-        typeValue: title,
-        approvalStatus: approvalStatusReserveMap[row.approvalStatus],
-        id: row.id,
-        taskId: row.taskId,
-        processId: row.processId, // 查询审批记录使用
-      },
-    })
-  }
-}
-// 按钮切换
-const changeCurrentButton = (val: string) => {
-  active.value = val
-  clearList()
-}
-
-// 审批结束回调
-const approvalSuccess = () => {
-  fetchData(true)
-}
-
-// 选择器模糊查询
-const remoteMethod = (query: string) => {
-  if (query) {
-    applyPersonLoading.value = true
-    setTimeout(() => {
-      applyPersonLoading.value = false
-      usePersonOptions.value = usePersonList.value.filter((item) => {
-        return item.name.toLowerCase().includes(query.toLowerCase())
-      })
-    }, 200)
-  }
-  else {
-    usePersonOptions.value = usePersonList.value
-  }
-}
-
-// 获取用户列表(增加模糊查询)
-const fetchUserList = () => {
-  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
-    usePersonList.value = res.data.rows
-    usePersonOptions.value = res.data.rows
-  })
-}
-
-// 获取使用部门
-const fetchDeptTreeList = () => {
-  getDeptTreeList().then((res: any) => {
-    if (res.data) { // 将列表转树结构
-      useDeptList.value = toTreeList(res.data, '0', true)
-    }
-  })
-}
-
-onMounted(() => {
-  fetchData(true)
-  // 获取使用部门
-  fetchDeptTreeList()
-  fetchUserList()
-})
-</script>
-
-<template>
-  <app-container>
-    <search-area
-      :need-clear="true"
-      @search="searchList" @clear="clearList"
-    >
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.applyNo"
-          placeholder="申请编号"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.applyName"
-          placeholder="申请名称"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
-      </search-item>
-      <search-item>
-        <el-select
-          v-model="listQuery.applyPerson"
-          placeholder="请选择申请人"
-          style="width: 100%;"
-          filterable
-          remote
-          remote-show-suffix
-          :remote-method="remoteMethod"
-          :loading="applyPersonLoading"
-        >
-          <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="timeRange"
-          type="daterange"
-          range-separator="到"
-          format="YYYY-MM-DD"
-          value-format="YYYY-MM-DD"
-          start-placeholder="领用开始日期"
-          end-placeholder="领用结束日期"
-        />
-      </search-item>
-    </search-area>
-
-    <table-container>
-      <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
-      </template>
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @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="220" fixed="right">
-            <template #default="{ row }">
-              <el-button
-                size="small"
-                type="primary"
-                link
-                @click="handleEdit(row, '查看', 'detail')"
-              >
-                查看
-              </el-button>
-              <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (active === '0' || active === '2')"
-                size="small"
-                link
-                type="primary"
-                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
-                @click="handleEdit(row, '同意')"
-              >
-                同意
-              </el-button>
-              <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (active === '0' || active === '2')"
-                size="small"
-                link
-                type="primary"
-                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
-                @click="handleEdit(row, '驳回')"
-              >
-                驳回
-              </el-button>
-              <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (active === '0' || active === '2')"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
-                @click="handleEdit(row, '拒绝')"
-              >
-                拒绝
-              </el-button>
-              <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
-                size="small"
-                link
-                type="primary"
-                @click="handleEdit(row, '编辑', 'edit')"
-              >
-                编辑
-              </el-button>
-              <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
-                size="small"
-                link
-                type="primary"
-                @click="handleEdit(row, '提交')"
-              >
-                提交
-              </el-button>
-              <!-- 是发起者且审批中可以取消 -->
-              <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (active === '0' || active === '3')"
-                size="small"
-                link
-                type="info"
-                :disabled="row.approvalStatus !== '审批中'"
-                @click="handleEdit(row, '取消')"
-              >
-                取消
-              </el-button>
-              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-              <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (active !== '4' && active !== '5')"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatus === '未通过' || row.approvalStatus === '已通过'"
-                @click="handleEdit(row, '删除')"
-              >
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <button-box :active="active" @changeCurrentButton="changeCurrentButton" />
-    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-  </app-container>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-</style>
-
diff --git a/src/views/device/receive/buttonBox.vue b/src/views/device/receive/buttonBox.vue
deleted file mode 100644
index 4205fa8..0000000
--- a/src/views/device/receive/buttonBox.vue
+++ /dev/null
@@ -1,46 +0,0 @@
-<script lang="ts" setup name="ButtonBox">
-import { ref } from 'vue'
-const emits = defineEmits(['changeCurrentButton'])
-const menu = [
-  { name: '全部', id: '0' },
-  { name: '草稿箱', id: '1' },
-  { name: '待审批', id: '2' },
-  { name: '审批中', id: '3' },
-  { name: '已通过', id: '4' },
-  { name: '未通过', id: '5' },
-  { name: '已取消', id: '6' },
-]
-const current = ref('0')
-watch(current, (newValue) => {
-  emits('changeCurrentButton', newValue)
-})
-</script>
-
-<template>
-  <div class="container">
-    <div class="btns">
-      <!-- 三级菜单 -->
-      <el-radio-group v-model="current">
-        <el-radio-button v-for="item in menu" :key="item.id" :label="item.id">
-          {{ item.name }}
-        </el-radio-button>
-      </el-radio-group>
-    </div>
-    <!-- 展示区域 -->
-    <!-- <component :is="currentComp" /> -->
-  </div>
-</template>
-
-<style lang="scss" scoped>
-.container {
-  position: relative;
-
-  .btns {
-    position: fixed;
-    top: 69px;
-    right: 15px;
-    z-index: 999;
-  }
-}
-</style>
-
diff --git a/src/views/device/receive/createOrCheck.vue b/src/views/device/receive/createOrCheck.vue
deleted file mode 100644
index 9cbc3bc..0000000
--- a/src/views/device/receive/createOrCheck.vue
+++ /dev/null
@@ -1,552 +0,0 @@
-<script lang="ts" setup name="CreateOrCheck">
-import { onMounted, reactive, ref } from 'vue'
-import type { Ref } from 'vue'
-import dayjs from 'dayjs'
-import type { FormInstance, FormRules } from 'element-plus'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { useRoute, useRouter } from 'vue-router'
-import type { IdeviceList, IdeviceListQuery } from './receive'
-import SelectDeviceDialog from './selectDeviceDialog.vue'
-import { toTreeList } from '@/utils/structure'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
-import {
-  getReceiveApplyListDetail,
-  saveAddReceiveApplyList,
-  saveEditReceiveApplyList,
-  submitReceiveApplyList,
-} from '@/api/device/receive'
-import type { userType } from '@/views/system/user/user-interface'
-import type { deptType } from '@/views/device/standingBook/standingBook-interface'
-import { getDeptTreeList } from '@/api/system/dept'
-import { getUserList } from '@/api/system/user'
-import { submitApproval } from '@/api/approval'
-import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
-
-const $route = useRoute()
-const approvalDialog = ref() // 审批对话框显隐
-const typeValue = ref() // add、edit、detail
-const approvalStatus = ref() // 审批类型
-const useDeptList = ref<deptType[]>([]) // 部门列表
-const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
-const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
-const applyPersonLoading = ref(false)
-const isMulti = ref(false) // 是否批量添加(允许多选)
-const selectIndex = ref() // 点击选择的index--点击第几行
-const dialogSelectDiviceVisible = ref(false) // 控制选择设备对话框显隐
-const textMap: { [key: string]: string } = {
-  edit: '编辑',
-  add: '新建',
-  detail: '详情',
-}// 字典
-// 选中的内容
-const checkoutList = ref([])
-// 表单数据
-const form = ref({
-  taskId: '', // 任务id（审批用）
-  id: '',
-  processId: '', // 流程id--查询审批记录使用
-  applyName: '', // 申请名称
-  applyUnit: '', // 申请单位
-  applyPerson: '', // 申请人
-  time: '', // 领用时间
-  applyDesc: '', // 申请说明
-})
-const ruleFormRef = ref<FormInstance>() as any
-const list = ref<IdeviceList[]>([])// 表格数据
-
-// 查询条件
-const listQuery: Ref<IdeviceListQuery> = ref({
-  equipmentName: '', // 仪器名称
-  equipmentNo: '', // 设备编号
-  modelNo: '', // 型号
-  mesureRange: '', // 测量范围
-  useDeptName: '', // 使用部门
-  usePersonName: '', // 使用人
-  managerStateName: '', // 管理状态
-  validDate: '', // 有效日期
-  offset: 1,
-  limit: 20,
-})
-// 表头
-const columns = ref<TableColumn[]>([
-  { text: '设备编号', value: 'equipmentNo', align: 'center', width: '230' },
-  { text: '设备名称', value: 'equipmentName', align: 'center' },
-  { text: '型号', value: 'modelNo', align: 'center' },
-  { text: '测量范围', value: 'mesureRange', align: 'center' },
-  { text: '使用部门', value: 'useDeptName', align: 'center' },
-  { text: '使用人', value: 'usePersonName', align: 'center' },
-  { text: '管理状态', value: 'managerStateName', align: 'center' },
-  { text: '有效日期', value: 'validDate', align: 'center' },
-])
-// 表单校验规则
-const rules = reactive<FormRules>({
-  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
-  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'change' }],
-  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
-  time: [{ type: 'date', required: true, message: '领用时间不能为空', trigger: 'change' }],
-  applyDesc: [{ required: true, message: '申请说明不能为空', trigger: 'blur' }],
-})
-
-const $router = useRouter()
-// 点击关闭
-const close = () => {
-  $router.back()
-}
-
-const handleClick = (val: string) => {
-  if (val === 'agree') { // 同意
-    approvalDialog.value.initDialog('agree', form.value.taskId)
-  }
-  else if (val === 'reject') { // 驳回
-    approvalDialog.value.initDialog('reject', form.value.taskId)
-  }
-  else if (val === 'refuse') { // 拒绝
-    approvalDialog.value.initDialog('refuse', form.value.taskId)
-  }
-  else if (val === 'revoke') {
-    const params = {
-      taskId: form.value.taskId!,
-      comments: '',
-    }
-    ElMessageBox.confirm(
-      '确认撤回该审批吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        submitApproval('revoke', params).then((res) => {
-          ElMessage({
-            type: 'success',
-            message: '已撤回',
-          })
-        })
-        close()
-      })
-  }
-}
-
-// 多选发生改变时
-const handleSelectionChange = (e: any) => {
-  checkoutList.value = e
-}
-
-// 删除行
-const delRow = () => {
-  if (checkoutList.value.length <= 0) {
-    ElMessage({
-      message: '请选中要删除的行',
-      type: 'warning',
-    })
-  }
-  else {
-    checkoutList.value.forEach((item: IdeviceListQuery) => {
-      list.value.forEach((element, index) => {
-        if (element.equipmentNo === item.equipmentNo) {
-          list.value.splice(index, 1)
-        }
-      })
-    })
-  }
-}
-
-// 增加行
-const addRow = () => {
-  const index = list.value.findIndex(item => !item.equipmentNo)
-  if (index !== -1) {
-    ElMessage.warning('请完善上一条设备信息')
-    return
-  }
-  list.value.push({
-    equipmentName: '', // 设备名称
-    equipmentNo: '', // 设备编号
-    modelNo: '', // 型号
-    mesureRange: '', // 测量范围
-    useDeptName: '', // 使用部门
-    usePersonName: '', // 使用人
-    managerStateName: '', // 管理状态
-    validDate: '', // 有效日期
-    equipmentId: '', // 设备ID
-  })
-}
-
-// 点击选择
-const handleSelect = (index: number, row: IdeviceList) => {
-  dialogSelectDiviceVisible.value = true // 选择设备对话框显隐
-  isMulti.value = false // 是否单选, false单选、true表格多选
-  selectIndex.value = index
-}
-
-// 点击批量添加
-const multiAdd = () => {
-  dialogSelectDiviceVisible.value = true
-  isMulti.value = true
-}
-
-// 选择设备对话框关闭
-const closeDialog = () => {
-  dialogSelectDiviceVisible.value = false
-}
-
-// 选择好设备了, 添加选好的设备到表格中
-const updateDeviceConfirm = (val: Array<IdeviceList>) => {
-  if (isMulti.value) { // 批量增加时push
-    val.forEach((item: IdeviceList) => {
-    // 只添加列表里不存在的
-      const index = list.value.findIndex((i: IdeviceList) => item.equipmentNo === i.equipmentNo)
-      if (index === -1) {
-        list.value.push(item)
-      }
-    })
-  }
-  else { // 单选替换
-    const index = list.value.findIndex((i: IdeviceList) => val[0].equipmentNo === i.equipmentNo)
-    if (index !== -1) {
-      ElMessage.warning('此设备已添加过')
-      return
-    }
-    list.value.splice(selectIndex.value, 1, val[0])
-  }
-}
-
-// 保存
-const save = () => {
-  ruleFormRef.value.validate((valid: boolean) => {
-    if (valid) {
-      const loading = ElLoading.service({
-        lock: true,
-        background: 'rgba(255, 255, 255, 0.8)',
-      })
-      // 保存之前清除空行、避免传给后端无用空对象
-      const index = list.value.findIndex((item: IdeviceList) => !item.equipmentNo)
-      if (index !== -1) {
-        list.value.splice(index, 1)
-      }
-      const params = {
-        applyName: form.value.applyName, // 申请名称
-        applyUnit: form.value.applyUnit, // 申请单位
-        applyPerson: form.value.applyPerson, // 申请人
-        time: form.value.time, // 领用时间
-        applyDesc: form.value.applyDesc, // 申请说明
-        applyType: '1', // 申请类型 领用1
-        id: form.value.id,
-        equipmentList: list.value.map((item) => {
-          return {
-            equipmentId: item.id!,
-          }
-        }),
-      }
-      // 新建
-      if (typeValue.value === 'add') {
-        saveAddReceiveApplyList(params).then((res) => {
-          form.value.id = res.data
-          ElMessage.success('保存成功')
-          loading.close()
-        })
-      }
-      // 保存
-      else if (typeValue.value === 'edit') {
-        saveEditReceiveApplyList(params).then((res) => {
-          form.value.id = res.data
-          ElMessage.success('保存成功')
-          loading.close()
-        })
-      }
-    }
-    else {
-      console.log('表单校验不通过')
-    }
-  })
-}
-
-// 提交表单
-const submit = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (form.value.id) {
-    const params = {
-      id: form.value.id,
-      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL, // 表单id
-    }
-    submitReceiveApplyList(params).then(() => {
-      ElMessage.success('提交成功')
-      loading.close()
-      close()
-    })
-  }
-  else {
-    ElMessage.info('请先保存再提交！')
-  }
-}
-
-// 获取用户列表--（是否有不分页接口？）
-const fetchUserList = () => {
-  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
-    usePersonList.value = res.data.rows
-    usePersonOptions.value = res.data.rows
-  })
-}
-
-// 获取使用部门
-const fetchDeptTreeList = () => {
-  getDeptTreeList().then((res: any) => {
-    if (res.data) { // 将列表转树结构
-      useDeptList.value = toTreeList(res.data, '0', true)
-    }
-  })
-}
-
-// 审批结束回调
-const approvalSuccess = () => {
-  close()
-}
-
-// 编辑、详情--获取详细信息
-const fetchReceiveApplyListDetail = () => {
-  getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
-    form.value.applyUnit = res.data.applyUnit // 部门
-    form.value.applyName = res.data.applyName // 申请名称
-    form.value.applyPerson = res.data.applyPerson// 申请人
-    form.value.time = res.data.time // 领用时间
-    form.value.applyDesc = res.data.applyDesc // 申请说明
-    list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
-      return {
-        ...item,
-        validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
-      }
-    })
-  })
-}
-
-// 选择器模糊查询
-const remoteMethod = (query: string) => {
-  if (query) {
-    applyPersonLoading.value = true
-    setTimeout(() => {
-      applyPersonLoading.value = false
-      usePersonOptions.value = usePersonList.value.filter((item) => {
-        return item.name.toLowerCase().includes(query.toLowerCase())
-      })
-    }, 200)
-  }
-  else {
-    usePersonOptions.value = usePersonList.value
-  }
-}
-
-onMounted(() => {
-  typeValue.value = $route.query.typeValue // 类型add、edit、detail
-  form.value.id = $route.query.id as string // id
-  form.value.taskId = $route.query.taskId as string // 任务id
-  form.value.processId = $route.query.processId as string // 任务id
-  approvalStatus.value = $route.query.approvalStatus // 审批类型
-  // 编辑、详情获取详情页信息
-  if (typeValue.value === 'edit' || typeValue.value === 'detail') {
-    fetchReceiveApplyListDetail() // 获取详细信息
-  }
-
-  // 获取部门信息
-  fetchDeptTreeList()
-  // 获取人员列表--申请人使用
-  fetchUserList()
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="`设备领用申请-${textMap[typeValue]}`">
-      <template #btns>
-        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('agree')">
-          同意
-        </el-button>
-        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('reject')">
-          驳回
-        </el-button>
-        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('refuse')">
-          拒绝
-        </el-button>
-        <el-button v-if="typeValue === 'add' || typeValue === 'edit'" type="primary" @click="save">
-          保存
-        </el-button>
-        <el-button v-if="typeValue === 'add'" type="primary" @click="submit">
-          提交
-        </el-button>
-        <el-button v-if="typeValue === 'edit' && approvalStatus === '3'" type="primary" @click="handleClick('revoke')">
-          撤回
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-    <div class="create-check">
-      <div class="top-info">
-        <!-- 表单 -->
-        <div class="form-area">
-          <el-form
-            ref="ruleFormRef"
-            :model="form"
-            label-width="120px"
-            :rules="rules"
-          >
-            <el-row :gutter="24">
-              <el-col :span="6">
-                <el-form-item label="申请名称" prop="applyName">
-                  <el-input
-                    v-model="form.applyName"
-                    :placeholder="typeValue === 'detail' ? '' : '请输入申请名称'"
-                    clearable
-                    :disabled="typeValue === 'detail'"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="申请单位" prop="applyUnit">
-                  <dept-select
-                    v-model="form.applyUnit"
-                    placeholder="请选择申请单位"
-                    :data="useDeptList"
-                    :disabled="typeValue === 'detail'"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="申请人" prop="applyPerson">
-                  <el-select
-                    v-model="form.applyPerson"
-                    :disabled="typeValue === 'detail'"
-                    placeholder="请选择申请人"
-                    style="width: 100%;"
-                    filterable
-                    remote
-                    remote-show-suffix
-                    :remote-method="remoteMethod"
-                    :loading="applyPersonLoading"
-                  >
-                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="领用时间" prop="time">
-                  <el-date-picker
-                    v-model="form.time"
-                    type="datetime"
-                    placeholder="请选择领用时间"
-                    format="YYYY-MM-DD hh:mm"
-                    value-format="YYYY-MM-DD hh:mm"
-                    :disabled="typeValue === 'detail'"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="申请说明" prop="applyDesc">
-                  <el-input v-model="form.applyDesc" type="textarea" autosize clearable :disabled="typeValue === 'detail'" />
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </el-form>
-        </div>
-      </div>
-      <!-- 表格 -->
-      <detail-block title="设备领用列表">
-        <template #btns>
-          <el-button v-if="typeValue !== 'detail'" type="primary" @click="multiAdd">
-            批量添加
-          </el-button>
-          <el-button v-if="typeValue !== 'detail'" type="primary" @click="addRow">
-            增加行
-          </el-button>
-          <el-button v-if="typeValue !== 'detail'" type="info" @click="delRow">
-            删除行
-          </el-button>
-        </template>
-        <el-table
-          :data="list"
-          border
-          style="width: 100%;"
-          max-height="600"
-          @selection-change="handleSelectionChange"
-        >
-          <el-table-column type="selection" width="38" />
-          <el-table-column align="center" label="序号" width="80" type="index" />
-          <el-table-column
-            v-for="item in columns"
-            :key="item.value"
-            :prop="item.value"
-            :label="item.text"
-            :width="item.width"
-            show-overflow-tooltip
-            align="center"
-          >
-            <template v-if="item.value === 'equipmentNo' && (typeValue === 'add' || typeValue === 'edit')" #default="scope">
-              <el-input v-model="scope.row.equipmentNo" placeholder="请选择设备" class="input">
-                <template #append>
-                  <el-button size="small" @click="handleSelect(scope.$index, scope.row)">
-                    选择
-                  </el-button>
-                </template>
-              </el-input>
-            </template>
-          </el-table-column>
-        </el-table>
-      </detail-block>
-
-      <detail-block v-if="typeValue === 'detail'" title="审批流程">
-        <approval-record :process-id="form.processId" />
-      </detail-block>
-    </div>
-    <select-device-dialog
-      :dialog-select-divice-visible="dialogSelectDiviceVisible"
-      :is-multi="isMulti"
-      @closeDialog="closeDialog"
-      @updateDeviceConfirm="updateDeviceConfirm"
-    />
-
-    <!-- 同意、驳回、拒绝对话框显示 -->
-    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-  </app-container>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-.create-check {
-  margin-top: 10px;
-
-  .top-info {
-    display: flex;
-    flex-direction: column;
-    width: 100%;
-    padding-right: 10px;
-    border-radius: 10px;
-    background-color: #fff;
-    // padding: 10px;
-
-    .title-button {
-      display: flex;
-      align-items: center;
-
-      &::before {
-        content: "";
-        flex: 1;
-      }
-
-      .button-group {
-        flex: 1;
-        display: flex;
-        justify-content: flex-end;
-      }
-    }
-
-    .form-area {
-      margin-top: 40px;
-    }
-  }
-}
-</style>

diff --git a/src/api/customer/overtime.ts b/src/api/customer/overtime.ts
deleted file mode 100644
index 9f349d6..0000000
--- a/src/api/customer/overtime.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * 到期样品接口
- */
-import request from '../index'
-import type { IOvertimeListQuery } from '@/views/customer/sample/overTime/overtime_list_interface'
-const prefix = '/meter'
-
-// 列表查询
-export function getOverTimeList(data: IOvertimeListQuery) {
-  return request({
-    url: `${prefix}/sample/overtime/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 导出列表
-export function exportOverTimeList(data: Omit<IOvertimeListQuery, 'limit' | 'offset'>) {
-  return request({
-    url: `${prefix}/sample/overtime/listExport`,
-    method: 'post',
-    responseType: 'blob',
-    data,
-  })
-}
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index 2610494..21a9c9e 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -59,3 +59,20 @@
   })
 }
 
+// 查询检定记录
+export function getMesureRecords(data: { id: string }) {
+  return request({
+    url: `${prefix}/sample/mesureRecordsBySampleId`,
+    method: 'post',
+    data,
+  })
+}
+
+// 查询检定证书
+export function getCertification(data: { id: string }) {
+  return request({
+    url: `${prefix}/sample/certificationBySampleId`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components.d.ts b/src/components.d.ts
index 227585d..90f2dde 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -21,6 +21,7 @@
     BarCodeBind: typeof import('./components/BarCodeBind/index.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
+    ButtonBox: typeof import('./components/buttonBox/buttonBox.vue')['default']
     CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default']
     CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
diff --git a/src/components/buttonBox/buttonBox.vue b/src/components/buttonBox/buttonBox.vue
new file mode 100644
index 0000000..cf93686
--- /dev/null
+++ b/src/components/buttonBox/buttonBox.vue
@@ -0,0 +1,49 @@
+<!-- 列表页右上角按钮组 -->
+<script lang="ts" setup name="ButtonBox">
+import type { PropType } from 'vue'
+import { ref } from 'vue'
+import type { IMenu } from '../../views/device/receive/receive'
+
+const props = defineProps({
+  active: String,
+  menu: {
+    type: Array as PropType<IMenu[]>,
+  },
+})
+const emits = defineEmits(['changeCurrentButton'])
+
+const current = ref('')
+watch(current, (newValue) => {
+  emits('changeCurrentButton', newValue)
+})
+watch(() => props.active, (newValue) => {
+  current.value = newValue!
+  console.log('pppppp', newValue)
+})
+</script>
+
+<template>
+  <div class="container">
+    <div class="btns">
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.id" :label="item.id">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 69px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 36f5104..fb6758e 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -481,7 +481,7 @@
       {
         path: 'applyList',
         name: 'ApplyList',
-        component: () => import('@/views/device/receive/applyList.vue'),
+        component: () => import('@/views/device/receive/apply/applyList.vue'),
         meta: {
           title: '设备领用申请',
           icon: 'ep:key',
@@ -491,7 +491,7 @@
       {
         path: ':type',
         name: 'ApplyListDetail',
-        component: () => import('@/views/device/receive/createOrCheck.vue'),
+        component: () => import('@/views/device/receive/apply/applyEdit.vue'),
         meta: {
           title: '设备领用申请',
           icon: 'ep:key',
@@ -503,7 +503,7 @@
       {
         path: 'solveList',
         name: 'SolveList',
-        component: () => import('@/views/device/receive/solveList.vue'),
+        component: () => import('@/views/device/receive/solve/solveList.vue'),
         meta: {
           title: '设备领用处理',
           icon: 'ep:key',
@@ -513,7 +513,7 @@
       {
         path: 'solveDetail',
         name: 'SolveListDetail',
-        component: () => import('@/views/device/receive/solveComponent/detail.vue'),
+        component: () => import('@/views/device/receive/solve/solveDetail.vue'),
         meta: {
           title: '设备领用处理',
           icon: 'ep:key',
diff --git a/src/views/customer/bench/bench.vue b/src/views/customer/bench/bench.vue
index 6b502fc..3b8f274 100644
--- a/src/views/customer/bench/bench.vue
+++ b/src/views/customer/bench/bench.vue
@@ -1,15 +1,53 @@
 <script lang="ts" setup name="DeviceBench">
-import { getCurrentInstance, ref } from 'vue'
+import { ref } from 'vue'
 import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
 import type { planReturn } from './bench-interface'
 import Linechart from '@/components/Echart/LineChart.vue'
 import type { lineDataI } from '@/components/Echart/echart-interface'
 import { getCustomerExpireData, getHighQualityCustomerList, getSampleAddData, getSampleExpireData } from '@/api/customer/bench'
+import { getSampleList } from '@/api/customer/sampleList'
+import type { IOvertimeListQuery } from '@/views/customer/sample/overTime/overtime_list_interface'
+import { getAdviceList } from '@/api/customer/advice'
+import type { IAdvice, IAdviceQuery } from '@/views/customer/advice/advice_interface'
 
+const reg = /(\d{4})\年(\d{2})月/ // 把2022年3月转为2022-03
 // 每个展示块高度
 const blockHeight = ref(300)
 const blockWidth = ref(400)
-const { proxy } = getCurrentInstance() as any
+
+// 到期样品查询条件
+const dueSampleListQuery: Ref<IOvertimeListQuery> = ref({
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 型号
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  startTime: '', // 检定开始时间
+  endTime: '', // 检定结束时间
+  overtimeStatus: '1', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+  offset: 1,
+  limit: 20,
+})
+
+// 客户关系查询条件
+const customerRelationsListQuery: Ref<IAdviceQuery> = ref({
+  adviceNo: '', // 投诉编号
+  customerName: '', // 公司名称
+  customerNo: '', // 客户编号
+  startTime: '', // 投诉开始时间
+  endTime: '', // 投诉结束时间
+  offset: 1,
+  limit: 20,
+})
+
+const dueSampleTableLoading = ref(false) // 到期样品表格loading
+const customerRelationsTableLoading = ref(false) // 客户关系loading
+const sampleAddLoading = ref(false) // 样品新增趋势loading
+const customerAddLoading = ref(false) // 客户新增趋势loading
+const sampleExpireLoading = ref(false) // 样品到期趋势loading
+const highQualityCustomerLoading = ref(false) // 优质客户名单loading
+
 // 到期样品表格数据
 const dueSampleTableData = ref()
 // 到期样品表头
@@ -64,54 +102,81 @@
   blockWidth.value = (document.body.clientWidth - 180 - 20 - 20) / 3
   console.log(blockHeight.value, blockWidth.value - 20)
 }
+
 window.addEventListener('resize', () => {
   calcBlockSize()
 })
 
 // 获取样品新增趋势数据
 function fetchSampleAddData() {
+  sampleAddLoading.value = true
   getSampleAddData().then((res) => {
-    sampleAddXData.value = res.data.map((item: planReturn) => {
-      // return item.date.replace('年', '-')
-      return item.date
-    })
+    sampleAddXData.value = res.data.map((item: planReturn) => item.date.replace(reg, '$1-$2'))
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     sampleAddYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
-    sampleAddData.value = [{ name: '客户', data: yValue }]
+    sampleAddData.value = [{ name: '样品', data: yValue }]
+    sampleAddLoading.value = false
   })
 }
 
 // 获取样品到期趋势数据
 function fetchSampleExpireData() {
+  sampleExpireLoading.value = true
   getSampleExpireData().then((res) => {
-    sampleExpireXData.value = res.data.map((item: planReturn) => item.date)
+    sampleExpireXData.value = res.data.map((item: planReturn) => item.date.replace(reg, '$1-$2'))
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     sampleExpireYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
-    sampleExpireData.value = [{ name: '客户', data: yValue }]
+    sampleExpireData.value = [{ name: '样品', data: yValue }]
+    sampleExpireLoading.value = false
   })
 }
 
 // 获取优质客户名单
 function fetchHighQualityCustomerList() {
+  highQualityCustomerLoading.value = true
   getHighQualityCustomerList().then((res) => {
     highQualityCustomerTableData.value = res.data.rows
+    highQualityCustomerLoading.value = false
   })
 }
 // 获取客户新增趋势数据
 function fetchCustomerExpireData() {
+  customerAddLoading.value = true
   getCustomerExpireData().then((res) => {
-    customerAddXData.value = res.data.map((item: planReturn) => item.date)
+    customerAddXData.value = res.data.map((item: planReturn) => item.date.replace(reg, '$1-$2'))
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     customerAddYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
     customerAddData.value = [{ name: '客户', data: yValue }]
+    customerAddLoading.value = false
   })
 }
 
 // 获取到期样品表格数据
+function fetchDueSampleTableData() {
+  dueSampleTableLoading.value = true
+  getSampleList(dueSampleListQuery.value).then((response) => {
+    dueSampleTableData.value = response.data.rows
+    dueSampleTableLoading.value = false
+  })
+}
 // 获取客户关系表格数据
+function fetchcustomerRelationsTableData() {
+  customerRelationsTableLoading.value = true
+  getAdviceList(customerRelationsListQuery.value).then((res) => {
+    customerRelationsTabledata.value = res.data.rows.map((item: IAdvice) => {
+      return {
+        ...item,
+        adviceClass: item.adviceClass === '0' ? '建议' : item.adviceClass === '1' ? '投诉' : '其他',
+      }
+    })
+    customerRelationsTableLoading.value = false
+  })
+}
 
 onMounted(() => {
   calcBlockSize()
+  fetchDueSampleTableData() // 到期样品表格
+  fetchcustomerRelationsTableData() // 客户关系表格
   fetchSampleAddData()// 样品新增趋势
   fetchSampleExpireData()// 样品到期趋势
   fetchCustomerExpireData()// 客户新增趋势
@@ -125,6 +190,7 @@
       <el-row :gutter="10">
         <el-col :span="8">
           <bench-col
+            v-loading="dueSampleTableLoading"
             icon="icon-book"
             title="到期样品"
             path-url="/sample/overtime"
@@ -145,6 +211,7 @@
         </el-col>
         <el-col :span="8">
           <bench-col
+            v-loading="sampleAddLoading"
             icon="icon-line"
             title="样品新增趋势"
             :height="blockHeight"
@@ -159,6 +226,7 @@
         </el-col>
         <el-col :span="8">
           <bench-col
+            v-loading="sampleExpireLoading"
             icon="icon-line"
             title="样品到期趋势"
             :height="blockHeight"
@@ -177,6 +245,7 @@
       <el-row :gutter="10">
         <el-col :span="8">
           <bench-col
+            v-loading="customerRelationsTableLoading"
             icon="icon-book"
             title="客户关系"
             path-url="/customerManage/advice"
@@ -197,6 +266,7 @@
         </el-col>
         <el-col :span="8">
           <bench-col
+            v-loading="customerAddLoading"
             icon="icon-line"
             title="客户新增趋势"
             :height="blockHeight"
@@ -211,6 +281,7 @@
         </el-col>
         <el-col :span="8">
           <bench-col
+            v-loading="highQualityCustomerLoading"
             icon="icon-book"
             title="优质客户名单"
             :style="{ height: blockHeight }"
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index e7d1acb..359c94d 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -8,7 +8,7 @@
 import selectCustomer from './selectCustomer.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import { addSample, getCertification, getMesureRecords, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
@@ -69,6 +69,7 @@
   sampleName: '', // 样品名称
   sampleModel: '', // 样品型号
   manufacturingNo: '', // 出厂编号
+  customerId: '', // 委托方id
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   phone: '', // 委托方电话
@@ -138,12 +139,17 @@
 })
 
 // 获取检定记录
-const fetchMeasureRecords = function (query = null) {
-  dataList.value.measureRecords = []
+const fetchMeasureRecords = (query = null) => {
+  getMesureRecords({ id: infoId.value }).then((res) => {
+    dataList.value.measureRecords = res.data.rows
+  })
 }
+
 // 获取检定证书
-const fetchCertifications = function (query = null) {
-  dataList.value.certificationRecords = []
+const fetchCertifications = (query = null) => {
+  getCertification({ id: infoId.value }).then((res) => {
+    dataList.value.certificationRecords = res.data.rows
+  })
 }
 
 // 菜单
@@ -151,12 +157,12 @@
   {
     name: '检定记录',
     columns: [
-      { text: '委托单编号', value: 'orderCode' },
-      { text: '委托单日期', value: 'orderTime' },
-      { text: '委托方代码', value: 'customerCode' },
-      { text: '委托方名称', value: 'customerName' },
-      { text: '送检人', value: 'deliverer' },
-      { text: '送检日期', value: 'deliverTime' },
+      { text: '委托单编号', value: 'orderCode', align: 'center' },
+      { text: '委托单日期', value: 'orderTime', align: 'center' },
+      { text: '委托方代码', value: 'customerCode', align: 'center' },
+      { text: '委托方名称', value: 'customerName', align: 'center' },
+      { text: '送检人', value: 'deliverer', align: 'center' },
+      { text: '送检日期', value: 'deliverTime', align: 'center' },
     ],
     list: 'measureRecords',
     pagination: true,
@@ -165,11 +171,11 @@
   {
     name: '检定证书',
     columns: [
-      { text: '证书编号', value: 'certificationCode' },
-      { text: '证书名称', value: 'certificationName' },
-      { text: '证书类型', value: 'certificationType' },
-      { text: '证书出具日期', value: 'effectiveDate' },
-      { text: '证书有效期', value: 'expirationDate' },
+      { text: '证书编号', value: 'certificationCode', align: 'center' },
+      { text: '证书名称', value: 'certificationName', align: 'center' },
+      { text: '证书类型', value: 'certificationType', align: 'center' },
+      { text: '证书出具日期', value: 'effectiveDate', align: 'center' },
+      { text: '证书有效期', value: 'expirationDate', align: 'center' },
     ],
     list: 'certificationRecords',
     pagination: true,
@@ -233,18 +239,18 @@
 // 委托方代码获取焦点
 const customerNoFocus = () => {
   visible.value = true
-  console.log(visible.value)
 }
 
 // 选好委托方
 const confirmCheckout = (val: Array<ICustomer>) => {
   if (val && val.length) {
     const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo
-    dataForm.value.customerName = getValue.customerName
-    dataForm.value.phone = getValue.phone
-    dataForm.value.postalCode = getValue.postalCode
-    dataForm.value.customerAddress = getValue.briefName
+    dataForm.value.customerNo = getValue.customerNo // 委托方代码
+    dataForm.value.customerId = getValue.id // 委托方id
+    dataForm.value.customerName = getValue.customerName // 委托方名称
+    dataForm.value.phone = getValue.phone // 电话
+    dataForm.value.postalCode = getValue.postalCode // 邮编
+    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
   }
 }
 
@@ -296,6 +302,7 @@
 const getInfo = () => {
   getSapmleDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data
+    dataForm.value.ABC = res.data.abc
     for (const item of menu) {
       item.searchFunc()
     }
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index a2c4307..c3690d4 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -35,6 +35,7 @@
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center', width: '180px' },
 ])
 // 表格数据
@@ -47,6 +48,7 @@
 const checkoutList = ref<string[]>([])
 // 文件上传input
 const fileRef = ref()
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -62,6 +64,7 @@
     loadingTable.value = false
   })
 }
+
 // 多选发生改变时
 function handleSelectionChange(e: any) {
   checkoutList.value = e.map((item: { id: string }) => item.id)
@@ -71,6 +74,7 @@
 const handleEdit = (row: ISampleList, pageType: 'edit' | 'detail') => {
   $router.push(`/sample/${pageType}/${row.id}`)
 }
+
 // 点击删除
 const handleDelete = (row: ISampleList) => {
   ElMessageBox.confirm(
@@ -94,10 +98,12 @@
       })
     })
 }
+
 // 点击搜索
 const searchList = () => {
   fetchData(true)
 }
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -112,7 +118,7 @@
     offset: 1,
     limit: 20,
   }
-  timeRange.value = ['', '']
+  timeRange.value = ['', ''] // 置空筛选时间
   fetchData(true)
 }
 
@@ -138,10 +144,12 @@
     ElMessage.error('请上传pdf格式')
   }
 }
+
 // 模板下载
 const templateDownload = () => {
 
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -157,10 +165,12 @@
 const uploadAll = () => {
   fileRef.value.click()
 }
+
 // 新建样品
 const add = () => {
   $router.push('/sample/add')
 }
+
 // 导出
 const exportAll = () => {
   const loading = ElLoading.service({
@@ -293,11 +303,13 @@
         <template #columns>
           <el-table-column label="操作" align="center" fixed="right" width="120">
             <template #default="{ row }">
+              <!-- 有orderid(关联了委托书)不允许编辑 -->
               <el-button
                 v-if="proxy.hasPerm('/sample/list/update')"
                 size="small"
                 type="primary"
                 link
+                :disabled="`${row.orderId}` !== ''"
                 @click="handleEdit(row, 'edit')"
               >
                 编辑
@@ -310,11 +322,13 @@
               >
                 详情
               </el-button>
+              <!-- 检测中的样品不允许删除 -->
               <el-button
                 v-if="proxy.hasPerm('/sample/list/delete')"
                 size="small"
                 link
                 type="danger"
+                :disabled="row.sampleSatus !== '3'"
                 @click="handleDelete(row)"
               >
                 删除
diff --git a/src/views/customer/sample/list/sample_list_interface.ts b/src/views/customer/sample/list/sample_list_interface.ts
index 707c8b5..81498a5 100644
--- a/src/views/customer/sample/list/sample_list_interface.ts
+++ b/src/views/customer/sample/list/sample_list_interface.ts
@@ -33,6 +33,7 @@
   sampleModel: string // 样品型号
   manufacturingNo: string // 出厂编号
   customerNo: string // 委托方代码
+  customerId: string // 委托方id
   customerName: string // 委托方名称
   phone: string // 委托方电话
   postalCode: string // 委托方邮编
diff --git a/src/views/customer/sample/list/selectCustomer.vue b/src/views/customer/sample/list/selectCustomer.vue
index 5de352d..0eef7d0 100644
--- a/src/views/customer/sample/list/selectCustomer.vue
+++ b/src/views/customer/sample/list/selectCustomer.vue
@@ -6,7 +6,8 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getCustomerList } from '@/api/customer/customer'
 import { getDictByCode } from '@/api/system/dict'
-const props = defineProps({
+
+defineProps({
   visible: {
     type: Boolean,
     default: false,
@@ -14,18 +15,9 @@
 })
 const emits = defineEmits(['changeVisible', 'confirmCheckout'])
 
-const visibleDialog = computed({
-  get() {
-    return props.visible
-  },
-  set(val) {
-    emits('changeVisible', val)
-  },
-})
-
 // 查询条件
 const listQuery: Ref<ICustomerQuery> = ref({
-  bussinessSize: '', // 业务规模
+  businessSize: '', // 业务规模
   customerName: '', // 公司名称
   customerNo: '', // 客户编号
   grade: '', // 履约评级
@@ -37,40 +29,20 @@
   name: string
   value: string
 }
-// const companySizeList = ref<dictType[]>([]) // 公司规模列表
+
 const businessSizeList = ref<dictType[]>([]) // 业务规模列表
 const gradeList = ref<dictType[]>([]) // 履约评级列表
-// const evaluationList = ref<dictType[]>([]) // 整体评价列表
-function getDict() {
-  // // 获取公司规模
-  // getDictByCode('companySize').then((response) => {
-  //   companySizeList.value = response.data
-  // })
-  // 获取业务规模
-  getDictByCode('businessSize').then((response) => {
-    businessSizeList.value = response.data
-  })
-  // 获取履约评级
-  getDictByCode('grade').then((response) => {
-    gradeList.value = response.data
-  })
-  // // 获取整体评价
-  // getDictByCode('evaluation').then((response) => {
-  //   evaluationList.value = response.data
-  // })
-}
-getDict()
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '客户编号', value: 'customerNo', width: '160', align: 'center', fixed: true },
-  { text: '客户名称', value: 'customerName', width: '120', align: 'center', fixed: true },
-  { text: '公司规模', value: 'companySizeName', align: 'center', fixed: false },
-  { text: '业务规模', value: 'businessSizeName', align: 'center', fixed: false },
-  { text: '履约评级', value: 'gradeName', align: 'center', fixed: false },
-  { text: '整体评价', value: 'evaluationName', align: 'center', fixed: false },
-  { text: '公司地址', value: 'briefName', align: 'center', fixed: false },
-  { text: '创建时间', value: 'createTime', align: 'center', width: '180px', fixed: false },
-  { text: '备注', value: 'remark', align: 'center', fixed: false },
+  { text: '客户名称', value: 'customerName', align: 'center', fixed: true },
+  { text: '公司规模', value: 'companySizeName', width: '110', align: 'center' },
+  { text: '业务规模', value: 'businessSizeName', width: '130', align: 'center' },
+  { text: '履约评级', value: 'gradeName', width: '90', align: 'center' },
+  { text: '整体评价', value: 'evaluationName', width: '110', align: 'center' },
+  { text: '公司地址', value: 'fullAddress', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
+  { text: '备注', value: 'remark', align: 'center' },
 ])
 // 表格数据
 const list = ref<ICustomer[]>([])
@@ -81,44 +53,42 @@
 // 选中的内容
 const checkoutList = ref<string[]>([])
 
-// 数据查询
+function getDict() {
+  // 获取业务规模
+  getDictByCode('businessSize').then((response) => {
+    businessSizeList.value = response.data
+  })
+  // 获取履约评级
+  getDictByCode('grade').then((response) => {
+    gradeList.value = response.data
+  })
+}
+getDict()
+
+// 表格数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getCustomerList(listQuery.value).then((response) => {
-  //   // 模拟数据
-  //   response.data.rows = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', customerAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  //   list.value = response.data.rows.map((item: ICustomer) => {
-  //     if (item.companyProvinceName && item.companyCityName) {
-  //       item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-  //     }
-  //     else {
-  //       item.briefName = item.companyProvinceName || item.companyCityName
-  //     }
-  //     return item
-  //   })
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-
-  // 模拟数据
-  const response = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', customerAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' },
-    { bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', customerAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '2集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' },
-    { bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', customerAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '3集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  list.value = response.map((item: ICustomer) => {
-    if (item.companyProvinceName && item.companyCityName) {
-      item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-    }
-    else {
-      item.briefName = item.companyProvinceName || item.companyCityName
-    }
-    return item
+  getCustomerList(listQuery.value).then((response) => {
+    // 模拟数据
+    list.value = response.data.rows.map((item: ICustomer) => {
+      if (item.addressProvinceName && item.addressCityName) {
+        item.fullAddress = `${item.addressProvinceName}/${item.addressCityName}`
+      }
+      else if (item.addressProvinceName || item.addressCityName) {
+        item.fullAddress = item.addressProvinceName || item.addressCityName
+      }
+      else if (item.addressCountryName) {
+        item.fullAddress = item.addressCountryName
+      }
+      return item
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
   })
-  total.value = 50
-  loadingTable.value = false
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -131,7 +101,7 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    bussinessSize: '', // 业务规模
+    businessSize: '', // 业务规模
     customerName: '', // 公司名称
     customerNo: '', // 客户编号
     grade: '', // 履约评级
@@ -155,9 +125,9 @@
 const cancle = () => {
   emits('changeVisible', false)
 }
+
 // 点击确定
 const clickConfirm = () => {
-  console.log(checkoutList.value)
   if (!checkoutList.value.length) {
     ElMessage({
       message: '请选中',
diff --git a/src/views/customer/sample/overTime/detail.vue b/src/views/customer/sample/overTime/detail.vue
index f553724..1adcbf8 100644
--- a/src/views/customer/sample/overTime/detail.vue
+++ b/src/views/customer/sample/overTime/detail.vue
@@ -184,6 +184,7 @@
 const getInfo = () => {
   getSapmleDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data
+    dataForm.value.ABC = res.data.abc
     for (const item of menu) {
       item.searchFunc()
     }
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index c8f90a1..05fe276 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -19,8 +19,8 @@
   sampleModel: '', // 型号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
-  startTime: '1', // 检定开始时间
-  endTime: '1', // 检定结束时间
+  startTime: '', // 检定开始时间
+  endTime: '', // 检定结束时间
   overtimeStatus: '1', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
   offset: 1,
   limit: 20,
diff --git a/src/views/device/receive/apply/applyEdit.vue b/src/views/device/receive/apply/applyEdit.vue
new file mode 100644
index 0000000..5194bdb
--- /dev/null
+++ b/src/views/device/receive/apply/applyEdit.vue
@@ -0,0 +1,552 @@
+<script lang="ts" setup name="CreateOrCheck">
+import { onMounted, reactive, ref } from 'vue'
+import type { Ref } from 'vue'
+import dayjs from 'dayjs'
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { useRoute, useRouter } from 'vue-router'
+import type { IdeviceList, IdeviceListQuery } from '../receive'
+import SelectDeviceDialog from '../selectDeviceDialog.vue'
+import { toTreeList } from '@/utils/structure'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import {
+  getReceiveApplyListDetail,
+  saveAddReceiveApplyList,
+  saveEditReceiveApplyList,
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import type { userType } from '@/views/system/user/user-interface'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { getDeptTreeList } from '@/api/system/dept'
+import { getUserList } from '@/api/system/user'
+import { submitApproval } from '@/api/approval'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+
+const $route = useRoute()
+const approvalDialog = ref() // 审批对话框显隐
+const typeValue = ref() // add、edit、detail
+const approvalStatus = ref() // 审批类型
+const useDeptList = ref<deptType[]>([]) // 部门列表
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false)
+const isMulti = ref(false) // 是否批量添加(允许多选)
+const selectIndex = ref() // 点击选择的index--点击第几行
+const dialogSelectDiviceVisible = ref(false) // 控制选择设备对话框显隐
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+// 选中的内容
+const checkoutList = ref([])
+// 表单数据
+const form = ref({
+  taskId: '', // 任务id（审批用）
+  id: '',
+  processId: '', // 流程id--查询审批记录使用
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 领用时间
+  applyDesc: '', // 申请说明
+})
+const ruleFormRef = ref<FormInstance>() as any
+const list = ref<IdeviceList[]>([])// 表格数据
+
+// 查询条件
+const listQuery: Ref<IdeviceListQuery> = ref({
+  equipmentName: '', // 仪器名称
+  equipmentNo: '', // 设备编号
+  modelNo: '', // 型号
+  mesureRange: '', // 测量范围
+  useDeptName: '', // 使用部门
+  usePersonName: '', // 使用人
+  managerStateName: '', // 管理状态
+  validDate: '', // 有效日期
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '设备编号', value: 'equipmentNo', align: 'center', width: '230' },
+  { text: '设备名称', value: 'equipmentName', align: 'center' },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: '测量范围', value: 'mesureRange', align: 'center' },
+  { text: '使用部门', value: 'useDeptName', align: 'center' },
+  { text: '使用人', value: 'usePersonName', align: 'center' },
+  { text: '管理状态', value: 'managerStateName', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center' },
+])
+// 表单校验规则
+const rules = reactive<FormRules>({
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'change' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  time: [{ type: 'date', required: true, message: '领用时间不能为空', trigger: 'change' }],
+  applyDesc: [{ required: true, message: '申请说明不能为空', trigger: 'blur' }],
+})
+
+const $router = useRouter()
+// 点击关闭
+const close = () => {
+  $router.back()
+}
+
+const handleClick = (val: string) => {
+  if (val === 'agree') { // 同意
+    approvalDialog.value.initDialog('agree', form.value.taskId)
+  }
+  else if (val === 'reject') { // 驳回
+    approvalDialog.value.initDialog('reject', form.value.taskId)
+  }
+  else if (val === 'refuse') { // 拒绝
+    approvalDialog.value.initDialog('refuse', form.value.taskId)
+  }
+  else if (val === 'revoke') {
+    const params = {
+      taskId: form.value.taskId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认撤回该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        submitApproval('revoke', params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已撤回',
+          })
+        })
+        close()
+      })
+  }
+}
+
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+
+// 删除行
+const delRow = () => {
+  if (checkoutList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    checkoutList.value.forEach((item: IdeviceListQuery) => {
+      list.value.forEach((element, index) => {
+        if (element.equipmentNo === item.equipmentNo) {
+          list.value.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+
+// 增加行
+const addRow = () => {
+  const index = list.value.findIndex(item => !item.equipmentNo)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条设备信息')
+    return
+  }
+  list.value.push({
+    equipmentName: '', // 设备名称
+    equipmentNo: '', // 设备编号
+    modelNo: '', // 型号
+    mesureRange: '', // 测量范围
+    useDeptName: '', // 使用部门
+    usePersonName: '', // 使用人
+    managerStateName: '', // 管理状态
+    validDate: '', // 有效日期
+    equipmentId: '', // 设备ID
+  })
+}
+
+// 点击选择
+const handleSelect = (index: number, row: IdeviceList) => {
+  dialogSelectDiviceVisible.value = true // 选择设备对话框显隐
+  isMulti.value = false // 是否单选, false单选、true表格多选
+  selectIndex.value = index
+}
+
+// 点击批量添加
+const multiAdd = () => {
+  dialogSelectDiviceVisible.value = true
+  isMulti.value = true
+}
+
+// 选择设备对话框关闭
+const closeDialog = () => {
+  dialogSelectDiviceVisible.value = false
+}
+
+// 选择好设备了, 添加选好的设备到表格中
+const updateDeviceConfirm = (val: Array<IdeviceList>) => {
+  if (isMulti.value) { // 批量增加时push
+    val.forEach((item: IdeviceList) => {
+    // 只添加列表里不存在的
+      const index = list.value.findIndex((i: IdeviceList) => item.equipmentNo === i.equipmentNo)
+      if (index === -1) {
+        list.value.push(item)
+      }
+    })
+  }
+  else { // 单选替换
+    const index = list.value.findIndex((i: IdeviceList) => val[0].equipmentNo === i.equipmentNo)
+    if (index !== -1) {
+      ElMessage.warning('此设备已添加过')
+      return
+    }
+    list.value.splice(selectIndex.value, 1, val[0])
+  }
+}
+
+// 保存
+const save = () => {
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      // 保存之前清除空行、避免传给后端无用空对象
+      const index = list.value.findIndex((item: IdeviceList) => !item.equipmentNo)
+      if (index !== -1) {
+        list.value.splice(index, 1)
+      }
+      const params = {
+        applyName: form.value.applyName, // 申请名称
+        applyUnit: form.value.applyUnit, // 申请单位
+        applyPerson: form.value.applyPerson, // 申请人
+        time: form.value.time, // 领用时间
+        applyDesc: form.value.applyDesc, // 申请说明
+        applyType: '1', // 申请类型 领用1
+        id: form.value.id,
+        equipmentList: list.value.map((item) => {
+          return {
+            equipmentId: item.id!,
+          }
+        }),
+      }
+      // 新建
+      if (typeValue.value === 'add') {
+        saveAddReceiveApplyList(params).then((res) => {
+          form.value.id = res.data
+          ElMessage.success('保存成功')
+          loading.close()
+        })
+      }
+      // 保存
+      else if (typeValue.value === 'edit') {
+        saveEditReceiveApplyList(params).then((res) => {
+          form.value.id = res.data
+          ElMessage.success('保存成功')
+          loading.close()
+        })
+      }
+    }
+    else {
+      console.log('表单校验不通过')
+    }
+  })
+}
+
+// 提交表单
+const submit = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (form.value.id) {
+    const params = {
+      id: form.value.id,
+      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL, // 表单id
+    }
+    submitReceiveApplyList(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    })
+  }
+  else {
+    ElMessage.info('请先保存再提交！')
+  }
+}
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 获取使用部门
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res: any) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+// 审批结束回调
+const approvalSuccess = () => {
+  close()
+}
+
+// 编辑、详情--获取详细信息
+const fetchReceiveApplyListDetail = () => {
+  getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
+    form.value.applyUnit = res.data.applyUnit // 部门
+    form.value.applyName = res.data.applyName // 申请名称
+    form.value.applyPerson = res.data.applyPerson// 申请人
+    form.value.time = res.data.time // 领用时间
+    form.value.applyDesc = res.data.applyDesc // 申请说明
+    list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
+      return {
+        ...item,
+        validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+      }
+    })
+  })
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+onMounted(() => {
+  typeValue.value = $route.query.typeValue // 类型add、edit、detail
+  form.value.id = $route.query.id as string // id
+  form.value.taskId = $route.query.taskId as string // 任务id
+  form.value.processId = $route.query.processId as string // 任务id
+  approvalStatus.value = $route.query.approvalStatus // 审批类型
+  // 编辑、详情获取详情页信息
+  if (typeValue.value === 'edit' || typeValue.value === 'detail') {
+    fetchReceiveApplyListDetail() // 获取详细信息
+  }
+
+  // 获取部门信息
+  fetchDeptTreeList()
+  // 获取人员列表--申请人使用
+  fetchUserList()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`设备领用申请-${textMap[typeValue]}`">
+      <template #btns>
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('agree')">
+          同意
+        </el-button>
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('reject')">
+          驳回
+        </el-button>
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('refuse')">
+          拒绝
+        </el-button>
+        <el-button v-if="typeValue === 'add'" type="primary" @click="submit">
+          提交
+        </el-button>
+        <el-button v-if="typeValue === 'add' || typeValue === 'edit'" type="primary" @click="save">
+          保存
+        </el-button>
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '3'" type="primary" @click="handleClick('revoke')">
+          撤回
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div class="create-check">
+      <div class="top-info">
+        <!-- 表单 -->
+        <div class="form-area">
+          <el-form
+            ref="ruleFormRef"
+            :model="form"
+            label-width="120px"
+            :rules="rules"
+          >
+            <el-row :gutter="24">
+              <el-col :span="6">
+                <el-form-item label="申请名称" prop="applyName">
+                  <el-input
+                    v-model="form.applyName"
+                    :placeholder="typeValue === 'detail' ? '' : '请输入申请名称'"
+                    clearable
+                    :disabled="typeValue === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="申请单位" prop="applyUnit">
+                  <dept-select
+                    v-model="form.applyUnit"
+                    placeholder="请选择申请单位"
+                    :data="useDeptList"
+                    :disabled="typeValue === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="申请人" prop="applyPerson">
+                  <el-select
+                    v-model="form.applyPerson"
+                    :disabled="typeValue === 'detail'"
+                    placeholder="请选择申请人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="领用时间" prop="time">
+                  <el-date-picker
+                    v-model="form.time"
+                    type="datetime"
+                    placeholder="请选择领用时间"
+                    format="YYYY-MM-DD hh:mm"
+                    value-format="YYYY-MM-DD hh:mm"
+                    :disabled="typeValue === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="申请说明" prop="applyDesc">
+                  <el-input v-model="form.applyDesc" type="textarea" autosize clearable :disabled="typeValue === 'detail'" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </div>
+      </div>
+      <!-- 表格 -->
+      <detail-block title="设备领用列表">
+        <template #btns>
+          <el-button v-if="typeValue !== 'detail'" type="primary" @click="multiAdd">
+            批量添加
+          </el-button>
+          <el-button v-if="typeValue !== 'detail'" type="primary" @click="addRow">
+            增加行
+          </el-button>
+          <el-button v-if="typeValue !== 'detail'" type="info" @click="delRow">
+            删除行
+          </el-button>
+        </template>
+        <el-table
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column v-if="typeValue !== 'detail'" type="selection" width="38" />
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          >
+            <template v-if="item.value === 'equipmentNo' && (typeValue === 'add' || typeValue === 'edit')" #default="scope">
+              <el-input v-model="scope.row.equipmentNo" placeholder="请选择设备" class="input">
+                <template #append>
+                  <el-button size="small" @click="handleSelect(scope.$index, scope.row)">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+
+      <detail-block v-if="typeValue === 'detail'" title="审批流程">
+        <approval-record :process-id="form.processId" />
+      </detail-block>
+    </div>
+    <select-device-dialog
+      :dialog-select-divice-visible="dialogSelectDiviceVisible"
+      :is-multi="isMulti"
+      @closeDialog="closeDialog"
+      @updateDeviceConfirm="updateDeviceConfirm"
+    />
+
+    <!-- 同意、驳回、拒绝对话框显示 -->
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.create-check {
+  margin-top: 10px;
+
+  .top-info {
+    display: flex;
+    flex-direction: column;
+    width: 100%;
+    padding-right: 10px;
+    border-radius: 10px;
+    background-color: #fff;
+    // padding: 10px;
+
+    .title-button {
+      display: flex;
+      align-items: center;
+
+      &::before {
+        content: "";
+        flex: 1;
+      }
+
+      .button-group {
+        flex: 1;
+        display: flex;
+        justify-content: flex-end;
+      }
+    }
+
+    .form-area {
+      margin-top: 40px;
+    }
+  }
+}
+</style>
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
new file mode 100644
index 0000000..abf559c
--- /dev/null
+++ b/src/views/device/receive/apply/applyList.vue
@@ -0,0 +1,542 @@
+<script lang="ts" setup name="ApplyList">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+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 ButtonBox from '@/components/buttonBox/buttonBox.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { exportFile } from '@/utils/exportUtils'
+import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import {
+  delReceiveApplyList,
+  exportReceiveApplyList,
+  getReceiveApplyList,
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import { submitApproval } from '@/api/approval'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import type { userType } from '@/views/system/user/user-interface'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { getUserList } from '@/api/system/user'
+
+const loadingTable = ref(false) // 表格loading
+const active = ref('') // 选中的按钮
+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 listQuery: Ref<IlistQuery> = ref({
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  approvalStatus: active.value, // 	审批状态
+  processResult: '', // 	处置结果
+  applyType: '1', // 申请类型 领用1
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+  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 columns = ref<TableColumn[]>([
+  { text: '申请编号', value: 'applyNo', align: 'center' },
+  { text: '申请名称', value: 'applyName', align: 'center' },
+  { text: '申请部门', value: 'applyUnitName', align: 'center' },
+  { text: '申请人', value: 'applyPersonName', align: 'center' },
+  { text: '领用时间', value: 'time', align: 'center' },
+  { text: '申请说明', value: 'applyDesc', align: 'center' },
+  { text: '审批状态', value: 'approvalStatus', align: 'center' },
+])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 筛选时间段数据
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.startTime = timeRange.value[0] as string || ''
+  listQuery.value.endTime = timeRange.value[1] as string || ''
+  listQuery.value.approvalStatus = active.value
+  getReceiveApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IlistType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap[item.approvalStatus],
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: active.value, // 	审批状态
+    processResult: '', // 	处置结果
+    applyType: '1', // 申请类型 领用1
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', '']
+  fetchData(true)
+}
+
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+const $router = useRouter()
+
+// 新建
+const add = () => {
+  $router.push({ path: '/receive/add', query: { typeValue: 'add' } })
+}
+
+// 导出
+const exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    const params = {
+      applyNo: listQuery.value.applyNo, // 申请编号
+      applyName: listQuery.value.applyName, // 申请名称
+      applyUnit: listQuery.value.applyUnit, // 申请部门
+      applyPerson: listQuery.value.applyPerson, // 申请人
+      startTime: listQuery.value.startTime, // 申请开始日期
+      endTime: listQuery.value.endTime, // 申请结束日期
+      approvalStatus: listQuery.value.approvalStatus, // 	审批状态
+      processResult: listQuery.value.processResult, // 	处置结果
+      applyType: listQuery.value.applyType, // 申请类型 领用0
+      createUser: listQuery.value.createUser, // 创建人
+      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+      offset: 1,
+      limit: 20,
+      ids: checkoutList.value,
+    }
+    // 调导出接口
+    exportReceiveApplyList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备领用申请列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备领用申请列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: IlistType) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备领用申请列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 操作
+const handleEdit = (row: IlistType, val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      taskId: row.taskId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        submitApproval('revoke', params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+        })
+        fetchData(true)
+      })
+  }
+  else if (val === '删除') {
+    ElMessageBox.confirm(
+      '确认删除该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        delReceiveApplyList({ id: row.id, taskId: row.taskId }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '提交') {
+    ElMessageBox.confirm(
+      '确认提交该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        submitReceiveApplyList({ id: row.id, formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已提交',
+          })
+        })
+        fetchData(true)
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', row.taskId)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', row.taskId)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', row.taskId)
+  }
+  else if (val === '查看' || val === '编辑') {
+    $router.push({
+      path: `/receive/${title}`,
+      query: {
+        typeValue: title,
+        approvalStatus: approvalStatusReserveMap[row.approvalStatus],
+        id: row.id,
+        taskId: row.taskId,
+        processId: row.processId, // 查询审批记录使用
+      },
+    })
+  }
+}
+// 按钮切换
+const changeCurrentButton = (val: string) => {
+  active.value = val
+  window.sessionStorage.setItem('buttonBoxActive', val)
+  clearList()
+}
+
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 获取用户列表(增加模糊查询)
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 获取使用部门
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res: any) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+onMounted(() => {
+  if (window.sessionStorage.getItem('buttonBoxActive')) {
+    active.value = window.sessionStorage.getItem('buttonBoxActive')!
+  }
+  else {
+    active.value = '0' // 全部
+  }
+  nextTick(() => {
+    fetchData(true) // 获取表格数据
+    // 获取使用部门
+    fetchDeptTreeList() // 获取使用部门
+    fetchUserList() // 获取人员列表
+  })
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyNo"
+          placeholder="申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyName"
+          placeholder="申请名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.applyPerson"
+          placeholder="请选择申请人"
+          style="width: 100%;"
+          filterable
+          remote
+          remote-show-suffix
+          :remote-method="remoteMethod"
+          :loading="applyPersonLoading"
+        >
+          <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY-MM-DD hh:mm"
+          value-format="YYYY-MM-DD hh:mm"
+          start-placeholder="领用开始时间"
+          end-placeholder="领用结束时间"
+        />
+      </search-item>
+    </search-area>
+
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @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="220" fixed="right">
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="handleEdit(row, '查看', 'detail')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (active === '0' || active === '2')"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (active === '0' || active === '2')"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (active === '0' || active === '2')"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '编辑', 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (active === '0' || active === '3')"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (active !== '4' && active !== '5')"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatus === '未通过' || row.approvalStatus === '已通过'"
+                @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+    <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
+
diff --git a/src/views/device/receive/applyList.vue b/src/views/device/receive/applyList.vue
deleted file mode 100644
index 63e1ee8..0000000
--- a/src/views/device/receive/applyList.vue
+++ /dev/null
@@ -1,523 +0,0 @@
-<script lang="ts" setup name="ApplyList">
-import { ref } from 'vue'
-import type { Ref } from 'vue'
-import type { DateModelType } from 'element-plus'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { useRouter } from 'vue-router'
-import type { IlistQuery, IlistType } from '@/views/device/receive/receive'
-import ButtonBox from '@/views/device/receive/buttonBox.vue'
-import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-import { exportFile } from '@/utils/exportUtils'
-import { printJSON } from '@/utils/printUtils'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
-import {
-  delReceiveApplyList,
-  exportReceiveApplyList,
-  getReceiveApplyList,
-  submitReceiveApplyList,
-} from '@/api/device/receive'
-import { submitApproval } from '@/api/approval'
-import { getDeptTreeList } from '@/api/system/dept'
-import { toTreeList } from '@/utils/structure'
-import type { userType } from '@/views/system/user/user-interface'
-import type { deptType } from '@/views/device/standingBook/standingBook-interface'
-import { getUserList } from '@/api/system/user'
-
-const loadingTable = ref(false) // 表格loading
-const active = ref('0') // 选中的按钮
-const approvalDialog = ref() // 审批对话框显隐
-const useDeptList = ref<deptType[]>([]) // 部门列表
-const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
-const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
-const applyPersonLoading = ref(false) // 申请人模糊搜索框loading
-
-// 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  applyNo: '', // 申请编号
-  applyName: '', // 申请名称
-  applyUnit: '', // 申请部门id
-  applyUnitName: '', // 申请部门名称
-  applyPerson: '', // 申请人id
-  applyPersonName: '', // 申请人姓名
-  startTime: '', // 领用开始日期
-  endTime: '', // 领用结束日期
-  approvalStatus: '', // 	审批状态
-  processResult: '', // 	处置结果
-  applyType: '1', // 申请类型 领用1
-  createUser: '', // 创建人
-  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
-  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 columns = ref<TableColumn[]>([
-  { text: '申请编号', value: 'applyNo', align: 'center' },
-  { text: '申请名称', value: 'applyName', align: 'center' },
-  { text: '申请部门', value: 'applyUnitName', align: 'center' },
-  { text: '申请人', value: 'applyPersonName', align: 'center' },
-  { text: '领用时间', value: 'time', align: 'center' },
-  { text: '申请说明', value: 'applyDesc', align: 'center' },
-  { text: '审批状态', value: 'approvalStatus', align: 'center' },
-])
-// 选中的内容
-const checkoutList = ref<string[]>([])
-// 筛选时间段数据
-const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-
-// 数据查询
-function fetchData(isNowPage = false) {
-  loadingTable.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.value.offset = 1
-  }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
-  listQuery.value.approvalStatus = active.value
-  getReceiveApplyList(listQuery.value).then((response) => {
-    list.value = response.data.rows.map((item: IlistType) => {
-      return {
-        ...item,
-        approvalStatus: approvalStatusMap[item.approvalStatus],
-      }
-    })
-    total.value = parseInt(response.data.total)
-    loadingTable.value = false
-  })
-}
-
-// 重置
-const clearList = () => {
-  listQuery.value = {
-    applyNo: '', // 申请编号
-    applyName: '', // 申请名称
-    applyUnit: '', // 申请部门
-    applyPerson: '', // 申请人
-    startTime: '', // 申请开始日期
-    endTime: '', // 申请结束日期
-    approvalStatus: '', // 	审批状态
-    processResult: '', // 	处置结果
-    applyType: '1', // 申请类型 领用1
-    createUser: '', // 创建人
-    formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
-    offset: 1,
-    limit: 20,
-  }
-  timeRange.value = ['', '']
-  fetchData(true)
-}
-
-// 搜索
-const searchList = () => {
-  fetchData(true)
-}
-
-// 多选发生改变时
-const handleSelectionChange = (e: any) => {
-  checkoutList.value = e.map((item: { id: string }) => item.id)
-}
-const $router = useRouter()
-
-// 新建
-const add = () => {
-  $router.push({ path: '/receive/add', query: { typeValue: 'add' } })
-}
-
-// 导出
-const exportAll = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: '下载中请稍后',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (list.value.length > 0) {
-    const params = {
-      applyNo: listQuery.value.applyNo, // 申请编号
-      applyName: listQuery.value.applyName, // 申请名称
-      applyUnit: listQuery.value.applyUnit, // 申请部门
-      applyPerson: listQuery.value.applyPerson, // 申请人
-      startTime: listQuery.value.startTime, // 申请开始日期
-      endTime: listQuery.value.endTime, // 申请结束日期
-      approvalStatus: listQuery.value.approvalStatus, // 	审批状态
-      processResult: listQuery.value.processResult, // 	处置结果
-      applyType: listQuery.value.applyType, // 申请类型 领用0
-      createUser: listQuery.value.createUser, // 创建人
-      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
-      offset: 1,
-      limit: 20,
-      ids: checkoutList.value,
-    }
-    // 调导出接口
-    exportReceiveApplyList(params).then((res) => {
-      const blob = new Blob([res.data])
-      exportFile(blob, '设备领用申请列表.xlsx')
-    })
-  }
-  else {
-    ElMessage.warning('无数据可导出数据')
-  }
-  loading.close()
-}
-
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  fetchData(true)
-}
-
-// 打印列表
-function printList() {
-  // 打印列
-  const properties = columns.value.map((item) => {
-    return {
-      field: item.value,
-      displayName: item.text,
-    }
-  })
-  if (checkoutList.value.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '设备领用申请列表')
-  }
-  else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: IlistType) => checkoutList.value.includes(item.id))
-    printJSON(printList, properties, '设备领用申请列表')
-  }
-  else {
-    ElMessage.warning('无可打印内容')
-  }
-}
-
-// 操作
-const handleEdit = (row: IlistType, val: string, title = '') => {
-  if (val === '取消') {
-    const params = {
-      taskId: row.taskId!,
-      comments: '',
-    }
-    ElMessageBox.confirm(
-      '确认取消该审批吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        submitApproval('revoke', params).then((res) => {
-          ElMessage({
-            type: 'success',
-            message: '取消成功',
-          })
-        })
-        fetchData(true)
-      })
-  }
-  else if (val === '删除') {
-    ElMessageBox.confirm(
-      '确认删除该审批吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        delReceiveApplyList({ id: row.id, taskId: row.taskId }).then((res) => {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          fetchData(true)
-        })
-      })
-  }
-  else if (val === '提交') {
-    ElMessageBox.confirm(
-      '确认提交该审批吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        submitReceiveApplyList({ id: row.id, formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL }).then((res) => {
-          ElMessage({
-            type: 'success',
-            message: '已提交',
-          })
-        })
-        fetchData(true)
-      })
-  }
-  else if (val === '同意') {
-    approvalDialog.value.initDialog('agree', row.taskId)
-  }
-  else if (val === '驳回') {
-    approvalDialog.value.initDialog('reject', row.taskId)
-  }
-  else if (val === '拒绝') {
-    approvalDialog.value.initDialog('refuse', row.taskId)
-  }
-  else if (val === '查看' || val === '编辑') {
-    $router.push({
-      path: `/receive/${title}`,
-      query: {
-        typeValue: title,
-        approvalStatus: approvalStatusReserveMap[row.approvalStatus],
-        id: row.id,
-        taskId: row.taskId,
-        processId: row.processId, // 查询审批记录使用
-      },
-    })
-  }
-}
-// 按钮切换
-const changeCurrentButton = (val: string) => {
-  active.value = val
-  clearList()
-}
-
-// 审批结束回调
-const approvalSuccess = () => {
-  fetchData(true)
-}
-
-// 选择器模糊查询
-const remoteMethod = (query: string) => {
-  if (query) {
-    applyPersonLoading.value = true
-    setTimeout(() => {
-      applyPersonLoading.value = false
-      usePersonOptions.value = usePersonList.value.filter((item) => {
-        return item.name.toLowerCase().includes(query.toLowerCase())
-      })
-    }, 200)
-  }
-  else {
-    usePersonOptions.value = usePersonList.value
-  }
-}
-
-// 获取用户列表(增加模糊查询)
-const fetchUserList = () => {
-  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
-    usePersonList.value = res.data.rows
-    usePersonOptions.value = res.data.rows
-  })
-}
-
-// 获取使用部门
-const fetchDeptTreeList = () => {
-  getDeptTreeList().then((res: any) => {
-    if (res.data) { // 将列表转树结构
-      useDeptList.value = toTreeList(res.data, '0', true)
-    }
-  })
-}
-
-onMounted(() => {
-  fetchData(true)
-  // 获取使用部门
-  fetchDeptTreeList()
-  fetchUserList()
-})
-</script>
-
-<template>
-  <app-container>
-    <search-area
-      :need-clear="true"
-      @search="searchList" @clear="clearList"
-    >
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.applyNo"
-          placeholder="申请编号"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.applyName"
-          placeholder="申请名称"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
-      </search-item>
-      <search-item>
-        <el-select
-          v-model="listQuery.applyPerson"
-          placeholder="请选择申请人"
-          style="width: 100%;"
-          filterable
-          remote
-          remote-show-suffix
-          :remote-method="remoteMethod"
-          :loading="applyPersonLoading"
-        >
-          <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="timeRange"
-          type="daterange"
-          range-separator="到"
-          format="YYYY-MM-DD"
-          value-format="YYYY-MM-DD"
-          start-placeholder="领用开始日期"
-          end-placeholder="领用结束日期"
-        />
-      </search-item>
-    </search-area>
-
-    <table-container>
-      <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
-      </template>
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @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="220" fixed="right">
-            <template #default="{ row }">
-              <el-button
-                size="small"
-                type="primary"
-                link
-                @click="handleEdit(row, '查看', 'detail')"
-              >
-                查看
-              </el-button>
-              <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (active === '0' || active === '2')"
-                size="small"
-                link
-                type="primary"
-                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
-                @click="handleEdit(row, '同意')"
-              >
-                同意
-              </el-button>
-              <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (active === '0' || active === '2')"
-                size="small"
-                link
-                type="primary"
-                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
-                @click="handleEdit(row, '驳回')"
-              >
-                驳回
-              </el-button>
-              <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (active === '0' || active === '2')"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
-                @click="handleEdit(row, '拒绝')"
-              >
-                拒绝
-              </el-button>
-              <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
-                size="small"
-                link
-                type="primary"
-                @click="handleEdit(row, '编辑', 'edit')"
-              >
-                编辑
-              </el-button>
-              <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
-                size="small"
-                link
-                type="primary"
-                @click="handleEdit(row, '提交')"
-              >
-                提交
-              </el-button>
-              <!-- 是发起者且审批中可以取消 -->
-              <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (active === '0' || active === '3')"
-                size="small"
-                link
-                type="info"
-                :disabled="row.approvalStatus !== '审批中'"
-                @click="handleEdit(row, '取消')"
-              >
-                取消
-              </el-button>
-              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-              <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (active !== '4' && active !== '5')"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatus === '未通过' || row.approvalStatus === '已通过'"
-                @click="handleEdit(row, '删除')"
-              >
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <button-box :active="active" @changeCurrentButton="changeCurrentButton" />
-    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-  </app-container>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-</style>
-
diff --git a/src/views/device/receive/buttonBox.vue b/src/views/device/receive/buttonBox.vue
deleted file mode 100644
index 4205fa8..0000000
--- a/src/views/device/receive/buttonBox.vue
+++ /dev/null
@@ -1,46 +0,0 @@
-<script lang="ts" setup name="ButtonBox">
-import { ref } from 'vue'
-const emits = defineEmits(['changeCurrentButton'])
-const menu = [
-  { name: '全部', id: '0' },
-  { name: '草稿箱', id: '1' },
-  { name: '待审批', id: '2' },
-  { name: '审批中', id: '3' },
-  { name: '已通过', id: '4' },
-  { name: '未通过', id: '5' },
-  { name: '已取消', id: '6' },
-]
-const current = ref('0')
-watch(current, (newValue) => {
-  emits('changeCurrentButton', newValue)
-})
-</script>
-
-<template>
-  <div class="container">
-    <div class="btns">
-      <!-- 三级菜单 -->
-      <el-radio-group v-model="current">
-        <el-radio-button v-for="item in menu" :key="item.id" :label="item.id">
-          {{ item.name }}
-        </el-radio-button>
-      </el-radio-group>
-    </div>
-    <!-- 展示区域 -->
-    <!-- <component :is="currentComp" /> -->
-  </div>
-</template>
-
-<style lang="scss" scoped>
-.container {
-  position: relative;
-
-  .btns {
-    position: fixed;
-    top: 69px;
-    right: 15px;
-    z-index: 999;
-  }
-}
-</style>
-
diff --git a/src/views/device/receive/createOrCheck.vue b/src/views/device/receive/createOrCheck.vue
deleted file mode 100644
index 9cbc3bc..0000000
--- a/src/views/device/receive/createOrCheck.vue
+++ /dev/null
@@ -1,552 +0,0 @@
-<script lang="ts" setup name="CreateOrCheck">
-import { onMounted, reactive, ref } from 'vue'
-import type { Ref } from 'vue'
-import dayjs from 'dayjs'
-import type { FormInstance, FormRules } from 'element-plus'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { useRoute, useRouter } from 'vue-router'
-import type { IdeviceList, IdeviceListQuery } from './receive'
-import SelectDeviceDialog from './selectDeviceDialog.vue'
-import { toTreeList } from '@/utils/structure'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
-import {
-  getReceiveApplyListDetail,
-  saveAddReceiveApplyList,
-  saveEditReceiveApplyList,
-  submitReceiveApplyList,
-} from '@/api/device/receive'
-import type { userType } from '@/views/system/user/user-interface'
-import type { deptType } from '@/views/device/standingBook/standingBook-interface'
-import { getDeptTreeList } from '@/api/system/dept'
-import { getUserList } from '@/api/system/user'
-import { submitApproval } from '@/api/approval'
-import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
-
-const $route = useRoute()
-const approvalDialog = ref() // 审批对话框显隐
-const typeValue = ref() // add、edit、detail
-const approvalStatus = ref() // 审批类型
-const useDeptList = ref<deptType[]>([]) // 部门列表
-const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
-const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
-const applyPersonLoading = ref(false)
-const isMulti = ref(false) // 是否批量添加(允许多选)
-const selectIndex = ref() // 点击选择的index--点击第几行
-const dialogSelectDiviceVisible = ref(false) // 控制选择设备对话框显隐
-const textMap: { [key: string]: string } = {
-  edit: '编辑',
-  add: '新建',
-  detail: '详情',
-}// 字典
-// 选中的内容
-const checkoutList = ref([])
-// 表单数据
-const form = ref({
-  taskId: '', // 任务id（审批用）
-  id: '',
-  processId: '', // 流程id--查询审批记录使用
-  applyName: '', // 申请名称
-  applyUnit: '', // 申请单位
-  applyPerson: '', // 申请人
-  time: '', // 领用时间
-  applyDesc: '', // 申请说明
-})
-const ruleFormRef = ref<FormInstance>() as any
-const list = ref<IdeviceList[]>([])// 表格数据
-
-// 查询条件
-const listQuery: Ref<IdeviceListQuery> = ref({
-  equipmentName: '', // 仪器名称
-  equipmentNo: '', // 设备编号
-  modelNo: '', // 型号
-  mesureRange: '', // 测量范围
-  useDeptName: '', // 使用部门
-  usePersonName: '', // 使用人
-  managerStateName: '', // 管理状态
-  validDate: '', // 有效日期
-  offset: 1,
-  limit: 20,
-})
-// 表头
-const columns = ref<TableColumn[]>([
-  { text: '设备编号', value: 'equipmentNo', align: 'center', width: '230' },
-  { text: '设备名称', value: 'equipmentName', align: 'center' },
-  { text: '型号', value: 'modelNo', align: 'center' },
-  { text: '测量范围', value: 'mesureRange', align: 'center' },
-  { text: '使用部门', value: 'useDeptName', align: 'center' },
-  { text: '使用人', value: 'usePersonName', align: 'center' },
-  { text: '管理状态', value: 'managerStateName', align: 'center' },
-  { text: '有效日期', value: 'validDate', align: 'center' },
-])
-// 表单校验规则
-const rules = reactive<FormRules>({
-  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
-  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'change' }],
-  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
-  time: [{ type: 'date', required: true, message: '领用时间不能为空', trigger: 'change' }],
-  applyDesc: [{ required: true, message: '申请说明不能为空', trigger: 'blur' }],
-})
-
-const $router = useRouter()
-// 点击关闭
-const close = () => {
-  $router.back()
-}
-
-const handleClick = (val: string) => {
-  if (val === 'agree') { // 同意
-    approvalDialog.value.initDialog('agree', form.value.taskId)
-  }
-  else if (val === 'reject') { // 驳回
-    approvalDialog.value.initDialog('reject', form.value.taskId)
-  }
-  else if (val === 'refuse') { // 拒绝
-    approvalDialog.value.initDialog('refuse', form.value.taskId)
-  }
-  else if (val === 'revoke') {
-    const params = {
-      taskId: form.value.taskId!,
-      comments: '',
-    }
-    ElMessageBox.confirm(
-      '确认撤回该审批吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        submitApproval('revoke', params).then((res) => {
-          ElMessage({
-            type: 'success',
-            message: '已撤回',
-          })
-        })
-        close()
-      })
-  }
-}
-
-// 多选发生改变时
-const handleSelectionChange = (e: any) => {
-  checkoutList.value = e
-}
-
-// 删除行
-const delRow = () => {
-  if (checkoutList.value.length <= 0) {
-    ElMessage({
-      message: '请选中要删除的行',
-      type: 'warning',
-    })
-  }
-  else {
-    checkoutList.value.forEach((item: IdeviceListQuery) => {
-      list.value.forEach((element, index) => {
-        if (element.equipmentNo === item.equipmentNo) {
-          list.value.splice(index, 1)
-        }
-      })
-    })
-  }
-}
-
-// 增加行
-const addRow = () => {
-  const index = list.value.findIndex(item => !item.equipmentNo)
-  if (index !== -1) {
-    ElMessage.warning('请完善上一条设备信息')
-    return
-  }
-  list.value.push({
-    equipmentName: '', // 设备名称
-    equipmentNo: '', // 设备编号
-    modelNo: '', // 型号
-    mesureRange: '', // 测量范围
-    useDeptName: '', // 使用部门
-    usePersonName: '', // 使用人
-    managerStateName: '', // 管理状态
-    validDate: '', // 有效日期
-    equipmentId: '', // 设备ID
-  })
-}
-
-// 点击选择
-const handleSelect = (index: number, row: IdeviceList) => {
-  dialogSelectDiviceVisible.value = true // 选择设备对话框显隐
-  isMulti.value = false // 是否单选, false单选、true表格多选
-  selectIndex.value = index
-}
-
-// 点击批量添加
-const multiAdd = () => {
-  dialogSelectDiviceVisible.value = true
-  isMulti.value = true
-}
-
-// 选择设备对话框关闭
-const closeDialog = () => {
-  dialogSelectDiviceVisible.value = false
-}
-
-// 选择好设备了, 添加选好的设备到表格中
-const updateDeviceConfirm = (val: Array<IdeviceList>) => {
-  if (isMulti.value) { // 批量增加时push
-    val.forEach((item: IdeviceList) => {
-    // 只添加列表里不存在的
-      const index = list.value.findIndex((i: IdeviceList) => item.equipmentNo === i.equipmentNo)
-      if (index === -1) {
-        list.value.push(item)
-      }
-    })
-  }
-  else { // 单选替换
-    const index = list.value.findIndex((i: IdeviceList) => val[0].equipmentNo === i.equipmentNo)
-    if (index !== -1) {
-      ElMessage.warning('此设备已添加过')
-      return
-    }
-    list.value.splice(selectIndex.value, 1, val[0])
-  }
-}
-
-// 保存
-const save = () => {
-  ruleFormRef.value.validate((valid: boolean) => {
-    if (valid) {
-      const loading = ElLoading.service({
-        lock: true,
-        background: 'rgba(255, 255, 255, 0.8)',
-      })
-      // 保存之前清除空行、避免传给后端无用空对象
-      const index = list.value.findIndex((item: IdeviceList) => !item.equipmentNo)
-      if (index !== -1) {
-        list.value.splice(index, 1)
-      }
-      const params = {
-        applyName: form.value.applyName, // 申请名称
-        applyUnit: form.value.applyUnit, // 申请单位
-        applyPerson: form.value.applyPerson, // 申请人
-        time: form.value.time, // 领用时间
-        applyDesc: form.value.applyDesc, // 申请说明
-        applyType: '1', // 申请类型 领用1
-        id: form.value.id,
-        equipmentList: list.value.map((item) => {
-          return {
-            equipmentId: item.id!,
-          }
-        }),
-      }
-      // 新建
-      if (typeValue.value === 'add') {
-        saveAddReceiveApplyList(params).then((res) => {
-          form.value.id = res.data
-          ElMessage.success('保存成功')
-          loading.close()
-        })
-      }
-      // 保存
-      else if (typeValue.value === 'edit') {
-        saveEditReceiveApplyList(params).then((res) => {
-          form.value.id = res.data
-          ElMessage.success('保存成功')
-          loading.close()
-        })
-      }
-    }
-    else {
-      console.log('表单校验不通过')
-    }
-  })
-}
-
-// 提交表单
-const submit = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (form.value.id) {
-    const params = {
-      id: form.value.id,
-      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL, // 表单id
-    }
-    submitReceiveApplyList(params).then(() => {
-      ElMessage.success('提交成功')
-      loading.close()
-      close()
-    })
-  }
-  else {
-    ElMessage.info('请先保存再提交！')
-  }
-}
-
-// 获取用户列表--（是否有不分页接口？）
-const fetchUserList = () => {
-  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
-    usePersonList.value = res.data.rows
-    usePersonOptions.value = res.data.rows
-  })
-}
-
-// 获取使用部门
-const fetchDeptTreeList = () => {
-  getDeptTreeList().then((res: any) => {
-    if (res.data) { // 将列表转树结构
-      useDeptList.value = toTreeList(res.data, '0', true)
-    }
-  })
-}
-
-// 审批结束回调
-const approvalSuccess = () => {
-  close()
-}
-
-// 编辑、详情--获取详细信息
-const fetchReceiveApplyListDetail = () => {
-  getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
-    form.value.applyUnit = res.data.applyUnit // 部门
-    form.value.applyName = res.data.applyName // 申请名称
-    form.value.applyPerson = res.data.applyPerson// 申请人
-    form.value.time = res.data.time // 领用时间
-    form.value.applyDesc = res.data.applyDesc // 申请说明
-    list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
-      return {
-        ...item,
-        validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
-      }
-    })
-  })
-}
-
-// 选择器模糊查询
-const remoteMethod = (query: string) => {
-  if (query) {
-    applyPersonLoading.value = true
-    setTimeout(() => {
-      applyPersonLoading.value = false
-      usePersonOptions.value = usePersonList.value.filter((item) => {
-        return item.name.toLowerCase().includes(query.toLowerCase())
-      })
-    }, 200)
-  }
-  else {
-    usePersonOptions.value = usePersonList.value
-  }
-}
-
-onMounted(() => {
-  typeValue.value = $route.query.typeValue // 类型add、edit、detail
-  form.value.id = $route.query.id as string // id
-  form.value.taskId = $route.query.taskId as string // 任务id
-  form.value.processId = $route.query.processId as string // 任务id
-  approvalStatus.value = $route.query.approvalStatus // 审批类型
-  // 编辑、详情获取详情页信息
-  if (typeValue.value === 'edit' || typeValue.value === 'detail') {
-    fetchReceiveApplyListDetail() // 获取详细信息
-  }
-
-  // 获取部门信息
-  fetchDeptTreeList()
-  // 获取人员列表--申请人使用
-  fetchUserList()
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="`设备领用申请-${textMap[typeValue]}`">
-      <template #btns>
-        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('agree')">
-          同意
-        </el-button>
-        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('reject')">
-          驳回
-        </el-button>
-        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('refuse')">
-          拒绝
-        </el-button>
-        <el-button v-if="typeValue === 'add' || typeValue === 'edit'" type="primary" @click="save">
-          保存
-        </el-button>
-        <el-button v-if="typeValue === 'add'" type="primary" @click="submit">
-          提交
-        </el-button>
-        <el-button v-if="typeValue === 'edit' && approvalStatus === '3'" type="primary" @click="handleClick('revoke')">
-          撤回
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-    <div class="create-check">
-      <div class="top-info">
-        <!-- 表单 -->
-        <div class="form-area">
-          <el-form
-            ref="ruleFormRef"
-            :model="form"
-            label-width="120px"
-            :rules="rules"
-          >
-            <el-row :gutter="24">
-              <el-col :span="6">
-                <el-form-item label="申请名称" prop="applyName">
-                  <el-input
-                    v-model="form.applyName"
-                    :placeholder="typeValue === 'detail' ? '' : '请输入申请名称'"
-                    clearable
-                    :disabled="typeValue === 'detail'"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="申请单位" prop="applyUnit">
-                  <dept-select
-                    v-model="form.applyUnit"
-                    placeholder="请选择申请单位"
-                    :data="useDeptList"
-                    :disabled="typeValue === 'detail'"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="申请人" prop="applyPerson">
-                  <el-select
-                    v-model="form.applyPerson"
-                    :disabled="typeValue === 'detail'"
-                    placeholder="请选择申请人"
-                    style="width: 100%;"
-                    filterable
-                    remote
-                    remote-show-suffix
-                    :remote-method="remoteMethod"
-                    :loading="applyPersonLoading"
-                  >
-                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="领用时间" prop="time">
-                  <el-date-picker
-                    v-model="form.time"
-                    type="datetime"
-                    placeholder="请选择领用时间"
-                    format="YYYY-MM-DD hh:mm"
-                    value-format="YYYY-MM-DD hh:mm"
-                    :disabled="typeValue === 'detail'"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="申请说明" prop="applyDesc">
-                  <el-input v-model="form.applyDesc" type="textarea" autosize clearable :disabled="typeValue === 'detail'" />
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </el-form>
-        </div>
-      </div>
-      <!-- 表格 -->
-      <detail-block title="设备领用列表">
-        <template #btns>
-          <el-button v-if="typeValue !== 'detail'" type="primary" @click="multiAdd">
-            批量添加
-          </el-button>
-          <el-button v-if="typeValue !== 'detail'" type="primary" @click="addRow">
-            增加行
-          </el-button>
-          <el-button v-if="typeValue !== 'detail'" type="info" @click="delRow">
-            删除行
-          </el-button>
-        </template>
-        <el-table
-          :data="list"
-          border
-          style="width: 100%;"
-          max-height="600"
-          @selection-change="handleSelectionChange"
-        >
-          <el-table-column type="selection" width="38" />
-          <el-table-column align="center" label="序号" width="80" type="index" />
-          <el-table-column
-            v-for="item in columns"
-            :key="item.value"
-            :prop="item.value"
-            :label="item.text"
-            :width="item.width"
-            show-overflow-tooltip
-            align="center"
-          >
-            <template v-if="item.value === 'equipmentNo' && (typeValue === 'add' || typeValue === 'edit')" #default="scope">
-              <el-input v-model="scope.row.equipmentNo" placeholder="请选择设备" class="input">
-                <template #append>
-                  <el-button size="small" @click="handleSelect(scope.$index, scope.row)">
-                    选择
-                  </el-button>
-                </template>
-              </el-input>
-            </template>
-          </el-table-column>
-        </el-table>
-      </detail-block>
-
-      <detail-block v-if="typeValue === 'detail'" title="审批流程">
-        <approval-record :process-id="form.processId" />
-      </detail-block>
-    </div>
-    <select-device-dialog
-      :dialog-select-divice-visible="dialogSelectDiviceVisible"
-      :is-multi="isMulti"
-      @closeDialog="closeDialog"
-      @updateDeviceConfirm="updateDeviceConfirm"
-    />
-
-    <!-- 同意、驳回、拒绝对话框显示 -->
-    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-  </app-container>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-.create-check {
-  margin-top: 10px;
-
-  .top-info {
-    display: flex;
-    flex-direction: column;
-    width: 100%;
-    padding-right: 10px;
-    border-radius: 10px;
-    background-color: #fff;
-    // padding: 10px;
-
-    .title-button {
-      display: flex;
-      align-items: center;
-
-      &::before {
-        content: "";
-        flex: 1;
-      }
-
-      .button-group {
-        flex: 1;
-        display: flex;
-        justify-content: flex-end;
-      }
-    }
-
-    .form-area {
-      margin-top: 40px;
-    }
-  }
-}
-</style>
diff --git a/src/views/device/receive/receive.ts b/src/views/device/receive/receive.ts
index 2754aee..056fe60 100644
--- a/src/views/device/receive/receive.ts
+++ b/src/views/device/receive/receive.ts
@@ -82,3 +82,8 @@
   managerStateName: string // 管理状态
   validDate: string // 有效日期
 }
+
+export interface IMenu {
+  name: string // 名字
+  id: string
+}

diff --git a/src/api/customer/overtime.ts b/src/api/customer/overtime.ts
deleted file mode 100644
index 9f349d6..0000000
--- a/src/api/customer/overtime.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * 到期样品接口
- */
-import request from '../index'
-import type { IOvertimeListQuery } from '@/views/customer/sample/overTime/overtime_list_interface'
-const prefix = '/meter'
-
-// 列表查询
-export function getOverTimeList(data: IOvertimeListQuery) {
-  return request({
-    url: `${prefix}/sample/overtime/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 导出列表
-export function exportOverTimeList(data: Omit<IOvertimeListQuery, 'limit' | 'offset'>) {
-  return request({
-    url: `${prefix}/sample/overtime/listExport`,
-    method: 'post',
-    responseType: 'blob',
-    data,
-  })
-}
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index 2610494..21a9c9e 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -59,3 +59,20 @@
   })
 }
 
+// 查询检定记录
+export function getMesureRecords(data: { id: string }) {
+  return request({
+    url: `${prefix}/sample/mesureRecordsBySampleId`,
+    method: 'post',
+    data,
+  })
+}
+
+// 查询检定证书
+export function getCertification(data: { id: string }) {
+  return request({
+    url: `${prefix}/sample/certificationBySampleId`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components.d.ts b/src/components.d.ts
index 227585d..90f2dde 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -21,6 +21,7 @@
     BarCodeBind: typeof import('./components/BarCodeBind/index.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
+    ButtonBox: typeof import('./components/buttonBox/buttonBox.vue')['default']
     CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default']
     CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
diff --git a/src/components/buttonBox/buttonBox.vue b/src/components/buttonBox/buttonBox.vue
new file mode 100644
index 0000000..cf93686
--- /dev/null
+++ b/src/components/buttonBox/buttonBox.vue
@@ -0,0 +1,49 @@
+<!-- 列表页右上角按钮组 -->
+<script lang="ts" setup name="ButtonBox">
+import type { PropType } from 'vue'
+import { ref } from 'vue'
+import type { IMenu } from '../../views/device/receive/receive'
+
+const props = defineProps({
+  active: String,
+  menu: {
+    type: Array as PropType<IMenu[]>,
+  },
+})
+const emits = defineEmits(['changeCurrentButton'])
+
+const current = ref('')
+watch(current, (newValue) => {
+  emits('changeCurrentButton', newValue)
+})
+watch(() => props.active, (newValue) => {
+  current.value = newValue!
+  console.log('pppppp', newValue)
+})
+</script>
+
+<template>
+  <div class="container">
+    <div class="btns">
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.id" :label="item.id">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 69px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 36f5104..fb6758e 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -481,7 +481,7 @@
       {
         path: 'applyList',
         name: 'ApplyList',
-        component: () => import('@/views/device/receive/applyList.vue'),
+        component: () => import('@/views/device/receive/apply/applyList.vue'),
         meta: {
           title: '设备领用申请',
           icon: 'ep:key',
@@ -491,7 +491,7 @@
       {
         path: ':type',
         name: 'ApplyListDetail',
-        component: () => import('@/views/device/receive/createOrCheck.vue'),
+        component: () => import('@/views/device/receive/apply/applyEdit.vue'),
         meta: {
           title: '设备领用申请',
           icon: 'ep:key',
@@ -503,7 +503,7 @@
       {
         path: 'solveList',
         name: 'SolveList',
-        component: () => import('@/views/device/receive/solveList.vue'),
+        component: () => import('@/views/device/receive/solve/solveList.vue'),
         meta: {
           title: '设备领用处理',
           icon: 'ep:key',
@@ -513,7 +513,7 @@
       {
         path: 'solveDetail',
         name: 'SolveListDetail',
-        component: () => import('@/views/device/receive/solveComponent/detail.vue'),
+        component: () => import('@/views/device/receive/solve/solveDetail.vue'),
         meta: {
           title: '设备领用处理',
           icon: 'ep:key',
diff --git a/src/views/customer/bench/bench.vue b/src/views/customer/bench/bench.vue
index 6b502fc..3b8f274 100644
--- a/src/views/customer/bench/bench.vue
+++ b/src/views/customer/bench/bench.vue
@@ -1,15 +1,53 @@
 <script lang="ts" setup name="DeviceBench">
-import { getCurrentInstance, ref } from 'vue'
+import { ref } from 'vue'
 import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
 import type { planReturn } from './bench-interface'
 import Linechart from '@/components/Echart/LineChart.vue'
 import type { lineDataI } from '@/components/Echart/echart-interface'
 import { getCustomerExpireData, getHighQualityCustomerList, getSampleAddData, getSampleExpireData } from '@/api/customer/bench'
+import { getSampleList } from '@/api/customer/sampleList'
+import type { IOvertimeListQuery } from '@/views/customer/sample/overTime/overtime_list_interface'
+import { getAdviceList } from '@/api/customer/advice'
+import type { IAdvice, IAdviceQuery } from '@/views/customer/advice/advice_interface'
 
+const reg = /(\d{4})\年(\d{2})月/ // 把2022年3月转为2022-03
 // 每个展示块高度
 const blockHeight = ref(300)
 const blockWidth = ref(400)
-const { proxy } = getCurrentInstance() as any
+
+// 到期样品查询条件
+const dueSampleListQuery: Ref<IOvertimeListQuery> = ref({
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 型号
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  startTime: '', // 检定开始时间
+  endTime: '', // 检定结束时间
+  overtimeStatus: '1', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+  offset: 1,
+  limit: 20,
+})
+
+// 客户关系查询条件
+const customerRelationsListQuery: Ref<IAdviceQuery> = ref({
+  adviceNo: '', // 投诉编号
+  customerName: '', // 公司名称
+  customerNo: '', // 客户编号
+  startTime: '', // 投诉开始时间
+  endTime: '', // 投诉结束时间
+  offset: 1,
+  limit: 20,
+})
+
+const dueSampleTableLoading = ref(false) // 到期样品表格loading
+const customerRelationsTableLoading = ref(false) // 客户关系loading
+const sampleAddLoading = ref(false) // 样品新增趋势loading
+const customerAddLoading = ref(false) // 客户新增趋势loading
+const sampleExpireLoading = ref(false) // 样品到期趋势loading
+const highQualityCustomerLoading = ref(false) // 优质客户名单loading
+
 // 到期样品表格数据
 const dueSampleTableData = ref()
 // 到期样品表头
@@ -64,54 +102,81 @@
   blockWidth.value = (document.body.clientWidth - 180 - 20 - 20) / 3
   console.log(blockHeight.value, blockWidth.value - 20)
 }
+
 window.addEventListener('resize', () => {
   calcBlockSize()
 })
 
 // 获取样品新增趋势数据
 function fetchSampleAddData() {
+  sampleAddLoading.value = true
   getSampleAddData().then((res) => {
-    sampleAddXData.value = res.data.map((item: planReturn) => {
-      // return item.date.replace('年', '-')
-      return item.date
-    })
+    sampleAddXData.value = res.data.map((item: planReturn) => item.date.replace(reg, '$1-$2'))
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     sampleAddYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
-    sampleAddData.value = [{ name: '客户', data: yValue }]
+    sampleAddData.value = [{ name: '样品', data: yValue }]
+    sampleAddLoading.value = false
   })
 }
 
 // 获取样品到期趋势数据
 function fetchSampleExpireData() {
+  sampleExpireLoading.value = true
   getSampleExpireData().then((res) => {
-    sampleExpireXData.value = res.data.map((item: planReturn) => item.date)
+    sampleExpireXData.value = res.data.map((item: planReturn) => item.date.replace(reg, '$1-$2'))
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     sampleExpireYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
-    sampleExpireData.value = [{ name: '客户', data: yValue }]
+    sampleExpireData.value = [{ name: '样品', data: yValue }]
+    sampleExpireLoading.value = false
   })
 }
 
 // 获取优质客户名单
 function fetchHighQualityCustomerList() {
+  highQualityCustomerLoading.value = true
   getHighQualityCustomerList().then((res) => {
     highQualityCustomerTableData.value = res.data.rows
+    highQualityCustomerLoading.value = false
   })
 }
 // 获取客户新增趋势数据
 function fetchCustomerExpireData() {
+  customerAddLoading.value = true
   getCustomerExpireData().then((res) => {
-    customerAddXData.value = res.data.map((item: planReturn) => item.date)
+    customerAddXData.value = res.data.map((item: planReturn) => item.date.replace(reg, '$1-$2'))
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     customerAddYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
     customerAddData.value = [{ name: '客户', data: yValue }]
+    customerAddLoading.value = false
   })
 }
 
 // 获取到期样品表格数据
+function fetchDueSampleTableData() {
+  dueSampleTableLoading.value = true
+  getSampleList(dueSampleListQuery.value).then((response) => {
+    dueSampleTableData.value = response.data.rows
+    dueSampleTableLoading.value = false
+  })
+}
 // 获取客户关系表格数据
+function fetchcustomerRelationsTableData() {
+  customerRelationsTableLoading.value = true
+  getAdviceList(customerRelationsListQuery.value).then((res) => {
+    customerRelationsTabledata.value = res.data.rows.map((item: IAdvice) => {
+      return {
+        ...item,
+        adviceClass: item.adviceClass === '0' ? '建议' : item.adviceClass === '1' ? '投诉' : '其他',
+      }
+    })
+    customerRelationsTableLoading.value = false
+  })
+}
 
 onMounted(() => {
   calcBlockSize()
+  fetchDueSampleTableData() // 到期样品表格
+  fetchcustomerRelationsTableData() // 客户关系表格
   fetchSampleAddData()// 样品新增趋势
   fetchSampleExpireData()// 样品到期趋势
   fetchCustomerExpireData()// 客户新增趋势
@@ -125,6 +190,7 @@
       <el-row :gutter="10">
         <el-col :span="8">
           <bench-col
+            v-loading="dueSampleTableLoading"
             icon="icon-book"
             title="到期样品"
             path-url="/sample/overtime"
@@ -145,6 +211,7 @@
         </el-col>
         <el-col :span="8">
           <bench-col
+            v-loading="sampleAddLoading"
             icon="icon-line"
             title="样品新增趋势"
             :height="blockHeight"
@@ -159,6 +226,7 @@
         </el-col>
         <el-col :span="8">
           <bench-col
+            v-loading="sampleExpireLoading"
             icon="icon-line"
             title="样品到期趋势"
             :height="blockHeight"
@@ -177,6 +245,7 @@
       <el-row :gutter="10">
         <el-col :span="8">
           <bench-col
+            v-loading="customerRelationsTableLoading"
             icon="icon-book"
             title="客户关系"
             path-url="/customerManage/advice"
@@ -197,6 +266,7 @@
         </el-col>
         <el-col :span="8">
           <bench-col
+            v-loading="customerAddLoading"
             icon="icon-line"
             title="客户新增趋势"
             :height="blockHeight"
@@ -211,6 +281,7 @@
         </el-col>
         <el-col :span="8">
           <bench-col
+            v-loading="highQualityCustomerLoading"
             icon="icon-book"
             title="优质客户名单"
             :style="{ height: blockHeight }"
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index e7d1acb..359c94d 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -8,7 +8,7 @@
 import selectCustomer from './selectCustomer.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import { addSample, getCertification, getMesureRecords, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
@@ -69,6 +69,7 @@
   sampleName: '', // 样品名称
   sampleModel: '', // 样品型号
   manufacturingNo: '', // 出厂编号
+  customerId: '', // 委托方id
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   phone: '', // 委托方电话
@@ -138,12 +139,17 @@
 })
 
 // 获取检定记录
-const fetchMeasureRecords = function (query = null) {
-  dataList.value.measureRecords = []
+const fetchMeasureRecords = (query = null) => {
+  getMesureRecords({ id: infoId.value }).then((res) => {
+    dataList.value.measureRecords = res.data.rows
+  })
 }
+
 // 获取检定证书
-const fetchCertifications = function (query = null) {
-  dataList.value.certificationRecords = []
+const fetchCertifications = (query = null) => {
+  getCertification({ id: infoId.value }).then((res) => {
+    dataList.value.certificationRecords = res.data.rows
+  })
 }
 
 // 菜单
@@ -151,12 +157,12 @@
   {
     name: '检定记录',
     columns: [
-      { text: '委托单编号', value: 'orderCode' },
-      { text: '委托单日期', value: 'orderTime' },
-      { text: '委托方代码', value: 'customerCode' },
-      { text: '委托方名称', value: 'customerName' },
-      { text: '送检人', value: 'deliverer' },
-      { text: '送检日期', value: 'deliverTime' },
+      { text: '委托单编号', value: 'orderCode', align: 'center' },
+      { text: '委托单日期', value: 'orderTime', align: 'center' },
+      { text: '委托方代码', value: 'customerCode', align: 'center' },
+      { text: '委托方名称', value: 'customerName', align: 'center' },
+      { text: '送检人', value: 'deliverer', align: 'center' },
+      { text: '送检日期', value: 'deliverTime', align: 'center' },
     ],
     list: 'measureRecords',
     pagination: true,
@@ -165,11 +171,11 @@
   {
     name: '检定证书',
     columns: [
-      { text: '证书编号', value: 'certificationCode' },
-      { text: '证书名称', value: 'certificationName' },
-      { text: '证书类型', value: 'certificationType' },
-      { text: '证书出具日期', value: 'effectiveDate' },
-      { text: '证书有效期', value: 'expirationDate' },
+      { text: '证书编号', value: 'certificationCode', align: 'center' },
+      { text: '证书名称', value: 'certificationName', align: 'center' },
+      { text: '证书类型', value: 'certificationType', align: 'center' },
+      { text: '证书出具日期', value: 'effectiveDate', align: 'center' },
+      { text: '证书有效期', value: 'expirationDate', align: 'center' },
     ],
     list: 'certificationRecords',
     pagination: true,
@@ -233,18 +239,18 @@
 // 委托方代码获取焦点
 const customerNoFocus = () => {
   visible.value = true
-  console.log(visible.value)
 }
 
 // 选好委托方
 const confirmCheckout = (val: Array<ICustomer>) => {
   if (val && val.length) {
     const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo
-    dataForm.value.customerName = getValue.customerName
-    dataForm.value.phone = getValue.phone
-    dataForm.value.postalCode = getValue.postalCode
-    dataForm.value.customerAddress = getValue.briefName
+    dataForm.value.customerNo = getValue.customerNo // 委托方代码
+    dataForm.value.customerId = getValue.id // 委托方id
+    dataForm.value.customerName = getValue.customerName // 委托方名称
+    dataForm.value.phone = getValue.phone // 电话
+    dataForm.value.postalCode = getValue.postalCode // 邮编
+    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
   }
 }
 
@@ -296,6 +302,7 @@
 const getInfo = () => {
   getSapmleDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data
+    dataForm.value.ABC = res.data.abc
     for (const item of menu) {
       item.searchFunc()
     }
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index a2c4307..c3690d4 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -35,6 +35,7 @@
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center', width: '180px' },
 ])
 // 表格数据
@@ -47,6 +48,7 @@
 const checkoutList = ref<string[]>([])
 // 文件上传input
 const fileRef = ref()
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -62,6 +64,7 @@
     loadingTable.value = false
   })
 }
+
 // 多选发生改变时
 function handleSelectionChange(e: any) {
   checkoutList.value = e.map((item: { id: string }) => item.id)
@@ -71,6 +74,7 @@
 const handleEdit = (row: ISampleList, pageType: 'edit' | 'detail') => {
   $router.push(`/sample/${pageType}/${row.id}`)
 }
+
 // 点击删除
 const handleDelete = (row: ISampleList) => {
   ElMessageBox.confirm(
@@ -94,10 +98,12 @@
       })
     })
 }
+
 // 点击搜索
 const searchList = () => {
   fetchData(true)
 }
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -112,7 +118,7 @@
     offset: 1,
     limit: 20,
   }
-  timeRange.value = ['', '']
+  timeRange.value = ['', ''] // 置空筛选时间
   fetchData(true)
 }
 
@@ -138,10 +144,12 @@
     ElMessage.error('请上传pdf格式')
   }
 }
+
 // 模板下载
 const templateDownload = () => {
 
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -157,10 +165,12 @@
 const uploadAll = () => {
   fileRef.value.click()
 }
+
 // 新建样品
 const add = () => {
   $router.push('/sample/add')
 }
+
 // 导出
 const exportAll = () => {
   const loading = ElLoading.service({
@@ -293,11 +303,13 @@
         <template #columns>
           <el-table-column label="操作" align="center" fixed="right" width="120">
             <template #default="{ row }">
+              <!-- 有orderid(关联了委托书)不允许编辑 -->
               <el-button
                 v-if="proxy.hasPerm('/sample/list/update')"
                 size="small"
                 type="primary"
                 link
+                :disabled="`${row.orderId}` !== ''"
                 @click="handleEdit(row, 'edit')"
               >
                 编辑
@@ -310,11 +322,13 @@
               >
                 详情
               </el-button>
+              <!-- 检测中的样品不允许删除 -->
               <el-button
                 v-if="proxy.hasPerm('/sample/list/delete')"
                 size="small"
                 link
                 type="danger"
+                :disabled="row.sampleSatus !== '3'"
                 @click="handleDelete(row)"
               >
                 删除
diff --git a/src/views/customer/sample/list/sample_list_interface.ts b/src/views/customer/sample/list/sample_list_interface.ts
index 707c8b5..81498a5 100644
--- a/src/views/customer/sample/list/sample_list_interface.ts
+++ b/src/views/customer/sample/list/sample_list_interface.ts
@@ -33,6 +33,7 @@
   sampleModel: string // 样品型号
   manufacturingNo: string // 出厂编号
   customerNo: string // 委托方代码
+  customerId: string // 委托方id
   customerName: string // 委托方名称
   phone: string // 委托方电话
   postalCode: string // 委托方邮编
diff --git a/src/views/customer/sample/list/selectCustomer.vue b/src/views/customer/sample/list/selectCustomer.vue
index 5de352d..0eef7d0 100644
--- a/src/views/customer/sample/list/selectCustomer.vue
+++ b/src/views/customer/sample/list/selectCustomer.vue
@@ -6,7 +6,8 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getCustomerList } from '@/api/customer/customer'
 import { getDictByCode } from '@/api/system/dict'
-const props = defineProps({
+
+defineProps({
   visible: {
     type: Boolean,
     default: false,
@@ -14,18 +15,9 @@
 })
 const emits = defineEmits(['changeVisible', 'confirmCheckout'])
 
-const visibleDialog = computed({
-  get() {
-    return props.visible
-  },
-  set(val) {
-    emits('changeVisible', val)
-  },
-})
-
 // 查询条件
 const listQuery: Ref<ICustomerQuery> = ref({
-  bussinessSize: '', // 业务规模
+  businessSize: '', // 业务规模
   customerName: '', // 公司名称
   customerNo: '', // 客户编号
   grade: '', // 履约评级
@@ -37,40 +29,20 @@
   name: string
   value: string
 }
-// const companySizeList = ref<dictType[]>([]) // 公司规模列表
+
 const businessSizeList = ref<dictType[]>([]) // 业务规模列表
 const gradeList = ref<dictType[]>([]) // 履约评级列表
-// const evaluationList = ref<dictType[]>([]) // 整体评价列表
-function getDict() {
-  // // 获取公司规模
-  // getDictByCode('companySize').then((response) => {
-  //   companySizeList.value = response.data
-  // })
-  // 获取业务规模
-  getDictByCode('businessSize').then((response) => {
-    businessSizeList.value = response.data
-  })
-  // 获取履约评级
-  getDictByCode('grade').then((response) => {
-    gradeList.value = response.data
-  })
-  // // 获取整体评价
-  // getDictByCode('evaluation').then((response) => {
-  //   evaluationList.value = response.data
-  // })
-}
-getDict()
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '客户编号', value: 'customerNo', width: '160', align: 'center', fixed: true },
-  { text: '客户名称', value: 'customerName', width: '120', align: 'center', fixed: true },
-  { text: '公司规模', value: 'companySizeName', align: 'center', fixed: false },
-  { text: '业务规模', value: 'businessSizeName', align: 'center', fixed: false },
-  { text: '履约评级', value: 'gradeName', align: 'center', fixed: false },
-  { text: '整体评价', value: 'evaluationName', align: 'center', fixed: false },
-  { text: '公司地址', value: 'briefName', align: 'center', fixed: false },
-  { text: '创建时间', value: 'createTime', align: 'center', width: '180px', fixed: false },
-  { text: '备注', value: 'remark', align: 'center', fixed: false },
+  { text: '客户名称', value: 'customerName', align: 'center', fixed: true },
+  { text: '公司规模', value: 'companySizeName', width: '110', align: 'center' },
+  { text: '业务规模', value: 'businessSizeName', width: '130', align: 'center' },
+  { text: '履约评级', value: 'gradeName', width: '90', align: 'center' },
+  { text: '整体评价', value: 'evaluationName', width: '110', align: 'center' },
+  { text: '公司地址', value: 'fullAddress', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
+  { text: '备注', value: 'remark', align: 'center' },
 ])
 // 表格数据
 const list = ref<ICustomer[]>([])
@@ -81,44 +53,42 @@
 // 选中的内容
 const checkoutList = ref<string[]>([])
 
-// 数据查询
+function getDict() {
+  // 获取业务规模
+  getDictByCode('businessSize').then((response) => {
+    businessSizeList.value = response.data
+  })
+  // 获取履约评级
+  getDictByCode('grade').then((response) => {
+    gradeList.value = response.data
+  })
+}
+getDict()
+
+// 表格数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getCustomerList(listQuery.value).then((response) => {
-  //   // 模拟数据
-  //   response.data.rows = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', customerAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  //   list.value = response.data.rows.map((item: ICustomer) => {
-  //     if (item.companyProvinceName && item.companyCityName) {
-  //       item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-  //     }
-  //     else {
-  //       item.briefName = item.companyProvinceName || item.companyCityName
-  //     }
-  //     return item
-  //   })
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-
-  // 模拟数据
-  const response = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', customerAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' },
-    { bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', customerAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '2集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' },
-    { bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', customerAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '3集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  list.value = response.map((item: ICustomer) => {
-    if (item.companyProvinceName && item.companyCityName) {
-      item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-    }
-    else {
-      item.briefName = item.companyProvinceName || item.companyCityName
-    }
-    return item
+  getCustomerList(listQuery.value).then((response) => {
+    // 模拟数据
+    list.value = response.data.rows.map((item: ICustomer) => {
+      if (item.addressProvinceName && item.addressCityName) {
+        item.fullAddress = `${item.addressProvinceName}/${item.addressCityName}`
+      }
+      else if (item.addressProvinceName || item.addressCityName) {
+        item.fullAddress = item.addressProvinceName || item.addressCityName
+      }
+      else if (item.addressCountryName) {
+        item.fullAddress = item.addressCountryName
+      }
+      return item
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
   })
-  total.value = 50
-  loadingTable.value = false
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -131,7 +101,7 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    bussinessSize: '', // 业务规模
+    businessSize: '', // 业务规模
     customerName: '', // 公司名称
     customerNo: '', // 客户编号
     grade: '', // 履约评级
@@ -155,9 +125,9 @@
 const cancle = () => {
   emits('changeVisible', false)
 }
+
 // 点击确定
 const clickConfirm = () => {
-  console.log(checkoutList.value)
   if (!checkoutList.value.length) {
     ElMessage({
       message: '请选中',
diff --git a/src/views/customer/sample/overTime/detail.vue b/src/views/customer/sample/overTime/detail.vue
index f553724..1adcbf8 100644
--- a/src/views/customer/sample/overTime/detail.vue
+++ b/src/views/customer/sample/overTime/detail.vue
@@ -184,6 +184,7 @@
 const getInfo = () => {
   getSapmleDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data
+    dataForm.value.ABC = res.data.abc
     for (const item of menu) {
       item.searchFunc()
     }
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index c8f90a1..05fe276 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -19,8 +19,8 @@
   sampleModel: '', // 型号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
-  startTime: '1', // 检定开始时间
-  endTime: '1', // 检定结束时间
+  startTime: '', // 检定开始时间
+  endTime: '', // 检定结束时间
   overtimeStatus: '1', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
   offset: 1,
   limit: 20,
diff --git a/src/views/device/receive/apply/applyEdit.vue b/src/views/device/receive/apply/applyEdit.vue
new file mode 100644
index 0000000..5194bdb
--- /dev/null
+++ b/src/views/device/receive/apply/applyEdit.vue
@@ -0,0 +1,552 @@
+<script lang="ts" setup name="CreateOrCheck">
+import { onMounted, reactive, ref } from 'vue'
+import type { Ref } from 'vue'
+import dayjs from 'dayjs'
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { useRoute, useRouter } from 'vue-router'
+import type { IdeviceList, IdeviceListQuery } from '../receive'
+import SelectDeviceDialog from '../selectDeviceDialog.vue'
+import { toTreeList } from '@/utils/structure'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import {
+  getReceiveApplyListDetail,
+  saveAddReceiveApplyList,
+  saveEditReceiveApplyList,
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import type { userType } from '@/views/system/user/user-interface'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { getDeptTreeList } from '@/api/system/dept'
+import { getUserList } from '@/api/system/user'
+import { submitApproval } from '@/api/approval'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+
+const $route = useRoute()
+const approvalDialog = ref() // 审批对话框显隐
+const typeValue = ref() // add、edit、detail
+const approvalStatus = ref() // 审批类型
+const useDeptList = ref<deptType[]>([]) // 部门列表
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false)
+const isMulti = ref(false) // 是否批量添加(允许多选)
+const selectIndex = ref() // 点击选择的index--点击第几行
+const dialogSelectDiviceVisible = ref(false) // 控制选择设备对话框显隐
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+// 选中的内容
+const checkoutList = ref([])
+// 表单数据
+const form = ref({
+  taskId: '', // 任务id（审批用）
+  id: '',
+  processId: '', // 流程id--查询审批记录使用
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 领用时间
+  applyDesc: '', // 申请说明
+})
+const ruleFormRef = ref<FormInstance>() as any
+const list = ref<IdeviceList[]>([])// 表格数据
+
+// 查询条件
+const listQuery: Ref<IdeviceListQuery> = ref({
+  equipmentName: '', // 仪器名称
+  equipmentNo: '', // 设备编号
+  modelNo: '', // 型号
+  mesureRange: '', // 测量范围
+  useDeptName: '', // 使用部门
+  usePersonName: '', // 使用人
+  managerStateName: '', // 管理状态
+  validDate: '', // 有效日期
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '设备编号', value: 'equipmentNo', align: 'center', width: '230' },
+  { text: '设备名称', value: 'equipmentName', align: 'center' },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: '测量范围', value: 'mesureRange', align: 'center' },
+  { text: '使用部门', value: 'useDeptName', align: 'center' },
+  { text: '使用人', value: 'usePersonName', align: 'center' },
+  { text: '管理状态', value: 'managerStateName', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center' },
+])
+// 表单校验规则
+const rules = reactive<FormRules>({
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'change' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  time: [{ type: 'date', required: true, message: '领用时间不能为空', trigger: 'change' }],
+  applyDesc: [{ required: true, message: '申请说明不能为空', trigger: 'blur' }],
+})
+
+const $router = useRouter()
+// 点击关闭
+const close = () => {
+  $router.back()
+}
+
+const handleClick = (val: string) => {
+  if (val === 'agree') { // 同意
+    approvalDialog.value.initDialog('agree', form.value.taskId)
+  }
+  else if (val === 'reject') { // 驳回
+    approvalDialog.value.initDialog('reject', form.value.taskId)
+  }
+  else if (val === 'refuse') { // 拒绝
+    approvalDialog.value.initDialog('refuse', form.value.taskId)
+  }
+  else if (val === 'revoke') {
+    const params = {
+      taskId: form.value.taskId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认撤回该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        submitApproval('revoke', params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已撤回',
+          })
+        })
+        close()
+      })
+  }
+}
+
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+
+// 删除行
+const delRow = () => {
+  if (checkoutList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    checkoutList.value.forEach((item: IdeviceListQuery) => {
+      list.value.forEach((element, index) => {
+        if (element.equipmentNo === item.equipmentNo) {
+          list.value.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+
+// 增加行
+const addRow = () => {
+  const index = list.value.findIndex(item => !item.equipmentNo)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条设备信息')
+    return
+  }
+  list.value.push({
+    equipmentName: '', // 设备名称
+    equipmentNo: '', // 设备编号
+    modelNo: '', // 型号
+    mesureRange: '', // 测量范围
+    useDeptName: '', // 使用部门
+    usePersonName: '', // 使用人
+    managerStateName: '', // 管理状态
+    validDate: '', // 有效日期
+    equipmentId: '', // 设备ID
+  })
+}
+
+// 点击选择
+const handleSelect = (index: number, row: IdeviceList) => {
+  dialogSelectDiviceVisible.value = true // 选择设备对话框显隐
+  isMulti.value = false // 是否单选, false单选、true表格多选
+  selectIndex.value = index
+}
+
+// 点击批量添加
+const multiAdd = () => {
+  dialogSelectDiviceVisible.value = true
+  isMulti.value = true
+}
+
+// 选择设备对话框关闭
+const closeDialog = () => {
+  dialogSelectDiviceVisible.value = false
+}
+
+// 选择好设备了, 添加选好的设备到表格中
+const updateDeviceConfirm = (val: Array<IdeviceList>) => {
+  if (isMulti.value) { // 批量增加时push
+    val.forEach((item: IdeviceList) => {
+    // 只添加列表里不存在的
+      const index = list.value.findIndex((i: IdeviceList) => item.equipmentNo === i.equipmentNo)
+      if (index === -1) {
+        list.value.push(item)
+      }
+    })
+  }
+  else { // 单选替换
+    const index = list.value.findIndex((i: IdeviceList) => val[0].equipmentNo === i.equipmentNo)
+    if (index !== -1) {
+      ElMessage.warning('此设备已添加过')
+      return
+    }
+    list.value.splice(selectIndex.value, 1, val[0])
+  }
+}
+
+// 保存
+const save = () => {
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      // 保存之前清除空行、避免传给后端无用空对象
+      const index = list.value.findIndex((item: IdeviceList) => !item.equipmentNo)
+      if (index !== -1) {
+        list.value.splice(index, 1)
+      }
+      const params = {
+        applyName: form.value.applyName, // 申请名称
+        applyUnit: form.value.applyUnit, // 申请单位
+        applyPerson: form.value.applyPerson, // 申请人
+        time: form.value.time, // 领用时间
+        applyDesc: form.value.applyDesc, // 申请说明
+        applyType: '1', // 申请类型 领用1
+        id: form.value.id,
+        equipmentList: list.value.map((item) => {
+          return {
+            equipmentId: item.id!,
+          }
+        }),
+      }
+      // 新建
+      if (typeValue.value === 'add') {
+        saveAddReceiveApplyList(params).then((res) => {
+          form.value.id = res.data
+          ElMessage.success('保存成功')
+          loading.close()
+        })
+      }
+      // 保存
+      else if (typeValue.value === 'edit') {
+        saveEditReceiveApplyList(params).then((res) => {
+          form.value.id = res.data
+          ElMessage.success('保存成功')
+          loading.close()
+        })
+      }
+    }
+    else {
+      console.log('表单校验不通过')
+    }
+  })
+}
+
+// 提交表单
+const submit = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (form.value.id) {
+    const params = {
+      id: form.value.id,
+      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL, // 表单id
+    }
+    submitReceiveApplyList(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    })
+  }
+  else {
+    ElMessage.info('请先保存再提交！')
+  }
+}
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 获取使用部门
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res: any) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+// 审批结束回调
+const approvalSuccess = () => {
+  close()
+}
+
+// 编辑、详情--获取详细信息
+const fetchReceiveApplyListDetail = () => {
+  getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
+    form.value.applyUnit = res.data.applyUnit // 部门
+    form.value.applyName = res.data.applyName // 申请名称
+    form.value.applyPerson = res.data.applyPerson// 申请人
+    form.value.time = res.data.time // 领用时间
+    form.value.applyDesc = res.data.applyDesc // 申请说明
+    list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
+      return {
+        ...item,
+        validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+      }
+    })
+  })
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+onMounted(() => {
+  typeValue.value = $route.query.typeValue // 类型add、edit、detail
+  form.value.id = $route.query.id as string // id
+  form.value.taskId = $route.query.taskId as string // 任务id
+  form.value.processId = $route.query.processId as string // 任务id
+  approvalStatus.value = $route.query.approvalStatus // 审批类型
+  // 编辑、详情获取详情页信息
+  if (typeValue.value === 'edit' || typeValue.value === 'detail') {
+    fetchReceiveApplyListDetail() // 获取详细信息
+  }
+
+  // 获取部门信息
+  fetchDeptTreeList()
+  // 获取人员列表--申请人使用
+  fetchUserList()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`设备领用申请-${textMap[typeValue]}`">
+      <template #btns>
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('agree')">
+          同意
+        </el-button>
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('reject')">
+          驳回
+        </el-button>
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('refuse')">
+          拒绝
+        </el-button>
+        <el-button v-if="typeValue === 'add'" type="primary" @click="submit">
+          提交
+        </el-button>
+        <el-button v-if="typeValue === 'add' || typeValue === 'edit'" type="primary" @click="save">
+          保存
+        </el-button>
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '3'" type="primary" @click="handleClick('revoke')">
+          撤回
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div class="create-check">
+      <div class="top-info">
+        <!-- 表单 -->
+        <div class="form-area">
+          <el-form
+            ref="ruleFormRef"
+            :model="form"
+            label-width="120px"
+            :rules="rules"
+          >
+            <el-row :gutter="24">
+              <el-col :span="6">
+                <el-form-item label="申请名称" prop="applyName">
+                  <el-input
+                    v-model="form.applyName"
+                    :placeholder="typeValue === 'detail' ? '' : '请输入申请名称'"
+                    clearable
+                    :disabled="typeValue === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="申请单位" prop="applyUnit">
+                  <dept-select
+                    v-model="form.applyUnit"
+                    placeholder="请选择申请单位"
+                    :data="useDeptList"
+                    :disabled="typeValue === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="申请人" prop="applyPerson">
+                  <el-select
+                    v-model="form.applyPerson"
+                    :disabled="typeValue === 'detail'"
+                    placeholder="请选择申请人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="领用时间" prop="time">
+                  <el-date-picker
+                    v-model="form.time"
+                    type="datetime"
+                    placeholder="请选择领用时间"
+                    format="YYYY-MM-DD hh:mm"
+                    value-format="YYYY-MM-DD hh:mm"
+                    :disabled="typeValue === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="申请说明" prop="applyDesc">
+                  <el-input v-model="form.applyDesc" type="textarea" autosize clearable :disabled="typeValue === 'detail'" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </div>
+      </div>
+      <!-- 表格 -->
+      <detail-block title="设备领用列表">
+        <template #btns>
+          <el-button v-if="typeValue !== 'detail'" type="primary" @click="multiAdd">
+            批量添加
+          </el-button>
+          <el-button v-if="typeValue !== 'detail'" type="primary" @click="addRow">
+            增加行
+          </el-button>
+          <el-button v-if="typeValue !== 'detail'" type="info" @click="delRow">
+            删除行
+          </el-button>
+        </template>
+        <el-table
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column v-if="typeValue !== 'detail'" type="selection" width="38" />
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          >
+            <template v-if="item.value === 'equipmentNo' && (typeValue === 'add' || typeValue === 'edit')" #default="scope">
+              <el-input v-model="scope.row.equipmentNo" placeholder="请选择设备" class="input">
+                <template #append>
+                  <el-button size="small" @click="handleSelect(scope.$index, scope.row)">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+
+      <detail-block v-if="typeValue === 'detail'" title="审批流程">
+        <approval-record :process-id="form.processId" />
+      </detail-block>
+    </div>
+    <select-device-dialog
+      :dialog-select-divice-visible="dialogSelectDiviceVisible"
+      :is-multi="isMulti"
+      @closeDialog="closeDialog"
+      @updateDeviceConfirm="updateDeviceConfirm"
+    />
+
+    <!-- 同意、驳回、拒绝对话框显示 -->
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.create-check {
+  margin-top: 10px;
+
+  .top-info {
+    display: flex;
+    flex-direction: column;
+    width: 100%;
+    padding-right: 10px;
+    border-radius: 10px;
+    background-color: #fff;
+    // padding: 10px;
+
+    .title-button {
+      display: flex;
+      align-items: center;
+
+      &::before {
+        content: "";
+        flex: 1;
+      }
+
+      .button-group {
+        flex: 1;
+        display: flex;
+        justify-content: flex-end;
+      }
+    }
+
+    .form-area {
+      margin-top: 40px;
+    }
+  }
+}
+</style>
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
new file mode 100644
index 0000000..abf559c
--- /dev/null
+++ b/src/views/device/receive/apply/applyList.vue
@@ -0,0 +1,542 @@
+<script lang="ts" setup name="ApplyList">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+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 ButtonBox from '@/components/buttonBox/buttonBox.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { exportFile } from '@/utils/exportUtils'
+import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import {
+  delReceiveApplyList,
+  exportReceiveApplyList,
+  getReceiveApplyList,
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import { submitApproval } from '@/api/approval'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import type { userType } from '@/views/system/user/user-interface'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { getUserList } from '@/api/system/user'
+
+const loadingTable = ref(false) // 表格loading
+const active = ref('') // 选中的按钮
+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 listQuery: Ref<IlistQuery> = ref({
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  approvalStatus: active.value, // 	审批状态
+  processResult: '', // 	处置结果
+  applyType: '1', // 申请类型 领用1
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+  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 columns = ref<TableColumn[]>([
+  { text: '申请编号', value: 'applyNo', align: 'center' },
+  { text: '申请名称', value: 'applyName', align: 'center' },
+  { text: '申请部门', value: 'applyUnitName', align: 'center' },
+  { text: '申请人', value: 'applyPersonName', align: 'center' },
+  { text: '领用时间', value: 'time', align: 'center' },
+  { text: '申请说明', value: 'applyDesc', align: 'center' },
+  { text: '审批状态', value: 'approvalStatus', align: 'center' },
+])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 筛选时间段数据
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.startTime = timeRange.value[0] as string || ''
+  listQuery.value.endTime = timeRange.value[1] as string || ''
+  listQuery.value.approvalStatus = active.value
+  getReceiveApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IlistType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap[item.approvalStatus],
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: active.value, // 	审批状态
+    processResult: '', // 	处置结果
+    applyType: '1', // 申请类型 领用1
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', '']
+  fetchData(true)
+}
+
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+const $router = useRouter()
+
+// 新建
+const add = () => {
+  $router.push({ path: '/receive/add', query: { typeValue: 'add' } })
+}
+
+// 导出
+const exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    const params = {
+      applyNo: listQuery.value.applyNo, // 申请编号
+      applyName: listQuery.value.applyName, // 申请名称
+      applyUnit: listQuery.value.applyUnit, // 申请部门
+      applyPerson: listQuery.value.applyPerson, // 申请人
+      startTime: listQuery.value.startTime, // 申请开始日期
+      endTime: listQuery.value.endTime, // 申请结束日期
+      approvalStatus: listQuery.value.approvalStatus, // 	审批状态
+      processResult: listQuery.value.processResult, // 	处置结果
+      applyType: listQuery.value.applyType, // 申请类型 领用0
+      createUser: listQuery.value.createUser, // 创建人
+      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+      offset: 1,
+      limit: 20,
+      ids: checkoutList.value,
+    }
+    // 调导出接口
+    exportReceiveApplyList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备领用申请列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备领用申请列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: IlistType) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备领用申请列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 操作
+const handleEdit = (row: IlistType, val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      taskId: row.taskId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        submitApproval('revoke', params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+        })
+        fetchData(true)
+      })
+  }
+  else if (val === '删除') {
+    ElMessageBox.confirm(
+      '确认删除该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        delReceiveApplyList({ id: row.id, taskId: row.taskId }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '提交') {
+    ElMessageBox.confirm(
+      '确认提交该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        submitReceiveApplyList({ id: row.id, formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已提交',
+          })
+        })
+        fetchData(true)
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', row.taskId)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', row.taskId)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', row.taskId)
+  }
+  else if (val === '查看' || val === '编辑') {
+    $router.push({
+      path: `/receive/${title}`,
+      query: {
+        typeValue: title,
+        approvalStatus: approvalStatusReserveMap[row.approvalStatus],
+        id: row.id,
+        taskId: row.taskId,
+        processId: row.processId, // 查询审批记录使用
+      },
+    })
+  }
+}
+// 按钮切换
+const changeCurrentButton = (val: string) => {
+  active.value = val
+  window.sessionStorage.setItem('buttonBoxActive', val)
+  clearList()
+}
+
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 获取用户列表(增加模糊查询)
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 获取使用部门
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res: any) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+onMounted(() => {
+  if (window.sessionStorage.getItem('buttonBoxActive')) {
+    active.value = window.sessionStorage.getItem('buttonBoxActive')!
+  }
+  else {
+    active.value = '0' // 全部
+  }
+  nextTick(() => {
+    fetchData(true) // 获取表格数据
+    // 获取使用部门
+    fetchDeptTreeList() // 获取使用部门
+    fetchUserList() // 获取人员列表
+  })
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyNo"
+          placeholder="申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyName"
+          placeholder="申请名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.applyPerson"
+          placeholder="请选择申请人"
+          style="width: 100%;"
+          filterable
+          remote
+          remote-show-suffix
+          :remote-method="remoteMethod"
+          :loading="applyPersonLoading"
+        >
+          <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY-MM-DD hh:mm"
+          value-format="YYYY-MM-DD hh:mm"
+          start-placeholder="领用开始时间"
+          end-placeholder="领用结束时间"
+        />
+      </search-item>
+    </search-area>
+
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @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="220" fixed="right">
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="handleEdit(row, '查看', 'detail')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (active === '0' || active === '2')"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (active === '0' || active === '2')"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (active === '0' || active === '2')"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '编辑', 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (active === '0' || active === '3')"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (active !== '4' && active !== '5')"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatus === '未通过' || row.approvalStatus === '已通过'"
+                @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+    <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
+
diff --git a/src/views/device/receive/applyList.vue b/src/views/device/receive/applyList.vue
deleted file mode 100644
index 63e1ee8..0000000
--- a/src/views/device/receive/applyList.vue
+++ /dev/null
@@ -1,523 +0,0 @@
-<script lang="ts" setup name="ApplyList">
-import { ref } from 'vue'
-import type { Ref } from 'vue'
-import type { DateModelType } from 'element-plus'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { useRouter } from 'vue-router'
-import type { IlistQuery, IlistType } from '@/views/device/receive/receive'
-import ButtonBox from '@/views/device/receive/buttonBox.vue'
-import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-import { exportFile } from '@/utils/exportUtils'
-import { printJSON } from '@/utils/printUtils'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
-import {
-  delReceiveApplyList,
-  exportReceiveApplyList,
-  getReceiveApplyList,
-  submitReceiveApplyList,
-} from '@/api/device/receive'
-import { submitApproval } from '@/api/approval'
-import { getDeptTreeList } from '@/api/system/dept'
-import { toTreeList } from '@/utils/structure'
-import type { userType } from '@/views/system/user/user-interface'
-import type { deptType } from '@/views/device/standingBook/standingBook-interface'
-import { getUserList } from '@/api/system/user'
-
-const loadingTable = ref(false) // 表格loading
-const active = ref('0') // 选中的按钮
-const approvalDialog = ref() // 审批对话框显隐
-const useDeptList = ref<deptType[]>([]) // 部门列表
-const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
-const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
-const applyPersonLoading = ref(false) // 申请人模糊搜索框loading
-
-// 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  applyNo: '', // 申请编号
-  applyName: '', // 申请名称
-  applyUnit: '', // 申请部门id
-  applyUnitName: '', // 申请部门名称
-  applyPerson: '', // 申请人id
-  applyPersonName: '', // 申请人姓名
-  startTime: '', // 领用开始日期
-  endTime: '', // 领用结束日期
-  approvalStatus: '', // 	审批状态
-  processResult: '', // 	处置结果
-  applyType: '1', // 申请类型 领用1
-  createUser: '', // 创建人
-  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
-  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 columns = ref<TableColumn[]>([
-  { text: '申请编号', value: 'applyNo', align: 'center' },
-  { text: '申请名称', value: 'applyName', align: 'center' },
-  { text: '申请部门', value: 'applyUnitName', align: 'center' },
-  { text: '申请人', value: 'applyPersonName', align: 'center' },
-  { text: '领用时间', value: 'time', align: 'center' },
-  { text: '申请说明', value: 'applyDesc', align: 'center' },
-  { text: '审批状态', value: 'approvalStatus', align: 'center' },
-])
-// 选中的内容
-const checkoutList = ref<string[]>([])
-// 筛选时间段数据
-const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-
-// 数据查询
-function fetchData(isNowPage = false) {
-  loadingTable.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.value.offset = 1
-  }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
-  listQuery.value.approvalStatus = active.value
-  getReceiveApplyList(listQuery.value).then((response) => {
-    list.value = response.data.rows.map((item: IlistType) => {
-      return {
-        ...item,
-        approvalStatus: approvalStatusMap[item.approvalStatus],
-      }
-    })
-    total.value = parseInt(response.data.total)
-    loadingTable.value = false
-  })
-}
-
-// 重置
-const clearList = () => {
-  listQuery.value = {
-    applyNo: '', // 申请编号
-    applyName: '', // 申请名称
-    applyUnit: '', // 申请部门
-    applyPerson: '', // 申请人
-    startTime: '', // 申请开始日期
-    endTime: '', // 申请结束日期
-    approvalStatus: '', // 	审批状态
-    processResult: '', // 	处置结果
-    applyType: '1', // 申请类型 领用1
-    createUser: '', // 创建人
-    formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
-    offset: 1,
-    limit: 20,
-  }
-  timeRange.value = ['', '']
-  fetchData(true)
-}
-
-// 搜索
-const searchList = () => {
-  fetchData(true)
-}
-
-// 多选发生改变时
-const handleSelectionChange = (e: any) => {
-  checkoutList.value = e.map((item: { id: string }) => item.id)
-}
-const $router = useRouter()
-
-// 新建
-const add = () => {
-  $router.push({ path: '/receive/add', query: { typeValue: 'add' } })
-}
-
-// 导出
-const exportAll = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: '下载中请稍后',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (list.value.length > 0) {
-    const params = {
-      applyNo: listQuery.value.applyNo, // 申请编号
-      applyName: listQuery.value.applyName, // 申请名称
-      applyUnit: listQuery.value.applyUnit, // 申请部门
-      applyPerson: listQuery.value.applyPerson, // 申请人
-      startTime: listQuery.value.startTime, // 申请开始日期
-      endTime: listQuery.value.endTime, // 申请结束日期
-      approvalStatus: listQuery.value.approvalStatus, // 	审批状态
-      processResult: listQuery.value.processResult, // 	处置结果
-      applyType: listQuery.value.applyType, // 申请类型 领用0
-      createUser: listQuery.value.createUser, // 创建人
-      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
-      offset: 1,
-      limit: 20,
-      ids: checkoutList.value,
-    }
-    // 调导出接口
-    exportReceiveApplyList(params).then((res) => {
-      const blob = new Blob([res.data])
-      exportFile(blob, '设备领用申请列表.xlsx')
-    })
-  }
-  else {
-    ElMessage.warning('无数据可导出数据')
-  }
-  loading.close()
-}
-
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  fetchData(true)
-}
-
-// 打印列表
-function printList() {
-  // 打印列
-  const properties = columns.value.map((item) => {
-    return {
-      field: item.value,
-      displayName: item.text,
-    }
-  })
-  if (checkoutList.value.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '设备领用申请列表')
-  }
-  else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: IlistType) => checkoutList.value.includes(item.id))
-    printJSON(printList, properties, '设备领用申请列表')
-  }
-  else {
-    ElMessage.warning('无可打印内容')
-  }
-}
-
-// 操作
-const handleEdit = (row: IlistType, val: string, title = '') => {
-  if (val === '取消') {
-    const params = {
-      taskId: row.taskId!,
-      comments: '',
-    }
-    ElMessageBox.confirm(
-      '确认取消该审批吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        submitApproval('revoke', params).then((res) => {
-          ElMessage({
-            type: 'success',
-            message: '取消成功',
-          })
-        })
-        fetchData(true)
-      })
-  }
-  else if (val === '删除') {
-    ElMessageBox.confirm(
-      '确认删除该审批吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        delReceiveApplyList({ id: row.id, taskId: row.taskId }).then((res) => {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          fetchData(true)
-        })
-      })
-  }
-  else if (val === '提交') {
-    ElMessageBox.confirm(
-      '确认提交该审批吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        submitReceiveApplyList({ id: row.id, formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL }).then((res) => {
-          ElMessage({
-            type: 'success',
-            message: '已提交',
-          })
-        })
-        fetchData(true)
-      })
-  }
-  else if (val === '同意') {
-    approvalDialog.value.initDialog('agree', row.taskId)
-  }
-  else if (val === '驳回') {
-    approvalDialog.value.initDialog('reject', row.taskId)
-  }
-  else if (val === '拒绝') {
-    approvalDialog.value.initDialog('refuse', row.taskId)
-  }
-  else if (val === '查看' || val === '编辑') {
-    $router.push({
-      path: `/receive/${title}`,
-      query: {
-        typeValue: title,
-        approvalStatus: approvalStatusReserveMap[row.approvalStatus],
-        id: row.id,
-        taskId: row.taskId,
-        processId: row.processId, // 查询审批记录使用
-      },
-    })
-  }
-}
-// 按钮切换
-const changeCurrentButton = (val: string) => {
-  active.value = val
-  clearList()
-}
-
-// 审批结束回调
-const approvalSuccess = () => {
-  fetchData(true)
-}
-
-// 选择器模糊查询
-const remoteMethod = (query: string) => {
-  if (query) {
-    applyPersonLoading.value = true
-    setTimeout(() => {
-      applyPersonLoading.value = false
-      usePersonOptions.value = usePersonList.value.filter((item) => {
-        return item.name.toLowerCase().includes(query.toLowerCase())
-      })
-    }, 200)
-  }
-  else {
-    usePersonOptions.value = usePersonList.value
-  }
-}
-
-// 获取用户列表(增加模糊查询)
-const fetchUserList = () => {
-  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
-    usePersonList.value = res.data.rows
-    usePersonOptions.value = res.data.rows
-  })
-}
-
-// 获取使用部门
-const fetchDeptTreeList = () => {
-  getDeptTreeList().then((res: any) => {
-    if (res.data) { // 将列表转树结构
-      useDeptList.value = toTreeList(res.data, '0', true)
-    }
-  })
-}
-
-onMounted(() => {
-  fetchData(true)
-  // 获取使用部门
-  fetchDeptTreeList()
-  fetchUserList()
-})
-</script>
-
-<template>
-  <app-container>
-    <search-area
-      :need-clear="true"
-      @search="searchList" @clear="clearList"
-    >
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.applyNo"
-          placeholder="申请编号"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.applyName"
-          placeholder="申请名称"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
-      </search-item>
-      <search-item>
-        <el-select
-          v-model="listQuery.applyPerson"
-          placeholder="请选择申请人"
-          style="width: 100%;"
-          filterable
-          remote
-          remote-show-suffix
-          :remote-method="remoteMethod"
-          :loading="applyPersonLoading"
-        >
-          <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="timeRange"
-          type="daterange"
-          range-separator="到"
-          format="YYYY-MM-DD"
-          value-format="YYYY-MM-DD"
-          start-placeholder="领用开始日期"
-          end-placeholder="领用结束日期"
-        />
-      </search-item>
-    </search-area>
-
-    <table-container>
-      <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
-      </template>
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @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="220" fixed="right">
-            <template #default="{ row }">
-              <el-button
-                size="small"
-                type="primary"
-                link
-                @click="handleEdit(row, '查看', 'detail')"
-              >
-                查看
-              </el-button>
-              <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (active === '0' || active === '2')"
-                size="small"
-                link
-                type="primary"
-                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
-                @click="handleEdit(row, '同意')"
-              >
-                同意
-              </el-button>
-              <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (active === '0' || active === '2')"
-                size="small"
-                link
-                type="primary"
-                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
-                @click="handleEdit(row, '驳回')"
-              >
-                驳回
-              </el-button>
-              <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (active === '0' || active === '2')"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
-                @click="handleEdit(row, '拒绝')"
-              >
-                拒绝
-              </el-button>
-              <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
-                size="small"
-                link
-                type="primary"
-                @click="handleEdit(row, '编辑', 'edit')"
-              >
-                编辑
-              </el-button>
-              <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
-                size="small"
-                link
-                type="primary"
-                @click="handleEdit(row, '提交')"
-              >
-                提交
-              </el-button>
-              <!-- 是发起者且审批中可以取消 -->
-              <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (active === '0' || active === '3')"
-                size="small"
-                link
-                type="info"
-                :disabled="row.approvalStatus !== '审批中'"
-                @click="handleEdit(row, '取消')"
-              >
-                取消
-              </el-button>
-              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-              <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (active !== '4' && active !== '5')"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatus === '未通过' || row.approvalStatus === '已通过'"
-                @click="handleEdit(row, '删除')"
-              >
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <button-box :active="active" @changeCurrentButton="changeCurrentButton" />
-    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-  </app-container>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-</style>
-
diff --git a/src/views/device/receive/buttonBox.vue b/src/views/device/receive/buttonBox.vue
deleted file mode 100644
index 4205fa8..0000000
--- a/src/views/device/receive/buttonBox.vue
+++ /dev/null
@@ -1,46 +0,0 @@
-<script lang="ts" setup name="ButtonBox">
-import { ref } from 'vue'
-const emits = defineEmits(['changeCurrentButton'])
-const menu = [
-  { name: '全部', id: '0' },
-  { name: '草稿箱', id: '1' },
-  { name: '待审批', id: '2' },
-  { name: '审批中', id: '3' },
-  { name: '已通过', id: '4' },
-  { name: '未通过', id: '5' },
-  { name: '已取消', id: '6' },
-]
-const current = ref('0')
-watch(current, (newValue) => {
-  emits('changeCurrentButton', newValue)
-})
-</script>
-
-<template>
-  <div class="container">
-    <div class="btns">
-      <!-- 三级菜单 -->
-      <el-radio-group v-model="current">
-        <el-radio-button v-for="item in menu" :key="item.id" :label="item.id">
-          {{ item.name }}
-        </el-radio-button>
-      </el-radio-group>
-    </div>
-    <!-- 展示区域 -->
-    <!-- <component :is="currentComp" /> -->
-  </div>
-</template>
-
-<style lang="scss" scoped>
-.container {
-  position: relative;
-
-  .btns {
-    position: fixed;
-    top: 69px;
-    right: 15px;
-    z-index: 999;
-  }
-}
-</style>
-
diff --git a/src/views/device/receive/createOrCheck.vue b/src/views/device/receive/createOrCheck.vue
deleted file mode 100644
index 9cbc3bc..0000000
--- a/src/views/device/receive/createOrCheck.vue
+++ /dev/null
@@ -1,552 +0,0 @@
-<script lang="ts" setup name="CreateOrCheck">
-import { onMounted, reactive, ref } from 'vue'
-import type { Ref } from 'vue'
-import dayjs from 'dayjs'
-import type { FormInstance, FormRules } from 'element-plus'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { useRoute, useRouter } from 'vue-router'
-import type { IdeviceList, IdeviceListQuery } from './receive'
-import SelectDeviceDialog from './selectDeviceDialog.vue'
-import { toTreeList } from '@/utils/structure'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
-import {
-  getReceiveApplyListDetail,
-  saveAddReceiveApplyList,
-  saveEditReceiveApplyList,
-  submitReceiveApplyList,
-} from '@/api/device/receive'
-import type { userType } from '@/views/system/user/user-interface'
-import type { deptType } from '@/views/device/standingBook/standingBook-interface'
-import { getDeptTreeList } from '@/api/system/dept'
-import { getUserList } from '@/api/system/user'
-import { submitApproval } from '@/api/approval'
-import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
-
-const $route = useRoute()
-const approvalDialog = ref() // 审批对话框显隐
-const typeValue = ref() // add、edit、detail
-const approvalStatus = ref() // 审批类型
-const useDeptList = ref<deptType[]>([]) // 部门列表
-const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
-const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
-const applyPersonLoading = ref(false)
-const isMulti = ref(false) // 是否批量添加(允许多选)
-const selectIndex = ref() // 点击选择的index--点击第几行
-const dialogSelectDiviceVisible = ref(false) // 控制选择设备对话框显隐
-const textMap: { [key: string]: string } = {
-  edit: '编辑',
-  add: '新建',
-  detail: '详情',
-}// 字典
-// 选中的内容
-const checkoutList = ref([])
-// 表单数据
-const form = ref({
-  taskId: '', // 任务id（审批用）
-  id: '',
-  processId: '', // 流程id--查询审批记录使用
-  applyName: '', // 申请名称
-  applyUnit: '', // 申请单位
-  applyPerson: '', // 申请人
-  time: '', // 领用时间
-  applyDesc: '', // 申请说明
-})
-const ruleFormRef = ref<FormInstance>() as any
-const list = ref<IdeviceList[]>([])// 表格数据
-
-// 查询条件
-const listQuery: Ref<IdeviceListQuery> = ref({
-  equipmentName: '', // 仪器名称
-  equipmentNo: '', // 设备编号
-  modelNo: '', // 型号
-  mesureRange: '', // 测量范围
-  useDeptName: '', // 使用部门
-  usePersonName: '', // 使用人
-  managerStateName: '', // 管理状态
-  validDate: '', // 有效日期
-  offset: 1,
-  limit: 20,
-})
-// 表头
-const columns = ref<TableColumn[]>([
-  { text: '设备编号', value: 'equipmentNo', align: 'center', width: '230' },
-  { text: '设备名称', value: 'equipmentName', align: 'center' },
-  { text: '型号', value: 'modelNo', align: 'center' },
-  { text: '测量范围', value: 'mesureRange', align: 'center' },
-  { text: '使用部门', value: 'useDeptName', align: 'center' },
-  { text: '使用人', value: 'usePersonName', align: 'center' },
-  { text: '管理状态', value: 'managerStateName', align: 'center' },
-  { text: '有效日期', value: 'validDate', align: 'center' },
-])
-// 表单校验规则
-const rules = reactive<FormRules>({
-  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
-  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'change' }],
-  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
-  time: [{ type: 'date', required: true, message: '领用时间不能为空', trigger: 'change' }],
-  applyDesc: [{ required: true, message: '申请说明不能为空', trigger: 'blur' }],
-})
-
-const $router = useRouter()
-// 点击关闭
-const close = () => {
-  $router.back()
-}
-
-const handleClick = (val: string) => {
-  if (val === 'agree') { // 同意
-    approvalDialog.value.initDialog('agree', form.value.taskId)
-  }
-  else if (val === 'reject') { // 驳回
-    approvalDialog.value.initDialog('reject', form.value.taskId)
-  }
-  else if (val === 'refuse') { // 拒绝
-    approvalDialog.value.initDialog('refuse', form.value.taskId)
-  }
-  else if (val === 'revoke') {
-    const params = {
-      taskId: form.value.taskId!,
-      comments: '',
-    }
-    ElMessageBox.confirm(
-      '确认撤回该审批吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        submitApproval('revoke', params).then((res) => {
-          ElMessage({
-            type: 'success',
-            message: '已撤回',
-          })
-        })
-        close()
-      })
-  }
-}
-
-// 多选发生改变时
-const handleSelectionChange = (e: any) => {
-  checkoutList.value = e
-}
-
-// 删除行
-const delRow = () => {
-  if (checkoutList.value.length <= 0) {
-    ElMessage({
-      message: '请选中要删除的行',
-      type: 'warning',
-    })
-  }
-  else {
-    checkoutList.value.forEach((item: IdeviceListQuery) => {
-      list.value.forEach((element, index) => {
-        if (element.equipmentNo === item.equipmentNo) {
-          list.value.splice(index, 1)
-        }
-      })
-    })
-  }
-}
-
-// 增加行
-const addRow = () => {
-  const index = list.value.findIndex(item => !item.equipmentNo)
-  if (index !== -1) {
-    ElMessage.warning('请完善上一条设备信息')
-    return
-  }
-  list.value.push({
-    equipmentName: '', // 设备名称
-    equipmentNo: '', // 设备编号
-    modelNo: '', // 型号
-    mesureRange: '', // 测量范围
-    useDeptName: '', // 使用部门
-    usePersonName: '', // 使用人
-    managerStateName: '', // 管理状态
-    validDate: '', // 有效日期
-    equipmentId: '', // 设备ID
-  })
-}
-
-// 点击选择
-const handleSelect = (index: number, row: IdeviceList) => {
-  dialogSelectDiviceVisible.value = true // 选择设备对话框显隐
-  isMulti.value = false // 是否单选, false单选、true表格多选
-  selectIndex.value = index
-}
-
-// 点击批量添加
-const multiAdd = () => {
-  dialogSelectDiviceVisible.value = true
-  isMulti.value = true
-}
-
-// 选择设备对话框关闭
-const closeDialog = () => {
-  dialogSelectDiviceVisible.value = false
-}
-
-// 选择好设备了, 添加选好的设备到表格中
-const updateDeviceConfirm = (val: Array<IdeviceList>) => {
-  if (isMulti.value) { // 批量增加时push
-    val.forEach((item: IdeviceList) => {
-    // 只添加列表里不存在的
-      const index = list.value.findIndex((i: IdeviceList) => item.equipmentNo === i.equipmentNo)
-      if (index === -1) {
-        list.value.push(item)
-      }
-    })
-  }
-  else { // 单选替换
-    const index = list.value.findIndex((i: IdeviceList) => val[0].equipmentNo === i.equipmentNo)
-    if (index !== -1) {
-      ElMessage.warning('此设备已添加过')
-      return
-    }
-    list.value.splice(selectIndex.value, 1, val[0])
-  }
-}
-
-// 保存
-const save = () => {
-  ruleFormRef.value.validate((valid: boolean) => {
-    if (valid) {
-      const loading = ElLoading.service({
-        lock: true,
-        background: 'rgba(255, 255, 255, 0.8)',
-      })
-      // 保存之前清除空行、避免传给后端无用空对象
-      const index = list.value.findIndex((item: IdeviceList) => !item.equipmentNo)
-      if (index !== -1) {
-        list.value.splice(index, 1)
-      }
-      const params = {
-        applyName: form.value.applyName, // 申请名称
-        applyUnit: form.value.applyUnit, // 申请单位
-        applyPerson: form.value.applyPerson, // 申请人
-        time: form.value.time, // 领用时间
-        applyDesc: form.value.applyDesc, // 申请说明
-        applyType: '1', // 申请类型 领用1
-        id: form.value.id,
-        equipmentList: list.value.map((item) => {
-          return {
-            equipmentId: item.id!,
-          }
-        }),
-      }
-      // 新建
-      if (typeValue.value === 'add') {
-        saveAddReceiveApplyList(params).then((res) => {
-          form.value.id = res.data
-          ElMessage.success('保存成功')
-          loading.close()
-        })
-      }
-      // 保存
-      else if (typeValue.value === 'edit') {
-        saveEditReceiveApplyList(params).then((res) => {
-          form.value.id = res.data
-          ElMessage.success('保存成功')
-          loading.close()
-        })
-      }
-    }
-    else {
-      console.log('表单校验不通过')
-    }
-  })
-}
-
-// 提交表单
-const submit = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (form.value.id) {
-    const params = {
-      id: form.value.id,
-      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL, // 表单id
-    }
-    submitReceiveApplyList(params).then(() => {
-      ElMessage.success('提交成功')
-      loading.close()
-      close()
-    })
-  }
-  else {
-    ElMessage.info('请先保存再提交！')
-  }
-}
-
-// 获取用户列表--（是否有不分页接口？）
-const fetchUserList = () => {
-  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
-    usePersonList.value = res.data.rows
-    usePersonOptions.value = res.data.rows
-  })
-}
-
-// 获取使用部门
-const fetchDeptTreeList = () => {
-  getDeptTreeList().then((res: any) => {
-    if (res.data) { // 将列表转树结构
-      useDeptList.value = toTreeList(res.data, '0', true)
-    }
-  })
-}
-
-// 审批结束回调
-const approvalSuccess = () => {
-  close()
-}
-
-// 编辑、详情--获取详细信息
-const fetchReceiveApplyListDetail = () => {
-  getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
-    form.value.applyUnit = res.data.applyUnit // 部门
-    form.value.applyName = res.data.applyName // 申请名称
-    form.value.applyPerson = res.data.applyPerson// 申请人
-    form.value.time = res.data.time // 领用时间
-    form.value.applyDesc = res.data.applyDesc // 申请说明
-    list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
-      return {
-        ...item,
-        validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
-      }
-    })
-  })
-}
-
-// 选择器模糊查询
-const remoteMethod = (query: string) => {
-  if (query) {
-    applyPersonLoading.value = true
-    setTimeout(() => {
-      applyPersonLoading.value = false
-      usePersonOptions.value = usePersonList.value.filter((item) => {
-        return item.name.toLowerCase().includes(query.toLowerCase())
-      })
-    }, 200)
-  }
-  else {
-    usePersonOptions.value = usePersonList.value
-  }
-}
-
-onMounted(() => {
-  typeValue.value = $route.query.typeValue // 类型add、edit、detail
-  form.value.id = $route.query.id as string // id
-  form.value.taskId = $route.query.taskId as string // 任务id
-  form.value.processId = $route.query.processId as string // 任务id
-  approvalStatus.value = $route.query.approvalStatus // 审批类型
-  // 编辑、详情获取详情页信息
-  if (typeValue.value === 'edit' || typeValue.value === 'detail') {
-    fetchReceiveApplyListDetail() // 获取详细信息
-  }
-
-  // 获取部门信息
-  fetchDeptTreeList()
-  // 获取人员列表--申请人使用
-  fetchUserList()
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="`设备领用申请-${textMap[typeValue]}`">
-      <template #btns>
-        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('agree')">
-          同意
-        </el-button>
-        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('reject')">
-          驳回
-        </el-button>
-        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('refuse')">
-          拒绝
-        </el-button>
-        <el-button v-if="typeValue === 'add' || typeValue === 'edit'" type="primary" @click="save">
-          保存
-        </el-button>
-        <el-button v-if="typeValue === 'add'" type="primary" @click="submit">
-          提交
-        </el-button>
-        <el-button v-if="typeValue === 'edit' && approvalStatus === '3'" type="primary" @click="handleClick('revoke')">
-          撤回
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-    <div class="create-check">
-      <div class="top-info">
-        <!-- 表单 -->
-        <div class="form-area">
-          <el-form
-            ref="ruleFormRef"
-            :model="form"
-            label-width="120px"
-            :rules="rules"
-          >
-            <el-row :gutter="24">
-              <el-col :span="6">
-                <el-form-item label="申请名称" prop="applyName">
-                  <el-input
-                    v-model="form.applyName"
-                    :placeholder="typeValue === 'detail' ? '' : '请输入申请名称'"
-                    clearable
-                    :disabled="typeValue === 'detail'"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="申请单位" prop="applyUnit">
-                  <dept-select
-                    v-model="form.applyUnit"
-                    placeholder="请选择申请单位"
-                    :data="useDeptList"
-                    :disabled="typeValue === 'detail'"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="申请人" prop="applyPerson">
-                  <el-select
-                    v-model="form.applyPerson"
-                    :disabled="typeValue === 'detail'"
-                    placeholder="请选择申请人"
-                    style="width: 100%;"
-                    filterable
-                    remote
-                    remote-show-suffix
-                    :remote-method="remoteMethod"
-                    :loading="applyPersonLoading"
-                  >
-                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="领用时间" prop="time">
-                  <el-date-picker
-                    v-model="form.time"
-                    type="datetime"
-                    placeholder="请选择领用时间"
-                    format="YYYY-MM-DD hh:mm"
-                    value-format="YYYY-MM-DD hh:mm"
-                    :disabled="typeValue === 'detail'"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="申请说明" prop="applyDesc">
-                  <el-input v-model="form.applyDesc" type="textarea" autosize clearable :disabled="typeValue === 'detail'" />
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </el-form>
-        </div>
-      </div>
-      <!-- 表格 -->
-      <detail-block title="设备领用列表">
-        <template #btns>
-          <el-button v-if="typeValue !== 'detail'" type="primary" @click="multiAdd">
-            批量添加
-          </el-button>
-          <el-button v-if="typeValue !== 'detail'" type="primary" @click="addRow">
-            增加行
-          </el-button>
-          <el-button v-if="typeValue !== 'detail'" type="info" @click="delRow">
-            删除行
-          </el-button>
-        </template>
-        <el-table
-          :data="list"
-          border
-          style="width: 100%;"
-          max-height="600"
-          @selection-change="handleSelectionChange"
-        >
-          <el-table-column type="selection" width="38" />
-          <el-table-column align="center" label="序号" width="80" type="index" />
-          <el-table-column
-            v-for="item in columns"
-            :key="item.value"
-            :prop="item.value"
-            :label="item.text"
-            :width="item.width"
-            show-overflow-tooltip
-            align="center"
-          >
-            <template v-if="item.value === 'equipmentNo' && (typeValue === 'add' || typeValue === 'edit')" #default="scope">
-              <el-input v-model="scope.row.equipmentNo" placeholder="请选择设备" class="input">
-                <template #append>
-                  <el-button size="small" @click="handleSelect(scope.$index, scope.row)">
-                    选择
-                  </el-button>
-                </template>
-              </el-input>
-            </template>
-          </el-table-column>
-        </el-table>
-      </detail-block>
-
-      <detail-block v-if="typeValue === 'detail'" title="审批流程">
-        <approval-record :process-id="form.processId" />
-      </detail-block>
-    </div>
-    <select-device-dialog
-      :dialog-select-divice-visible="dialogSelectDiviceVisible"
-      :is-multi="isMulti"
-      @closeDialog="closeDialog"
-      @updateDeviceConfirm="updateDeviceConfirm"
-    />
-
-    <!-- 同意、驳回、拒绝对话框显示 -->
-    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-  </app-container>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-.create-check {
-  margin-top: 10px;
-
-  .top-info {
-    display: flex;
-    flex-direction: column;
-    width: 100%;
-    padding-right: 10px;
-    border-radius: 10px;
-    background-color: #fff;
-    // padding: 10px;
-
-    .title-button {
-      display: flex;
-      align-items: center;
-
-      &::before {
-        content: "";
-        flex: 1;
-      }
-
-      .button-group {
-        flex: 1;
-        display: flex;
-        justify-content: flex-end;
-      }
-    }
-
-    .form-area {
-      margin-top: 40px;
-    }
-  }
-}
-</style>
diff --git a/src/views/device/receive/receive.ts b/src/views/device/receive/receive.ts
index 2754aee..056fe60 100644
--- a/src/views/device/receive/receive.ts
+++ b/src/views/device/receive/receive.ts
@@ -82,3 +82,8 @@
   managerStateName: string // 管理状态
   validDate: string // 有效日期
 }
+
+export interface IMenu {
+  name: string // 名字
+  id: string
+}
diff --git a/src/views/device/receive/solve/solveDetail.vue b/src/views/device/receive/solve/solveDetail.vue
new file mode 100644
index 0000000..8076684
--- /dev/null
+++ b/src/views/device/receive/solve/solveDetail.vue
@@ -0,0 +1,257 @@
+<script lang="ts" setup name="Detail">
+import { onMounted, ref } from 'vue'
+import { useRoute, useRouter } from 'vue-router'
+import { ElLoading } from 'element-plus'
+import type { Ref } from 'vue'
+import dayjs from 'dayjs'
+import type { IdeviceList, IdeviceListQuery } from '../receive'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getReceiveApplyListDetail } from '@/api/device/receive'
+import type { userType } from '@/views/system/user/user-interface'
+import { getUserList } from '@/api/system/user'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+
+const $route = useRoute()
+const { proxy } = getCurrentInstance() as any
+const useDeptList = ref<deptType[]>([]) // 部门列表
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const total = ref(20)// 总数
+// 表单数据
+const form = ref({
+  id: '',
+  processId: '', // 流程id--查询审批记录使用
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 领用时间
+  applyDesc: '', // 申请说明
+})
+const list = ref<IdeviceList[]>([])// 表格数据
+// 查询条件
+const listQuery: Ref<IdeviceListQuery> = ref({
+  equipmentName: '', // 仪器名称
+  equipmentNo: '', // 设备编号
+  modelNo: '', // 型号
+  mesureRange: '', // 测量范围
+  useDeptName: '', // 使用部门
+  usePersonName: '', // 使用人
+  managerStateName: '', // 管理状态
+  validDate: '', // 有效日期
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '设备编号', value: 'equipmentNo', align: 'center', width: '230' },
+  { text: '设备名称', value: 'equipmentName', align: 'center' },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: '测量范围', value: 'mesureRange', align: 'center' },
+  { text: '使用部门', value: 'useDeptName', align: 'center' },
+  { text: '使用人', value: 'usePersonName', align: 'center' },
+  { text: '管理状态', value: 'managerStateName', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center' },
+])
+
+// 编辑、详情--获取详细信息
+const fetchReceiveApplyListDetail = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
+    form.value.applyUnit = res.data.applyUnit // 部门
+    form.value.applyName = res.data.applyName// 申请名称
+    form.value.applyPerson = res.data.applyPerson// 申请人
+    form.value.time = res.data.time // 领用时间
+    form.value.applyDesc = res.data.applyDesc // 申请说明
+    list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
+      return {
+        ...item,
+        validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+      }
+    })
+    loading.close()
+  })
+}
+
+// 点击关闭
+const $router = useRouter()
+const close = () => {
+  $router.back()
+}
+
+// 打印
+const printObj = ref({
+  id: 'lysq', // 需要打印元素的id
+  popTitle: '设备领用详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备领用详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+  })
+}
+
+// 获取使用部门
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res: any) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+onMounted(async () => {
+  form.value.id = $route.query.id as string // id
+  form.value.processId = $route.query.processId as string // 任务id
+
+  // 获取部门信息
+  await fetchDeptTreeList()
+  // 获取人员列表
+  await fetchUserList()
+  // 编辑、详情获取详情页信息
+  fetchReceiveApplyListDetail() // 获取详细信息
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="设备领用处理-详情">
+      <template #btns>
+        <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div id="lysq" class="lysq-create-check">
+      <div class="top-info">
+        <detail-block title="领用申请">
+          <div class="form-area">
+            <el-form
+              ref="ruleFormRef"
+              :model="form"
+              label-width="120px"
+            >
+              <el-row :gutter="24">
+                <el-col :span="6">
+                  <el-form-item label="申请名称" prop="applyName">
+                    <el-input v-model="form.applyName" disabled />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="申请单位" prop="applyUnit">
+                    <dept-select
+                      v-model="form.applyUnit"
+                      :data="useDeptList"
+                      disabled
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="申请人" prop="applyPerson">
+                    <el-select v-model="form.applyPerson" disabled style="width: 100%;">
+                      <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="领用时间" prop="time">
+                    <el-date-picker
+                      v-model="form.time"
+                      type="datetime"
+                      format="YYYY-MM-DD hh:mm"
+                      value-format="YYYY-MM-DD hh:mm"
+                      disabled
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="申请说明" prop="applyDesc">
+                    <el-input v-model="form.applyDesc" type="textarea" disabled autosize />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
+          </div>
+        </detail-block>
+      </div>
+      <detail-block title="设备领用列表">
+        <el-table
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          />
+        </el-table>
+      </detail-block>
+      <detail-block title="审批流程">
+        <approval-record :process-id="form.processId" />
+      </detail-block>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.lysq-create-check {
+  margin-top: 10px;
+
+  .top-info {
+    display: flex;
+    flex-direction: column;
+    width: 100%;
+    padding-right: 10px;
+    border-radius: 10px;
+    background-color: #fff;
+    // padding: 10px;
+
+    .title-button {
+      display: flex;
+      align-items: center;
+
+      &::before {
+        content: "";
+        flex: 1;
+      }
+
+      .button-group {
+        flex: 1;
+        display: flex;
+        justify-content: flex-end;
+      }
+    }
+
+    .form-area {
+      margin-top: 40px;
+    }
+  }
+}
+</style>
+
+<style lang="scss">
+.lysq-create-check {
+  .el-form-item--default .el-form-item__label {
+    color: #000;
+  }
+}
+</style>

diff --git a/src/api/customer/overtime.ts b/src/api/customer/overtime.ts
deleted file mode 100644
index 9f349d6..0000000
--- a/src/api/customer/overtime.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * 到期样品接口
- */
-import request from '../index'
-import type { IOvertimeListQuery } from '@/views/customer/sample/overTime/overtime_list_interface'
-const prefix = '/meter'
-
-// 列表查询
-export function getOverTimeList(data: IOvertimeListQuery) {
-  return request({
-    url: `${prefix}/sample/overtime/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 导出列表
-export function exportOverTimeList(data: Omit<IOvertimeListQuery, 'limit' | 'offset'>) {
-  return request({
-    url: `${prefix}/sample/overtime/listExport`,
-    method: 'post',
-    responseType: 'blob',
-    data,
-  })
-}
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index 2610494..21a9c9e 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -59,3 +59,20 @@
   })
 }
 
+// 查询检定记录
+export function getMesureRecords(data: { id: string }) {
+  return request({
+    url: `${prefix}/sample/mesureRecordsBySampleId`,
+    method: 'post',
+    data,
+  })
+}
+
+// 查询检定证书
+export function getCertification(data: { id: string }) {
+  return request({
+    url: `${prefix}/sample/certificationBySampleId`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components.d.ts b/src/components.d.ts
index 227585d..90f2dde 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -21,6 +21,7 @@
     BarCodeBind: typeof import('./components/BarCodeBind/index.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
+    ButtonBox: typeof import('./components/buttonBox/buttonBox.vue')['default']
     CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default']
     CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
diff --git a/src/components/buttonBox/buttonBox.vue b/src/components/buttonBox/buttonBox.vue
new file mode 100644
index 0000000..cf93686
--- /dev/null
+++ b/src/components/buttonBox/buttonBox.vue
@@ -0,0 +1,49 @@
+<!-- 列表页右上角按钮组 -->
+<script lang="ts" setup name="ButtonBox">
+import type { PropType } from 'vue'
+import { ref } from 'vue'
+import type { IMenu } from '../../views/device/receive/receive'
+
+const props = defineProps({
+  active: String,
+  menu: {
+    type: Array as PropType<IMenu[]>,
+  },
+})
+const emits = defineEmits(['changeCurrentButton'])
+
+const current = ref('')
+watch(current, (newValue) => {
+  emits('changeCurrentButton', newValue)
+})
+watch(() => props.active, (newValue) => {
+  current.value = newValue!
+  console.log('pppppp', newValue)
+})
+</script>
+
+<template>
+  <div class="container">
+    <div class="btns">
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.id" :label="item.id">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 69px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 36f5104..fb6758e 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -481,7 +481,7 @@
       {
         path: 'applyList',
         name: 'ApplyList',
-        component: () => import('@/views/device/receive/applyList.vue'),
+        component: () => import('@/views/device/receive/apply/applyList.vue'),
         meta: {
           title: '设备领用申请',
           icon: 'ep:key',
@@ -491,7 +491,7 @@
       {
         path: ':type',
         name: 'ApplyListDetail',
-        component: () => import('@/views/device/receive/createOrCheck.vue'),
+        component: () => import('@/views/device/receive/apply/applyEdit.vue'),
         meta: {
           title: '设备领用申请',
           icon: 'ep:key',
@@ -503,7 +503,7 @@
       {
         path: 'solveList',
         name: 'SolveList',
-        component: () => import('@/views/device/receive/solveList.vue'),
+        component: () => import('@/views/device/receive/solve/solveList.vue'),
         meta: {
           title: '设备领用处理',
           icon: 'ep:key',
@@ -513,7 +513,7 @@
       {
         path: 'solveDetail',
         name: 'SolveListDetail',
-        component: () => import('@/views/device/receive/solveComponent/detail.vue'),
+        component: () => import('@/views/device/receive/solve/solveDetail.vue'),
         meta: {
           title: '设备领用处理',
           icon: 'ep:key',
diff --git a/src/views/customer/bench/bench.vue b/src/views/customer/bench/bench.vue
index 6b502fc..3b8f274 100644
--- a/src/views/customer/bench/bench.vue
+++ b/src/views/customer/bench/bench.vue
@@ -1,15 +1,53 @@
 <script lang="ts" setup name="DeviceBench">
-import { getCurrentInstance, ref } from 'vue'
+import { ref } from 'vue'
 import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
 import type { planReturn } from './bench-interface'
 import Linechart from '@/components/Echart/LineChart.vue'
 import type { lineDataI } from '@/components/Echart/echart-interface'
 import { getCustomerExpireData, getHighQualityCustomerList, getSampleAddData, getSampleExpireData } from '@/api/customer/bench'
+import { getSampleList } from '@/api/customer/sampleList'
+import type { IOvertimeListQuery } from '@/views/customer/sample/overTime/overtime_list_interface'
+import { getAdviceList } from '@/api/customer/advice'
+import type { IAdvice, IAdviceQuery } from '@/views/customer/advice/advice_interface'
 
+const reg = /(\d{4})\年(\d{2})月/ // 把2022年3月转为2022-03
 // 每个展示块高度
 const blockHeight = ref(300)
 const blockWidth = ref(400)
-const { proxy } = getCurrentInstance() as any
+
+// 到期样品查询条件
+const dueSampleListQuery: Ref<IOvertimeListQuery> = ref({
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 型号
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  startTime: '', // 检定开始时间
+  endTime: '', // 检定结束时间
+  overtimeStatus: '1', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+  offset: 1,
+  limit: 20,
+})
+
+// 客户关系查询条件
+const customerRelationsListQuery: Ref<IAdviceQuery> = ref({
+  adviceNo: '', // 投诉编号
+  customerName: '', // 公司名称
+  customerNo: '', // 客户编号
+  startTime: '', // 投诉开始时间
+  endTime: '', // 投诉结束时间
+  offset: 1,
+  limit: 20,
+})
+
+const dueSampleTableLoading = ref(false) // 到期样品表格loading
+const customerRelationsTableLoading = ref(false) // 客户关系loading
+const sampleAddLoading = ref(false) // 样品新增趋势loading
+const customerAddLoading = ref(false) // 客户新增趋势loading
+const sampleExpireLoading = ref(false) // 样品到期趋势loading
+const highQualityCustomerLoading = ref(false) // 优质客户名单loading
+
 // 到期样品表格数据
 const dueSampleTableData = ref()
 // 到期样品表头
@@ -64,54 +102,81 @@
   blockWidth.value = (document.body.clientWidth - 180 - 20 - 20) / 3
   console.log(blockHeight.value, blockWidth.value - 20)
 }
+
 window.addEventListener('resize', () => {
   calcBlockSize()
 })
 
 // 获取样品新增趋势数据
 function fetchSampleAddData() {
+  sampleAddLoading.value = true
   getSampleAddData().then((res) => {
-    sampleAddXData.value = res.data.map((item: planReturn) => {
-      // return item.date.replace('年', '-')
-      return item.date
-    })
+    sampleAddXData.value = res.data.map((item: planReturn) => item.date.replace(reg, '$1-$2'))
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     sampleAddYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
-    sampleAddData.value = [{ name: '客户', data: yValue }]
+    sampleAddData.value = [{ name: '样品', data: yValue }]
+    sampleAddLoading.value = false
   })
 }
 
 // 获取样品到期趋势数据
 function fetchSampleExpireData() {
+  sampleExpireLoading.value = true
   getSampleExpireData().then((res) => {
-    sampleExpireXData.value = res.data.map((item: planReturn) => item.date)
+    sampleExpireXData.value = res.data.map((item: planReturn) => item.date.replace(reg, '$1-$2'))
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     sampleExpireYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
-    sampleExpireData.value = [{ name: '客户', data: yValue }]
+    sampleExpireData.value = [{ name: '样品', data: yValue }]
+    sampleExpireLoading.value = false
   })
 }
 
 // 获取优质客户名单
 function fetchHighQualityCustomerList() {
+  highQualityCustomerLoading.value = true
   getHighQualityCustomerList().then((res) => {
     highQualityCustomerTableData.value = res.data.rows
+    highQualityCustomerLoading.value = false
   })
 }
 // 获取客户新增趋势数据
 function fetchCustomerExpireData() {
+  customerAddLoading.value = true
   getCustomerExpireData().then((res) => {
-    customerAddXData.value = res.data.map((item: planReturn) => item.date)
+    customerAddXData.value = res.data.map((item: planReturn) => item.date.replace(reg, '$1-$2'))
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     customerAddYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
     customerAddData.value = [{ name: '客户', data: yValue }]
+    customerAddLoading.value = false
   })
 }
 
 // 获取到期样品表格数据
+function fetchDueSampleTableData() {
+  dueSampleTableLoading.value = true
+  getSampleList(dueSampleListQuery.value).then((response) => {
+    dueSampleTableData.value = response.data.rows
+    dueSampleTableLoading.value = false
+  })
+}
 // 获取客户关系表格数据
+function fetchcustomerRelationsTableData() {
+  customerRelationsTableLoading.value = true
+  getAdviceList(customerRelationsListQuery.value).then((res) => {
+    customerRelationsTabledata.value = res.data.rows.map((item: IAdvice) => {
+      return {
+        ...item,
+        adviceClass: item.adviceClass === '0' ? '建议' : item.adviceClass === '1' ? '投诉' : '其他',
+      }
+    })
+    customerRelationsTableLoading.value = false
+  })
+}
 
 onMounted(() => {
   calcBlockSize()
+  fetchDueSampleTableData() // 到期样品表格
+  fetchcustomerRelationsTableData() // 客户关系表格
   fetchSampleAddData()// 样品新增趋势
   fetchSampleExpireData()// 样品到期趋势
   fetchCustomerExpireData()// 客户新增趋势
@@ -125,6 +190,7 @@
       <el-row :gutter="10">
         <el-col :span="8">
           <bench-col
+            v-loading="dueSampleTableLoading"
             icon="icon-book"
             title="到期样品"
             path-url="/sample/overtime"
@@ -145,6 +211,7 @@
         </el-col>
         <el-col :span="8">
           <bench-col
+            v-loading="sampleAddLoading"
             icon="icon-line"
             title="样品新增趋势"
             :height="blockHeight"
@@ -159,6 +226,7 @@
         </el-col>
         <el-col :span="8">
           <bench-col
+            v-loading="sampleExpireLoading"
             icon="icon-line"
             title="样品到期趋势"
             :height="blockHeight"
@@ -177,6 +245,7 @@
       <el-row :gutter="10">
         <el-col :span="8">
           <bench-col
+            v-loading="customerRelationsTableLoading"
             icon="icon-book"
             title="客户关系"
             path-url="/customerManage/advice"
@@ -197,6 +266,7 @@
         </el-col>
         <el-col :span="8">
           <bench-col
+            v-loading="customerAddLoading"
             icon="icon-line"
             title="客户新增趋势"
             :height="blockHeight"
@@ -211,6 +281,7 @@
         </el-col>
         <el-col :span="8">
           <bench-col
+            v-loading="highQualityCustomerLoading"
             icon="icon-book"
             title="优质客户名单"
             :style="{ height: blockHeight }"
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index e7d1acb..359c94d 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -8,7 +8,7 @@
 import selectCustomer from './selectCustomer.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import { addSample, getCertification, getMesureRecords, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
@@ -69,6 +69,7 @@
   sampleName: '', // 样品名称
   sampleModel: '', // 样品型号
   manufacturingNo: '', // 出厂编号
+  customerId: '', // 委托方id
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   phone: '', // 委托方电话
@@ -138,12 +139,17 @@
 })
 
 // 获取检定记录
-const fetchMeasureRecords = function (query = null) {
-  dataList.value.measureRecords = []
+const fetchMeasureRecords = (query = null) => {
+  getMesureRecords({ id: infoId.value }).then((res) => {
+    dataList.value.measureRecords = res.data.rows
+  })
 }
+
 // 获取检定证书
-const fetchCertifications = function (query = null) {
-  dataList.value.certificationRecords = []
+const fetchCertifications = (query = null) => {
+  getCertification({ id: infoId.value }).then((res) => {
+    dataList.value.certificationRecords = res.data.rows
+  })
 }
 
 // 菜单
@@ -151,12 +157,12 @@
   {
     name: '检定记录',
     columns: [
-      { text: '委托单编号', value: 'orderCode' },
-      { text: '委托单日期', value: 'orderTime' },
-      { text: '委托方代码', value: 'customerCode' },
-      { text: '委托方名称', value: 'customerName' },
-      { text: '送检人', value: 'deliverer' },
-      { text: '送检日期', value: 'deliverTime' },
+      { text: '委托单编号', value: 'orderCode', align: 'center' },
+      { text: '委托单日期', value: 'orderTime', align: 'center' },
+      { text: '委托方代码', value: 'customerCode', align: 'center' },
+      { text: '委托方名称', value: 'customerName', align: 'center' },
+      { text: '送检人', value: 'deliverer', align: 'center' },
+      { text: '送检日期', value: 'deliverTime', align: 'center' },
     ],
     list: 'measureRecords',
     pagination: true,
@@ -165,11 +171,11 @@
   {
     name: '检定证书',
     columns: [
-      { text: '证书编号', value: 'certificationCode' },
-      { text: '证书名称', value: 'certificationName' },
-      { text: '证书类型', value: 'certificationType' },
-      { text: '证书出具日期', value: 'effectiveDate' },
-      { text: '证书有效期', value: 'expirationDate' },
+      { text: '证书编号', value: 'certificationCode', align: 'center' },
+      { text: '证书名称', value: 'certificationName', align: 'center' },
+      { text: '证书类型', value: 'certificationType', align: 'center' },
+      { text: '证书出具日期', value: 'effectiveDate', align: 'center' },
+      { text: '证书有效期', value: 'expirationDate', align: 'center' },
     ],
     list: 'certificationRecords',
     pagination: true,
@@ -233,18 +239,18 @@
 // 委托方代码获取焦点
 const customerNoFocus = () => {
   visible.value = true
-  console.log(visible.value)
 }
 
 // 选好委托方
 const confirmCheckout = (val: Array<ICustomer>) => {
   if (val && val.length) {
     const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo
-    dataForm.value.customerName = getValue.customerName
-    dataForm.value.phone = getValue.phone
-    dataForm.value.postalCode = getValue.postalCode
-    dataForm.value.customerAddress = getValue.briefName
+    dataForm.value.customerNo = getValue.customerNo // 委托方代码
+    dataForm.value.customerId = getValue.id // 委托方id
+    dataForm.value.customerName = getValue.customerName // 委托方名称
+    dataForm.value.phone = getValue.phone // 电话
+    dataForm.value.postalCode = getValue.postalCode // 邮编
+    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
   }
 }
 
@@ -296,6 +302,7 @@
 const getInfo = () => {
   getSapmleDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data
+    dataForm.value.ABC = res.data.abc
     for (const item of menu) {
       item.searchFunc()
     }
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index a2c4307..c3690d4 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -35,6 +35,7 @@
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center', width: '180px' },
 ])
 // 表格数据
@@ -47,6 +48,7 @@
 const checkoutList = ref<string[]>([])
 // 文件上传input
 const fileRef = ref()
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -62,6 +64,7 @@
     loadingTable.value = false
   })
 }
+
 // 多选发生改变时
 function handleSelectionChange(e: any) {
   checkoutList.value = e.map((item: { id: string }) => item.id)
@@ -71,6 +74,7 @@
 const handleEdit = (row: ISampleList, pageType: 'edit' | 'detail') => {
   $router.push(`/sample/${pageType}/${row.id}`)
 }
+
 // 点击删除
 const handleDelete = (row: ISampleList) => {
   ElMessageBox.confirm(
@@ -94,10 +98,12 @@
       })
     })
 }
+
 // 点击搜索
 const searchList = () => {
   fetchData(true)
 }
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -112,7 +118,7 @@
     offset: 1,
     limit: 20,
   }
-  timeRange.value = ['', '']
+  timeRange.value = ['', ''] // 置空筛选时间
   fetchData(true)
 }
 
@@ -138,10 +144,12 @@
     ElMessage.error('请上传pdf格式')
   }
 }
+
 // 模板下载
 const templateDownload = () => {
 
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -157,10 +165,12 @@
 const uploadAll = () => {
   fileRef.value.click()
 }
+
 // 新建样品
 const add = () => {
   $router.push('/sample/add')
 }
+
 // 导出
 const exportAll = () => {
   const loading = ElLoading.service({
@@ -293,11 +303,13 @@
         <template #columns>
           <el-table-column label="操作" align="center" fixed="right" width="120">
             <template #default="{ row }">
+              <!-- 有orderid(关联了委托书)不允许编辑 -->
               <el-button
                 v-if="proxy.hasPerm('/sample/list/update')"
                 size="small"
                 type="primary"
                 link
+                :disabled="`${row.orderId}` !== ''"
                 @click="handleEdit(row, 'edit')"
               >
                 编辑
@@ -310,11 +322,13 @@
               >
                 详情
               </el-button>
+              <!-- 检测中的样品不允许删除 -->
               <el-button
                 v-if="proxy.hasPerm('/sample/list/delete')"
                 size="small"
                 link
                 type="danger"
+                :disabled="row.sampleSatus !== '3'"
                 @click="handleDelete(row)"
               >
                 删除
diff --git a/src/views/customer/sample/list/sample_list_interface.ts b/src/views/customer/sample/list/sample_list_interface.ts
index 707c8b5..81498a5 100644
--- a/src/views/customer/sample/list/sample_list_interface.ts
+++ b/src/views/customer/sample/list/sample_list_interface.ts
@@ -33,6 +33,7 @@
   sampleModel: string // 样品型号
   manufacturingNo: string // 出厂编号
   customerNo: string // 委托方代码
+  customerId: string // 委托方id
   customerName: string // 委托方名称
   phone: string // 委托方电话
   postalCode: string // 委托方邮编
diff --git a/src/views/customer/sample/list/selectCustomer.vue b/src/views/customer/sample/list/selectCustomer.vue
index 5de352d..0eef7d0 100644
--- a/src/views/customer/sample/list/selectCustomer.vue
+++ b/src/views/customer/sample/list/selectCustomer.vue
@@ -6,7 +6,8 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getCustomerList } from '@/api/customer/customer'
 import { getDictByCode } from '@/api/system/dict'
-const props = defineProps({
+
+defineProps({
   visible: {
     type: Boolean,
     default: false,
@@ -14,18 +15,9 @@
 })
 const emits = defineEmits(['changeVisible', 'confirmCheckout'])
 
-const visibleDialog = computed({
-  get() {
-    return props.visible
-  },
-  set(val) {
-    emits('changeVisible', val)
-  },
-})
-
 // 查询条件
 const listQuery: Ref<ICustomerQuery> = ref({
-  bussinessSize: '', // 业务规模
+  businessSize: '', // 业务规模
   customerName: '', // 公司名称
   customerNo: '', // 客户编号
   grade: '', // 履约评级
@@ -37,40 +29,20 @@
   name: string
   value: string
 }
-// const companySizeList = ref<dictType[]>([]) // 公司规模列表
+
 const businessSizeList = ref<dictType[]>([]) // 业务规模列表
 const gradeList = ref<dictType[]>([]) // 履约评级列表
-// const evaluationList = ref<dictType[]>([]) // 整体评价列表
-function getDict() {
-  // // 获取公司规模
-  // getDictByCode('companySize').then((response) => {
-  //   companySizeList.value = response.data
-  // })
-  // 获取业务规模
-  getDictByCode('businessSize').then((response) => {
-    businessSizeList.value = response.data
-  })
-  // 获取履约评级
-  getDictByCode('grade').then((response) => {
-    gradeList.value = response.data
-  })
-  // // 获取整体评价
-  // getDictByCode('evaluation').then((response) => {
-  //   evaluationList.value = response.data
-  // })
-}
-getDict()
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '客户编号', value: 'customerNo', width: '160', align: 'center', fixed: true },
-  { text: '客户名称', value: 'customerName', width: '120', align: 'center', fixed: true },
-  { text: '公司规模', value: 'companySizeName', align: 'center', fixed: false },
-  { text: '业务规模', value: 'businessSizeName', align: 'center', fixed: false },
-  { text: '履约评级', value: 'gradeName', align: 'center', fixed: false },
-  { text: '整体评价', value: 'evaluationName', align: 'center', fixed: false },
-  { text: '公司地址', value: 'briefName', align: 'center', fixed: false },
-  { text: '创建时间', value: 'createTime', align: 'center', width: '180px', fixed: false },
-  { text: '备注', value: 'remark', align: 'center', fixed: false },
+  { text: '客户名称', value: 'customerName', align: 'center', fixed: true },
+  { text: '公司规模', value: 'companySizeName', width: '110', align: 'center' },
+  { text: '业务规模', value: 'businessSizeName', width: '130', align: 'center' },
+  { text: '履约评级', value: 'gradeName', width: '90', align: 'center' },
+  { text: '整体评价', value: 'evaluationName', width: '110', align: 'center' },
+  { text: '公司地址', value: 'fullAddress', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
+  { text: '备注', value: 'remark', align: 'center' },
 ])
 // 表格数据
 const list = ref<ICustomer[]>([])
@@ -81,44 +53,42 @@
 // 选中的内容
 const checkoutList = ref<string[]>([])
 
-// 数据查询
+function getDict() {
+  // 获取业务规模
+  getDictByCode('businessSize').then((response) => {
+    businessSizeList.value = response.data
+  })
+  // 获取履约评级
+  getDictByCode('grade').then((response) => {
+    gradeList.value = response.data
+  })
+}
+getDict()
+
+// 表格数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getCustomerList(listQuery.value).then((response) => {
-  //   // 模拟数据
-  //   response.data.rows = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', customerAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  //   list.value = response.data.rows.map((item: ICustomer) => {
-  //     if (item.companyProvinceName && item.companyCityName) {
-  //       item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-  //     }
-  //     else {
-  //       item.briefName = item.companyProvinceName || item.companyCityName
-  //     }
-  //     return item
-  //   })
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-
-  // 模拟数据
-  const response = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', customerAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' },
-    { bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', customerAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '2集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' },
-    { bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', customerAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '3集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  list.value = response.map((item: ICustomer) => {
-    if (item.companyProvinceName && item.companyCityName) {
-      item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-    }
-    else {
-      item.briefName = item.companyProvinceName || item.companyCityName
-    }
-    return item
+  getCustomerList(listQuery.value).then((response) => {
+    // 模拟数据
+    list.value = response.data.rows.map((item: ICustomer) => {
+      if (item.addressProvinceName && item.addressCityName) {
+        item.fullAddress = `${item.addressProvinceName}/${item.addressCityName}`
+      }
+      else if (item.addressProvinceName || item.addressCityName) {
+        item.fullAddress = item.addressProvinceName || item.addressCityName
+      }
+      else if (item.addressCountryName) {
+        item.fullAddress = item.addressCountryName
+      }
+      return item
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
   })
-  total.value = 50
-  loadingTable.value = false
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -131,7 +101,7 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    bussinessSize: '', // 业务规模
+    businessSize: '', // 业务规模
     customerName: '', // 公司名称
     customerNo: '', // 客户编号
     grade: '', // 履约评级
@@ -155,9 +125,9 @@
 const cancle = () => {
   emits('changeVisible', false)
 }
+
 // 点击确定
 const clickConfirm = () => {
-  console.log(checkoutList.value)
   if (!checkoutList.value.length) {
     ElMessage({
       message: '请选中',
diff --git a/src/views/customer/sample/overTime/detail.vue b/src/views/customer/sample/overTime/detail.vue
index f553724..1adcbf8 100644
--- a/src/views/customer/sample/overTime/detail.vue
+++ b/src/views/customer/sample/overTime/detail.vue
@@ -184,6 +184,7 @@
 const getInfo = () => {
   getSapmleDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data
+    dataForm.value.ABC = res.data.abc
     for (const item of menu) {
       item.searchFunc()
     }
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index c8f90a1..05fe276 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -19,8 +19,8 @@
   sampleModel: '', // 型号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
-  startTime: '1', // 检定开始时间
-  endTime: '1', // 检定结束时间
+  startTime: '', // 检定开始时间
+  endTime: '', // 检定结束时间
   overtimeStatus: '1', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
   offset: 1,
   limit: 20,
diff --git a/src/views/device/receive/apply/applyEdit.vue b/src/views/device/receive/apply/applyEdit.vue
new file mode 100644
index 0000000..5194bdb
--- /dev/null
+++ b/src/views/device/receive/apply/applyEdit.vue
@@ -0,0 +1,552 @@
+<script lang="ts" setup name="CreateOrCheck">
+import { onMounted, reactive, ref } from 'vue'
+import type { Ref } from 'vue'
+import dayjs from 'dayjs'
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { useRoute, useRouter } from 'vue-router'
+import type { IdeviceList, IdeviceListQuery } from '../receive'
+import SelectDeviceDialog from '../selectDeviceDialog.vue'
+import { toTreeList } from '@/utils/structure'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import {
+  getReceiveApplyListDetail,
+  saveAddReceiveApplyList,
+  saveEditReceiveApplyList,
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import type { userType } from '@/views/system/user/user-interface'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { getDeptTreeList } from '@/api/system/dept'
+import { getUserList } from '@/api/system/user'
+import { submitApproval } from '@/api/approval'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+
+const $route = useRoute()
+const approvalDialog = ref() // 审批对话框显隐
+const typeValue = ref() // add、edit、detail
+const approvalStatus = ref() // 审批类型
+const useDeptList = ref<deptType[]>([]) // 部门列表
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false)
+const isMulti = ref(false) // 是否批量添加(允许多选)
+const selectIndex = ref() // 点击选择的index--点击第几行
+const dialogSelectDiviceVisible = ref(false) // 控制选择设备对话框显隐
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+// 选中的内容
+const checkoutList = ref([])
+// 表单数据
+const form = ref({
+  taskId: '', // 任务id（审批用）
+  id: '',
+  processId: '', // 流程id--查询审批记录使用
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 领用时间
+  applyDesc: '', // 申请说明
+})
+const ruleFormRef = ref<FormInstance>() as any
+const list = ref<IdeviceList[]>([])// 表格数据
+
+// 查询条件
+const listQuery: Ref<IdeviceListQuery> = ref({
+  equipmentName: '', // 仪器名称
+  equipmentNo: '', // 设备编号
+  modelNo: '', // 型号
+  mesureRange: '', // 测量范围
+  useDeptName: '', // 使用部门
+  usePersonName: '', // 使用人
+  managerStateName: '', // 管理状态
+  validDate: '', // 有效日期
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '设备编号', value: 'equipmentNo', align: 'center', width: '230' },
+  { text: '设备名称', value: 'equipmentName', align: 'center' },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: '测量范围', value: 'mesureRange', align: 'center' },
+  { text: '使用部门', value: 'useDeptName', align: 'center' },
+  { text: '使用人', value: 'usePersonName', align: 'center' },
+  { text: '管理状态', value: 'managerStateName', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center' },
+])
+// 表单校验规则
+const rules = reactive<FormRules>({
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'change' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  time: [{ type: 'date', required: true, message: '领用时间不能为空', trigger: 'change' }],
+  applyDesc: [{ required: true, message: '申请说明不能为空', trigger: 'blur' }],
+})
+
+const $router = useRouter()
+// 点击关闭
+const close = () => {
+  $router.back()
+}
+
+const handleClick = (val: string) => {
+  if (val === 'agree') { // 同意
+    approvalDialog.value.initDialog('agree', form.value.taskId)
+  }
+  else if (val === 'reject') { // 驳回
+    approvalDialog.value.initDialog('reject', form.value.taskId)
+  }
+  else if (val === 'refuse') { // 拒绝
+    approvalDialog.value.initDialog('refuse', form.value.taskId)
+  }
+  else if (val === 'revoke') {
+    const params = {
+      taskId: form.value.taskId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认撤回该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        submitApproval('revoke', params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已撤回',
+          })
+        })
+        close()
+      })
+  }
+}
+
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+
+// 删除行
+const delRow = () => {
+  if (checkoutList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    checkoutList.value.forEach((item: IdeviceListQuery) => {
+      list.value.forEach((element, index) => {
+        if (element.equipmentNo === item.equipmentNo) {
+          list.value.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+
+// 增加行
+const addRow = () => {
+  const index = list.value.findIndex(item => !item.equipmentNo)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条设备信息')
+    return
+  }
+  list.value.push({
+    equipmentName: '', // 设备名称
+    equipmentNo: '', // 设备编号
+    modelNo: '', // 型号
+    mesureRange: '', // 测量范围
+    useDeptName: '', // 使用部门
+    usePersonName: '', // 使用人
+    managerStateName: '', // 管理状态
+    validDate: '', // 有效日期
+    equipmentId: '', // 设备ID
+  })
+}
+
+// 点击选择
+const handleSelect = (index: number, row: IdeviceList) => {
+  dialogSelectDiviceVisible.value = true // 选择设备对话框显隐
+  isMulti.value = false // 是否单选, false单选、true表格多选
+  selectIndex.value = index
+}
+
+// 点击批量添加
+const multiAdd = () => {
+  dialogSelectDiviceVisible.value = true
+  isMulti.value = true
+}
+
+// 选择设备对话框关闭
+const closeDialog = () => {
+  dialogSelectDiviceVisible.value = false
+}
+
+// 选择好设备了, 添加选好的设备到表格中
+const updateDeviceConfirm = (val: Array<IdeviceList>) => {
+  if (isMulti.value) { // 批量增加时push
+    val.forEach((item: IdeviceList) => {
+    // 只添加列表里不存在的
+      const index = list.value.findIndex((i: IdeviceList) => item.equipmentNo === i.equipmentNo)
+      if (index === -1) {
+        list.value.push(item)
+      }
+    })
+  }
+  else { // 单选替换
+    const index = list.value.findIndex((i: IdeviceList) => val[0].equipmentNo === i.equipmentNo)
+    if (index !== -1) {
+      ElMessage.warning('此设备已添加过')
+      return
+    }
+    list.value.splice(selectIndex.value, 1, val[0])
+  }
+}
+
+// 保存
+const save = () => {
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      // 保存之前清除空行、避免传给后端无用空对象
+      const index = list.value.findIndex((item: IdeviceList) => !item.equipmentNo)
+      if (index !== -1) {
+        list.value.splice(index, 1)
+      }
+      const params = {
+        applyName: form.value.applyName, // 申请名称
+        applyUnit: form.value.applyUnit, // 申请单位
+        applyPerson: form.value.applyPerson, // 申请人
+        time: form.value.time, // 领用时间
+        applyDesc: form.value.applyDesc, // 申请说明
+        applyType: '1', // 申请类型 领用1
+        id: form.value.id,
+        equipmentList: list.value.map((item) => {
+          return {
+            equipmentId: item.id!,
+          }
+        }),
+      }
+      // 新建
+      if (typeValue.value === 'add') {
+        saveAddReceiveApplyList(params).then((res) => {
+          form.value.id = res.data
+          ElMessage.success('保存成功')
+          loading.close()
+        })
+      }
+      // 保存
+      else if (typeValue.value === 'edit') {
+        saveEditReceiveApplyList(params).then((res) => {
+          form.value.id = res.data
+          ElMessage.success('保存成功')
+          loading.close()
+        })
+      }
+    }
+    else {
+      console.log('表单校验不通过')
+    }
+  })
+}
+
+// 提交表单
+const submit = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (form.value.id) {
+    const params = {
+      id: form.value.id,
+      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL, // 表单id
+    }
+    submitReceiveApplyList(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    })
+  }
+  else {
+    ElMessage.info('请先保存再提交！')
+  }
+}
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 获取使用部门
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res: any) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+// 审批结束回调
+const approvalSuccess = () => {
+  close()
+}
+
+// 编辑、详情--获取详细信息
+const fetchReceiveApplyListDetail = () => {
+  getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
+    form.value.applyUnit = res.data.applyUnit // 部门
+    form.value.applyName = res.data.applyName // 申请名称
+    form.value.applyPerson = res.data.applyPerson// 申请人
+    form.value.time = res.data.time // 领用时间
+    form.value.applyDesc = res.data.applyDesc // 申请说明
+    list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
+      return {
+        ...item,
+        validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+      }
+    })
+  })
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+onMounted(() => {
+  typeValue.value = $route.query.typeValue // 类型add、edit、detail
+  form.value.id = $route.query.id as string // id
+  form.value.taskId = $route.query.taskId as string // 任务id
+  form.value.processId = $route.query.processId as string // 任务id
+  approvalStatus.value = $route.query.approvalStatus // 审批类型
+  // 编辑、详情获取详情页信息
+  if (typeValue.value === 'edit' || typeValue.value === 'detail') {
+    fetchReceiveApplyListDetail() // 获取详细信息
+  }
+
+  // 获取部门信息
+  fetchDeptTreeList()
+  // 获取人员列表--申请人使用
+  fetchUserList()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`设备领用申请-${textMap[typeValue]}`">
+      <template #btns>
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('agree')">
+          同意
+        </el-button>
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('reject')">
+          驳回
+        </el-button>
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('refuse')">
+          拒绝
+        </el-button>
+        <el-button v-if="typeValue === 'add'" type="primary" @click="submit">
+          提交
+        </el-button>
+        <el-button v-if="typeValue === 'add' || typeValue === 'edit'" type="primary" @click="save">
+          保存
+        </el-button>
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '3'" type="primary" @click="handleClick('revoke')">
+          撤回
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div class="create-check">
+      <div class="top-info">
+        <!-- 表单 -->
+        <div class="form-area">
+          <el-form
+            ref="ruleFormRef"
+            :model="form"
+            label-width="120px"
+            :rules="rules"
+          >
+            <el-row :gutter="24">
+              <el-col :span="6">
+                <el-form-item label="申请名称" prop="applyName">
+                  <el-input
+                    v-model="form.applyName"
+                    :placeholder="typeValue === 'detail' ? '' : '请输入申请名称'"
+                    clearable
+                    :disabled="typeValue === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="申请单位" prop="applyUnit">
+                  <dept-select
+                    v-model="form.applyUnit"
+                    placeholder="请选择申请单位"
+                    :data="useDeptList"
+                    :disabled="typeValue === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="申请人" prop="applyPerson">
+                  <el-select
+                    v-model="form.applyPerson"
+                    :disabled="typeValue === 'detail'"
+                    placeholder="请选择申请人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="领用时间" prop="time">
+                  <el-date-picker
+                    v-model="form.time"
+                    type="datetime"
+                    placeholder="请选择领用时间"
+                    format="YYYY-MM-DD hh:mm"
+                    value-format="YYYY-MM-DD hh:mm"
+                    :disabled="typeValue === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="申请说明" prop="applyDesc">
+                  <el-input v-model="form.applyDesc" type="textarea" autosize clearable :disabled="typeValue === 'detail'" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </div>
+      </div>
+      <!-- 表格 -->
+      <detail-block title="设备领用列表">
+        <template #btns>
+          <el-button v-if="typeValue !== 'detail'" type="primary" @click="multiAdd">
+            批量添加
+          </el-button>
+          <el-button v-if="typeValue !== 'detail'" type="primary" @click="addRow">
+            增加行
+          </el-button>
+          <el-button v-if="typeValue !== 'detail'" type="info" @click="delRow">
+            删除行
+          </el-button>
+        </template>
+        <el-table
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column v-if="typeValue !== 'detail'" type="selection" width="38" />
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          >
+            <template v-if="item.value === 'equipmentNo' && (typeValue === 'add' || typeValue === 'edit')" #default="scope">
+              <el-input v-model="scope.row.equipmentNo" placeholder="请选择设备" class="input">
+                <template #append>
+                  <el-button size="small" @click="handleSelect(scope.$index, scope.row)">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+
+      <detail-block v-if="typeValue === 'detail'" title="审批流程">
+        <approval-record :process-id="form.processId" />
+      </detail-block>
+    </div>
+    <select-device-dialog
+      :dialog-select-divice-visible="dialogSelectDiviceVisible"
+      :is-multi="isMulti"
+      @closeDialog="closeDialog"
+      @updateDeviceConfirm="updateDeviceConfirm"
+    />
+
+    <!-- 同意、驳回、拒绝对话框显示 -->
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.create-check {
+  margin-top: 10px;
+
+  .top-info {
+    display: flex;
+    flex-direction: column;
+    width: 100%;
+    padding-right: 10px;
+    border-radius: 10px;
+    background-color: #fff;
+    // padding: 10px;
+
+    .title-button {
+      display: flex;
+      align-items: center;
+
+      &::before {
+        content: "";
+        flex: 1;
+      }
+
+      .button-group {
+        flex: 1;
+        display: flex;
+        justify-content: flex-end;
+      }
+    }
+
+    .form-area {
+      margin-top: 40px;
+    }
+  }
+}
+</style>
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
new file mode 100644
index 0000000..abf559c
--- /dev/null
+++ b/src/views/device/receive/apply/applyList.vue
@@ -0,0 +1,542 @@
+<script lang="ts" setup name="ApplyList">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+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 ButtonBox from '@/components/buttonBox/buttonBox.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { exportFile } from '@/utils/exportUtils'
+import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import {
+  delReceiveApplyList,
+  exportReceiveApplyList,
+  getReceiveApplyList,
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import { submitApproval } from '@/api/approval'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import type { userType } from '@/views/system/user/user-interface'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { getUserList } from '@/api/system/user'
+
+const loadingTable = ref(false) // 表格loading
+const active = ref('') // 选中的按钮
+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 listQuery: Ref<IlistQuery> = ref({
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  approvalStatus: active.value, // 	审批状态
+  processResult: '', // 	处置结果
+  applyType: '1', // 申请类型 领用1
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+  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 columns = ref<TableColumn[]>([
+  { text: '申请编号', value: 'applyNo', align: 'center' },
+  { text: '申请名称', value: 'applyName', align: 'center' },
+  { text: '申请部门', value: 'applyUnitName', align: 'center' },
+  { text: '申请人', value: 'applyPersonName', align: 'center' },
+  { text: '领用时间', value: 'time', align: 'center' },
+  { text: '申请说明', value: 'applyDesc', align: 'center' },
+  { text: '审批状态', value: 'approvalStatus', align: 'center' },
+])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 筛选时间段数据
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.startTime = timeRange.value[0] as string || ''
+  listQuery.value.endTime = timeRange.value[1] as string || ''
+  listQuery.value.approvalStatus = active.value
+  getReceiveApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IlistType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap[item.approvalStatus],
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: active.value, // 	审批状态
+    processResult: '', // 	处置结果
+    applyType: '1', // 申请类型 领用1
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', '']
+  fetchData(true)
+}
+
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+const $router = useRouter()
+
+// 新建
+const add = () => {
+  $router.push({ path: '/receive/add', query: { typeValue: 'add' } })
+}
+
+// 导出
+const exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    const params = {
+      applyNo: listQuery.value.applyNo, // 申请编号
+      applyName: listQuery.value.applyName, // 申请名称
+      applyUnit: listQuery.value.applyUnit, // 申请部门
+      applyPerson: listQuery.value.applyPerson, // 申请人
+      startTime: listQuery.value.startTime, // 申请开始日期
+      endTime: listQuery.value.endTime, // 申请结束日期
+      approvalStatus: listQuery.value.approvalStatus, // 	审批状态
+      processResult: listQuery.value.processResult, // 	处置结果
+      applyType: listQuery.value.applyType, // 申请类型 领用0
+      createUser: listQuery.value.createUser, // 创建人
+      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+      offset: 1,
+      limit: 20,
+      ids: checkoutList.value,
+    }
+    // 调导出接口
+    exportReceiveApplyList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备领用申请列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备领用申请列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: IlistType) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备领用申请列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 操作
+const handleEdit = (row: IlistType, val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      taskId: row.taskId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        submitApproval('revoke', params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+        })
+        fetchData(true)
+      })
+  }
+  else if (val === '删除') {
+    ElMessageBox.confirm(
+      '确认删除该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        delReceiveApplyList({ id: row.id, taskId: row.taskId }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '提交') {
+    ElMessageBox.confirm(
+      '确认提交该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        submitReceiveApplyList({ id: row.id, formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已提交',
+          })
+        })
+        fetchData(true)
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', row.taskId)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', row.taskId)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', row.taskId)
+  }
+  else if (val === '查看' || val === '编辑') {
+    $router.push({
+      path: `/receive/${title}`,
+      query: {
+        typeValue: title,
+        approvalStatus: approvalStatusReserveMap[row.approvalStatus],
+        id: row.id,
+        taskId: row.taskId,
+        processId: row.processId, // 查询审批记录使用
+      },
+    })
+  }
+}
+// 按钮切换
+const changeCurrentButton = (val: string) => {
+  active.value = val
+  window.sessionStorage.setItem('buttonBoxActive', val)
+  clearList()
+}
+
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 获取用户列表(增加模糊查询)
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 获取使用部门
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res: any) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+onMounted(() => {
+  if (window.sessionStorage.getItem('buttonBoxActive')) {
+    active.value = window.sessionStorage.getItem('buttonBoxActive')!
+  }
+  else {
+    active.value = '0' // 全部
+  }
+  nextTick(() => {
+    fetchData(true) // 获取表格数据
+    // 获取使用部门
+    fetchDeptTreeList() // 获取使用部门
+    fetchUserList() // 获取人员列表
+  })
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyNo"
+          placeholder="申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyName"
+          placeholder="申请名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.applyPerson"
+          placeholder="请选择申请人"
+          style="width: 100%;"
+          filterable
+          remote
+          remote-show-suffix
+          :remote-method="remoteMethod"
+          :loading="applyPersonLoading"
+        >
+          <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY-MM-DD hh:mm"
+          value-format="YYYY-MM-DD hh:mm"
+          start-placeholder="领用开始时间"
+          end-placeholder="领用结束时间"
+        />
+      </search-item>
+    </search-area>
+
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @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="220" fixed="right">
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="handleEdit(row, '查看', 'detail')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (active === '0' || active === '2')"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (active === '0' || active === '2')"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (active === '0' || active === '2')"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '编辑', 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (active === '0' || active === '3')"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (active !== '4' && active !== '5')"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatus === '未通过' || row.approvalStatus === '已通过'"
+                @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+    <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
+
diff --git a/src/views/device/receive/applyList.vue b/src/views/device/receive/applyList.vue
deleted file mode 100644
index 63e1ee8..0000000
--- a/src/views/device/receive/applyList.vue
+++ /dev/null
@@ -1,523 +0,0 @@
-<script lang="ts" setup name="ApplyList">
-import { ref } from 'vue'
-import type { Ref } from 'vue'
-import type { DateModelType } from 'element-plus'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { useRouter } from 'vue-router'
-import type { IlistQuery, IlistType } from '@/views/device/receive/receive'
-import ButtonBox from '@/views/device/receive/buttonBox.vue'
-import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-import { exportFile } from '@/utils/exportUtils'
-import { printJSON } from '@/utils/printUtils'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
-import {
-  delReceiveApplyList,
-  exportReceiveApplyList,
-  getReceiveApplyList,
-  submitReceiveApplyList,
-} from '@/api/device/receive'
-import { submitApproval } from '@/api/approval'
-import { getDeptTreeList } from '@/api/system/dept'
-import { toTreeList } from '@/utils/structure'
-import type { userType } from '@/views/system/user/user-interface'
-import type { deptType } from '@/views/device/standingBook/standingBook-interface'
-import { getUserList } from '@/api/system/user'
-
-const loadingTable = ref(false) // 表格loading
-const active = ref('0') // 选中的按钮
-const approvalDialog = ref() // 审批对话框显隐
-const useDeptList = ref<deptType[]>([]) // 部门列表
-const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
-const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
-const applyPersonLoading = ref(false) // 申请人模糊搜索框loading
-
-// 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  applyNo: '', // 申请编号
-  applyName: '', // 申请名称
-  applyUnit: '', // 申请部门id
-  applyUnitName: '', // 申请部门名称
-  applyPerson: '', // 申请人id
-  applyPersonName: '', // 申请人姓名
-  startTime: '', // 领用开始日期
-  endTime: '', // 领用结束日期
-  approvalStatus: '', // 	审批状态
-  processResult: '', // 	处置结果
-  applyType: '1', // 申请类型 领用1
-  createUser: '', // 创建人
-  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
-  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 columns = ref<TableColumn[]>([
-  { text: '申请编号', value: 'applyNo', align: 'center' },
-  { text: '申请名称', value: 'applyName', align: 'center' },
-  { text: '申请部门', value: 'applyUnitName', align: 'center' },
-  { text: '申请人', value: 'applyPersonName', align: 'center' },
-  { text: '领用时间', value: 'time', align: 'center' },
-  { text: '申请说明', value: 'applyDesc', align: 'center' },
-  { text: '审批状态', value: 'approvalStatus', align: 'center' },
-])
-// 选中的内容
-const checkoutList = ref<string[]>([])
-// 筛选时间段数据
-const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-
-// 数据查询
-function fetchData(isNowPage = false) {
-  loadingTable.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.value.offset = 1
-  }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
-  listQuery.value.approvalStatus = active.value
-  getReceiveApplyList(listQuery.value).then((response) => {
-    list.value = response.data.rows.map((item: IlistType) => {
-      return {
-        ...item,
-        approvalStatus: approvalStatusMap[item.approvalStatus],
-      }
-    })
-    total.value = parseInt(response.data.total)
-    loadingTable.value = false
-  })
-}
-
-// 重置
-const clearList = () => {
-  listQuery.value = {
-    applyNo: '', // 申请编号
-    applyName: '', // 申请名称
-    applyUnit: '', // 申请部门
-    applyPerson: '', // 申请人
-    startTime: '', // 申请开始日期
-    endTime: '', // 申请结束日期
-    approvalStatus: '', // 	审批状态
-    processResult: '', // 	处置结果
-    applyType: '1', // 申请类型 领用1
-    createUser: '', // 创建人
-    formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
-    offset: 1,
-    limit: 20,
-  }
-  timeRange.value = ['', '']
-  fetchData(true)
-}
-
-// 搜索
-const searchList = () => {
-  fetchData(true)
-}
-
-// 多选发生改变时
-const handleSelectionChange = (e: any) => {
-  checkoutList.value = e.map((item: { id: string }) => item.id)
-}
-const $router = useRouter()
-
-// 新建
-const add = () => {
-  $router.push({ path: '/receive/add', query: { typeValue: 'add' } })
-}
-
-// 导出
-const exportAll = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: '下载中请稍后',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (list.value.length > 0) {
-    const params = {
-      applyNo: listQuery.value.applyNo, // 申请编号
-      applyName: listQuery.value.applyName, // 申请名称
-      applyUnit: listQuery.value.applyUnit, // 申请部门
-      applyPerson: listQuery.value.applyPerson, // 申请人
-      startTime: listQuery.value.startTime, // 申请开始日期
-      endTime: listQuery.value.endTime, // 申请结束日期
-      approvalStatus: listQuery.value.approvalStatus, // 	审批状态
-      processResult: listQuery.value.processResult, // 	处置结果
-      applyType: listQuery.value.applyType, // 申请类型 领用0
-      createUser: listQuery.value.createUser, // 创建人
-      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
-      offset: 1,
-      limit: 20,
-      ids: checkoutList.value,
-    }
-    // 调导出接口
-    exportReceiveApplyList(params).then((res) => {
-      const blob = new Blob([res.data])
-      exportFile(blob, '设备领用申请列表.xlsx')
-    })
-  }
-  else {
-    ElMessage.warning('无数据可导出数据')
-  }
-  loading.close()
-}
-
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  fetchData(true)
-}
-
-// 打印列表
-function printList() {
-  // 打印列
-  const properties = columns.value.map((item) => {
-    return {
-      field: item.value,
-      displayName: item.text,
-    }
-  })
-  if (checkoutList.value.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '设备领用申请列表')
-  }
-  else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: IlistType) => checkoutList.value.includes(item.id))
-    printJSON(printList, properties, '设备领用申请列表')
-  }
-  else {
-    ElMessage.warning('无可打印内容')
-  }
-}
-
-// 操作
-const handleEdit = (row: IlistType, val: string, title = '') => {
-  if (val === '取消') {
-    const params = {
-      taskId: row.taskId!,
-      comments: '',
-    }
-    ElMessageBox.confirm(
-      '确认取消该审批吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        submitApproval('revoke', params).then((res) => {
-          ElMessage({
-            type: 'success',
-            message: '取消成功',
-          })
-        })
-        fetchData(true)
-      })
-  }
-  else if (val === '删除') {
-    ElMessageBox.confirm(
-      '确认删除该审批吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        delReceiveApplyList({ id: row.id, taskId: row.taskId }).then((res) => {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          fetchData(true)
-        })
-      })
-  }
-  else if (val === '提交') {
-    ElMessageBox.confirm(
-      '确认提交该审批吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        submitReceiveApplyList({ id: row.id, formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL }).then((res) => {
-          ElMessage({
-            type: 'success',
-            message: '已提交',
-          })
-        })
-        fetchData(true)
-      })
-  }
-  else if (val === '同意') {
-    approvalDialog.value.initDialog('agree', row.taskId)
-  }
-  else if (val === '驳回') {
-    approvalDialog.value.initDialog('reject', row.taskId)
-  }
-  else if (val === '拒绝') {
-    approvalDialog.value.initDialog('refuse', row.taskId)
-  }
-  else if (val === '查看' || val === '编辑') {
-    $router.push({
-      path: `/receive/${title}`,
-      query: {
-        typeValue: title,
-        approvalStatus: approvalStatusReserveMap[row.approvalStatus],
-        id: row.id,
-        taskId: row.taskId,
-        processId: row.processId, // 查询审批记录使用
-      },
-    })
-  }
-}
-// 按钮切换
-const changeCurrentButton = (val: string) => {
-  active.value = val
-  clearList()
-}
-
-// 审批结束回调
-const approvalSuccess = () => {
-  fetchData(true)
-}
-
-// 选择器模糊查询
-const remoteMethod = (query: string) => {
-  if (query) {
-    applyPersonLoading.value = true
-    setTimeout(() => {
-      applyPersonLoading.value = false
-      usePersonOptions.value = usePersonList.value.filter((item) => {
-        return item.name.toLowerCase().includes(query.toLowerCase())
-      })
-    }, 200)
-  }
-  else {
-    usePersonOptions.value = usePersonList.value
-  }
-}
-
-// 获取用户列表(增加模糊查询)
-const fetchUserList = () => {
-  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
-    usePersonList.value = res.data.rows
-    usePersonOptions.value = res.data.rows
-  })
-}
-
-// 获取使用部门
-const fetchDeptTreeList = () => {
-  getDeptTreeList().then((res: any) => {
-    if (res.data) { // 将列表转树结构
-      useDeptList.value = toTreeList(res.data, '0', true)
-    }
-  })
-}
-
-onMounted(() => {
-  fetchData(true)
-  // 获取使用部门
-  fetchDeptTreeList()
-  fetchUserList()
-})
-</script>
-
-<template>
-  <app-container>
-    <search-area
-      :need-clear="true"
-      @search="searchList" @clear="clearList"
-    >
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.applyNo"
-          placeholder="申请编号"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.applyName"
-          placeholder="申请名称"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
-      </search-item>
-      <search-item>
-        <el-select
-          v-model="listQuery.applyPerson"
-          placeholder="请选择申请人"
-          style="width: 100%;"
-          filterable
-          remote
-          remote-show-suffix
-          :remote-method="remoteMethod"
-          :loading="applyPersonLoading"
-        >
-          <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="timeRange"
-          type="daterange"
-          range-separator="到"
-          format="YYYY-MM-DD"
-          value-format="YYYY-MM-DD"
-          start-placeholder="领用开始日期"
-          end-placeholder="领用结束日期"
-        />
-      </search-item>
-    </search-area>
-
-    <table-container>
-      <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
-      </template>
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @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="220" fixed="right">
-            <template #default="{ row }">
-              <el-button
-                size="small"
-                type="primary"
-                link
-                @click="handleEdit(row, '查看', 'detail')"
-              >
-                查看
-              </el-button>
-              <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (active === '0' || active === '2')"
-                size="small"
-                link
-                type="primary"
-                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
-                @click="handleEdit(row, '同意')"
-              >
-                同意
-              </el-button>
-              <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (active === '0' || active === '2')"
-                size="small"
-                link
-                type="primary"
-                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
-                @click="handleEdit(row, '驳回')"
-              >
-                驳回
-              </el-button>
-              <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (active === '0' || active === '2')"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
-                @click="handleEdit(row, '拒绝')"
-              >
-                拒绝
-              </el-button>
-              <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
-                size="small"
-                link
-                type="primary"
-                @click="handleEdit(row, '编辑', 'edit')"
-              >
-                编辑
-              </el-button>
-              <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
-                size="small"
-                link
-                type="primary"
-                @click="handleEdit(row, '提交')"
-              >
-                提交
-              </el-button>
-              <!-- 是发起者且审批中可以取消 -->
-              <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (active === '0' || active === '3')"
-                size="small"
-                link
-                type="info"
-                :disabled="row.approvalStatus !== '审批中'"
-                @click="handleEdit(row, '取消')"
-              >
-                取消
-              </el-button>
-              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-              <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (active !== '4' && active !== '5')"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatus === '未通过' || row.approvalStatus === '已通过'"
-                @click="handleEdit(row, '删除')"
-              >
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <button-box :active="active" @changeCurrentButton="changeCurrentButton" />
-    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-  </app-container>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-</style>
-
diff --git a/src/views/device/receive/buttonBox.vue b/src/views/device/receive/buttonBox.vue
deleted file mode 100644
index 4205fa8..0000000
--- a/src/views/device/receive/buttonBox.vue
+++ /dev/null
@@ -1,46 +0,0 @@
-<script lang="ts" setup name="ButtonBox">
-import { ref } from 'vue'
-const emits = defineEmits(['changeCurrentButton'])
-const menu = [
-  { name: '全部', id: '0' },
-  { name: '草稿箱', id: '1' },
-  { name: '待审批', id: '2' },
-  { name: '审批中', id: '3' },
-  { name: '已通过', id: '4' },
-  { name: '未通过', id: '5' },
-  { name: '已取消', id: '6' },
-]
-const current = ref('0')
-watch(current, (newValue) => {
-  emits('changeCurrentButton', newValue)
-})
-</script>
-
-<template>
-  <div class="container">
-    <div class="btns">
-      <!-- 三级菜单 -->
-      <el-radio-group v-model="current">
-        <el-radio-button v-for="item in menu" :key="item.id" :label="item.id">
-          {{ item.name }}
-        </el-radio-button>
-      </el-radio-group>
-    </div>
-    <!-- 展示区域 -->
-    <!-- <component :is="currentComp" /> -->
-  </div>
-</template>
-
-<style lang="scss" scoped>
-.container {
-  position: relative;
-
-  .btns {
-    position: fixed;
-    top: 69px;
-    right: 15px;
-    z-index: 999;
-  }
-}
-</style>
-
diff --git a/src/views/device/receive/createOrCheck.vue b/src/views/device/receive/createOrCheck.vue
deleted file mode 100644
index 9cbc3bc..0000000
--- a/src/views/device/receive/createOrCheck.vue
+++ /dev/null
@@ -1,552 +0,0 @@
-<script lang="ts" setup name="CreateOrCheck">
-import { onMounted, reactive, ref } from 'vue'
-import type { Ref } from 'vue'
-import dayjs from 'dayjs'
-import type { FormInstance, FormRules } from 'element-plus'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { useRoute, useRouter } from 'vue-router'
-import type { IdeviceList, IdeviceListQuery } from './receive'
-import SelectDeviceDialog from './selectDeviceDialog.vue'
-import { toTreeList } from '@/utils/structure'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
-import {
-  getReceiveApplyListDetail,
-  saveAddReceiveApplyList,
-  saveEditReceiveApplyList,
-  submitReceiveApplyList,
-} from '@/api/device/receive'
-import type { userType } from '@/views/system/user/user-interface'
-import type { deptType } from '@/views/device/standingBook/standingBook-interface'
-import { getDeptTreeList } from '@/api/system/dept'
-import { getUserList } from '@/api/system/user'
-import { submitApproval } from '@/api/approval'
-import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
-
-const $route = useRoute()
-const approvalDialog = ref() // 审批对话框显隐
-const typeValue = ref() // add、edit、detail
-const approvalStatus = ref() // 审批类型
-const useDeptList = ref<deptType[]>([]) // 部门列表
-const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
-const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
-const applyPersonLoading = ref(false)
-const isMulti = ref(false) // 是否批量添加(允许多选)
-const selectIndex = ref() // 点击选择的index--点击第几行
-const dialogSelectDiviceVisible = ref(false) // 控制选择设备对话框显隐
-const textMap: { [key: string]: string } = {
-  edit: '编辑',
-  add: '新建',
-  detail: '详情',
-}// 字典
-// 选中的内容
-const checkoutList = ref([])
-// 表单数据
-const form = ref({
-  taskId: '', // 任务id（审批用）
-  id: '',
-  processId: '', // 流程id--查询审批记录使用
-  applyName: '', // 申请名称
-  applyUnit: '', // 申请单位
-  applyPerson: '', // 申请人
-  time: '', // 领用时间
-  applyDesc: '', // 申请说明
-})
-const ruleFormRef = ref<FormInstance>() as any
-const list = ref<IdeviceList[]>([])// 表格数据
-
-// 查询条件
-const listQuery: Ref<IdeviceListQuery> = ref({
-  equipmentName: '', // 仪器名称
-  equipmentNo: '', // 设备编号
-  modelNo: '', // 型号
-  mesureRange: '', // 测量范围
-  useDeptName: '', // 使用部门
-  usePersonName: '', // 使用人
-  managerStateName: '', // 管理状态
-  validDate: '', // 有效日期
-  offset: 1,
-  limit: 20,
-})
-// 表头
-const columns = ref<TableColumn[]>([
-  { text: '设备编号', value: 'equipmentNo', align: 'center', width: '230' },
-  { text: '设备名称', value: 'equipmentName', align: 'center' },
-  { text: '型号', value: 'modelNo', align: 'center' },
-  { text: '测量范围', value: 'mesureRange', align: 'center' },
-  { text: '使用部门', value: 'useDeptName', align: 'center' },
-  { text: '使用人', value: 'usePersonName', align: 'center' },
-  { text: '管理状态', value: 'managerStateName', align: 'center' },
-  { text: '有效日期', value: 'validDate', align: 'center' },
-])
-// 表单校验规则
-const rules = reactive<FormRules>({
-  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
-  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'change' }],
-  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
-  time: [{ type: 'date', required: true, message: '领用时间不能为空', trigger: 'change' }],
-  applyDesc: [{ required: true, message: '申请说明不能为空', trigger: 'blur' }],
-})
-
-const $router = useRouter()
-// 点击关闭
-const close = () => {
-  $router.back()
-}
-
-const handleClick = (val: string) => {
-  if (val === 'agree') { // 同意
-    approvalDialog.value.initDialog('agree', form.value.taskId)
-  }
-  else if (val === 'reject') { // 驳回
-    approvalDialog.value.initDialog('reject', form.value.taskId)
-  }
-  else if (val === 'refuse') { // 拒绝
-    approvalDialog.value.initDialog('refuse', form.value.taskId)
-  }
-  else if (val === 'revoke') {
-    const params = {
-      taskId: form.value.taskId!,
-      comments: '',
-    }
-    ElMessageBox.confirm(
-      '确认撤回该审批吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        submitApproval('revoke', params).then((res) => {
-          ElMessage({
-            type: 'success',
-            message: '已撤回',
-          })
-        })
-        close()
-      })
-  }
-}
-
-// 多选发生改变时
-const handleSelectionChange = (e: any) => {
-  checkoutList.value = e
-}
-
-// 删除行
-const delRow = () => {
-  if (checkoutList.value.length <= 0) {
-    ElMessage({
-      message: '请选中要删除的行',
-      type: 'warning',
-    })
-  }
-  else {
-    checkoutList.value.forEach((item: IdeviceListQuery) => {
-      list.value.forEach((element, index) => {
-        if (element.equipmentNo === item.equipmentNo) {
-          list.value.splice(index, 1)
-        }
-      })
-    })
-  }
-}
-
-// 增加行
-const addRow = () => {
-  const index = list.value.findIndex(item => !item.equipmentNo)
-  if (index !== -1) {
-    ElMessage.warning('请完善上一条设备信息')
-    return
-  }
-  list.value.push({
-    equipmentName: '', // 设备名称
-    equipmentNo: '', // 设备编号
-    modelNo: '', // 型号
-    mesureRange: '', // 测量范围
-    useDeptName: '', // 使用部门
-    usePersonName: '', // 使用人
-    managerStateName: '', // 管理状态
-    validDate: '', // 有效日期
-    equipmentId: '', // 设备ID
-  })
-}
-
-// 点击选择
-const handleSelect = (index: number, row: IdeviceList) => {
-  dialogSelectDiviceVisible.value = true // 选择设备对话框显隐
-  isMulti.value = false // 是否单选, false单选、true表格多选
-  selectIndex.value = index
-}
-
-// 点击批量添加
-const multiAdd = () => {
-  dialogSelectDiviceVisible.value = true
-  isMulti.value = true
-}
-
-// 选择设备对话框关闭
-const closeDialog = () => {
-  dialogSelectDiviceVisible.value = false
-}
-
-// 选择好设备了, 添加选好的设备到表格中
-const updateDeviceConfirm = (val: Array<IdeviceList>) => {
-  if (isMulti.value) { // 批量增加时push
-    val.forEach((item: IdeviceList) => {
-    // 只添加列表里不存在的
-      const index = list.value.findIndex((i: IdeviceList) => item.equipmentNo === i.equipmentNo)
-      if (index === -1) {
-        list.value.push(item)
-      }
-    })
-  }
-  else { // 单选替换
-    const index = list.value.findIndex((i: IdeviceList) => val[0].equipmentNo === i.equipmentNo)
-    if (index !== -1) {
-      ElMessage.warning('此设备已添加过')
-      return
-    }
-    list.value.splice(selectIndex.value, 1, val[0])
-  }
-}
-
-// 保存
-const save = () => {
-  ruleFormRef.value.validate((valid: boolean) => {
-    if (valid) {
-      const loading = ElLoading.service({
-        lock: true,
-        background: 'rgba(255, 255, 255, 0.8)',
-      })
-      // 保存之前清除空行、避免传给后端无用空对象
-      const index = list.value.findIndex((item: IdeviceList) => !item.equipmentNo)
-      if (index !== -1) {
-        list.value.splice(index, 1)
-      }
-      const params = {
-        applyName: form.value.applyName, // 申请名称
-        applyUnit: form.value.applyUnit, // 申请单位
-        applyPerson: form.value.applyPerson, // 申请人
-        time: form.value.time, // 领用时间
-        applyDesc: form.value.applyDesc, // 申请说明
-        applyType: '1', // 申请类型 领用1
-        id: form.value.id,
-        equipmentList: list.value.map((item) => {
-          return {
-            equipmentId: item.id!,
-          }
-        }),
-      }
-      // 新建
-      if (typeValue.value === 'add') {
-        saveAddReceiveApplyList(params).then((res) => {
-          form.value.id = res.data
-          ElMessage.success('保存成功')
-          loading.close()
-        })
-      }
-      // 保存
-      else if (typeValue.value === 'edit') {
-        saveEditReceiveApplyList(params).then((res) => {
-          form.value.id = res.data
-          ElMessage.success('保存成功')
-          loading.close()
-        })
-      }
-    }
-    else {
-      console.log('表单校验不通过')
-    }
-  })
-}
-
-// 提交表单
-const submit = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (form.value.id) {
-    const params = {
-      id: form.value.id,
-      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL, // 表单id
-    }
-    submitReceiveApplyList(params).then(() => {
-      ElMessage.success('提交成功')
-      loading.close()
-      close()
-    })
-  }
-  else {
-    ElMessage.info('请先保存再提交！')
-  }
-}
-
-// 获取用户列表--（是否有不分页接口？）
-const fetchUserList = () => {
-  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
-    usePersonList.value = res.data.rows
-    usePersonOptions.value = res.data.rows
-  })
-}
-
-// 获取使用部门
-const fetchDeptTreeList = () => {
-  getDeptTreeList().then((res: any) => {
-    if (res.data) { // 将列表转树结构
-      useDeptList.value = toTreeList(res.data, '0', true)
-    }
-  })
-}
-
-// 审批结束回调
-const approvalSuccess = () => {
-  close()
-}
-
-// 编辑、详情--获取详细信息
-const fetchReceiveApplyListDetail = () => {
-  getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
-    form.value.applyUnit = res.data.applyUnit // 部门
-    form.value.applyName = res.data.applyName // 申请名称
-    form.value.applyPerson = res.data.applyPerson// 申请人
-    form.value.time = res.data.time // 领用时间
-    form.value.applyDesc = res.data.applyDesc // 申请说明
-    list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
-      return {
-        ...item,
-        validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
-      }
-    })
-  })
-}
-
-// 选择器模糊查询
-const remoteMethod = (query: string) => {
-  if (query) {
-    applyPersonLoading.value = true
-    setTimeout(() => {
-      applyPersonLoading.value = false
-      usePersonOptions.value = usePersonList.value.filter((item) => {
-        return item.name.toLowerCase().includes(query.toLowerCase())
-      })
-    }, 200)
-  }
-  else {
-    usePersonOptions.value = usePersonList.value
-  }
-}
-
-onMounted(() => {
-  typeValue.value = $route.query.typeValue // 类型add、edit、detail
-  form.value.id = $route.query.id as string // id
-  form.value.taskId = $route.query.taskId as string // 任务id
-  form.value.processId = $route.query.processId as string // 任务id
-  approvalStatus.value = $route.query.approvalStatus // 审批类型
-  // 编辑、详情获取详情页信息
-  if (typeValue.value === 'edit' || typeValue.value === 'detail') {
-    fetchReceiveApplyListDetail() // 获取详细信息
-  }
-
-  // 获取部门信息
-  fetchDeptTreeList()
-  // 获取人员列表--申请人使用
-  fetchUserList()
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="`设备领用申请-${textMap[typeValue]}`">
-      <template #btns>
-        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('agree')">
-          同意
-        </el-button>
-        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('reject')">
-          驳回
-        </el-button>
-        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('refuse')">
-          拒绝
-        </el-button>
-        <el-button v-if="typeValue === 'add' || typeValue === 'edit'" type="primary" @click="save">
-          保存
-        </el-button>
-        <el-button v-if="typeValue === 'add'" type="primary" @click="submit">
-          提交
-        </el-button>
-        <el-button v-if="typeValue === 'edit' && approvalStatus === '3'" type="primary" @click="handleClick('revoke')">
-          撤回
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-    <div class="create-check">
-      <div class="top-info">
-        <!-- 表单 -->
-        <div class="form-area">
-          <el-form
-            ref="ruleFormRef"
-            :model="form"
-            label-width="120px"
-            :rules="rules"
-          >
-            <el-row :gutter="24">
-              <el-col :span="6">
-                <el-form-item label="申请名称" prop="applyName">
-                  <el-input
-                    v-model="form.applyName"
-                    :placeholder="typeValue === 'detail' ? '' : '请输入申请名称'"
-                    clearable
-                    :disabled="typeValue === 'detail'"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="申请单位" prop="applyUnit">
-                  <dept-select
-                    v-model="form.applyUnit"
-                    placeholder="请选择申请单位"
-                    :data="useDeptList"
-                    :disabled="typeValue === 'detail'"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="申请人" prop="applyPerson">
-                  <el-select
-                    v-model="form.applyPerson"
-                    :disabled="typeValue === 'detail'"
-                    placeholder="请选择申请人"
-                    style="width: 100%;"
-                    filterable
-                    remote
-                    remote-show-suffix
-                    :remote-method="remoteMethod"
-                    :loading="applyPersonLoading"
-                  >
-                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="领用时间" prop="time">
-                  <el-date-picker
-                    v-model="form.time"
-                    type="datetime"
-                    placeholder="请选择领用时间"
-                    format="YYYY-MM-DD hh:mm"
-                    value-format="YYYY-MM-DD hh:mm"
-                    :disabled="typeValue === 'detail'"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="申请说明" prop="applyDesc">
-                  <el-input v-model="form.applyDesc" type="textarea" autosize clearable :disabled="typeValue === 'detail'" />
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </el-form>
-        </div>
-      </div>
-      <!-- 表格 -->
-      <detail-block title="设备领用列表">
-        <template #btns>
-          <el-button v-if="typeValue !== 'detail'" type="primary" @click="multiAdd">
-            批量添加
-          </el-button>
-          <el-button v-if="typeValue !== 'detail'" type="primary" @click="addRow">
-            增加行
-          </el-button>
-          <el-button v-if="typeValue !== 'detail'" type="info" @click="delRow">
-            删除行
-          </el-button>
-        </template>
-        <el-table
-          :data="list"
-          border
-          style="width: 100%;"
-          max-height="600"
-          @selection-change="handleSelectionChange"
-        >
-          <el-table-column type="selection" width="38" />
-          <el-table-column align="center" label="序号" width="80" type="index" />
-          <el-table-column
-            v-for="item in columns"
-            :key="item.value"
-            :prop="item.value"
-            :label="item.text"
-            :width="item.width"
-            show-overflow-tooltip
-            align="center"
-          >
-            <template v-if="item.value === 'equipmentNo' && (typeValue === 'add' || typeValue === 'edit')" #default="scope">
-              <el-input v-model="scope.row.equipmentNo" placeholder="请选择设备" class="input">
-                <template #append>
-                  <el-button size="small" @click="handleSelect(scope.$index, scope.row)">
-                    选择
-                  </el-button>
-                </template>
-              </el-input>
-            </template>
-          </el-table-column>
-        </el-table>
-      </detail-block>
-
-      <detail-block v-if="typeValue === 'detail'" title="审批流程">
-        <approval-record :process-id="form.processId" />
-      </detail-block>
-    </div>
-    <select-device-dialog
-      :dialog-select-divice-visible="dialogSelectDiviceVisible"
-      :is-multi="isMulti"
-      @closeDialog="closeDialog"
-      @updateDeviceConfirm="updateDeviceConfirm"
-    />
-
-    <!-- 同意、驳回、拒绝对话框显示 -->
-    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-  </app-container>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-.create-check {
-  margin-top: 10px;
-
-  .top-info {
-    display: flex;
-    flex-direction: column;
-    width: 100%;
-    padding-right: 10px;
-    border-radius: 10px;
-    background-color: #fff;
-    // padding: 10px;
-
-    .title-button {
-      display: flex;
-      align-items: center;
-
-      &::before {
-        content: "";
-        flex: 1;
-      }
-
-      .button-group {
-        flex: 1;
-        display: flex;
-        justify-content: flex-end;
-      }
-    }
-
-    .form-area {
-      margin-top: 40px;
-    }
-  }
-}
-</style>
diff --git a/src/views/device/receive/receive.ts b/src/views/device/receive/receive.ts
index 2754aee..056fe60 100644
--- a/src/views/device/receive/receive.ts
+++ b/src/views/device/receive/receive.ts
@@ -82,3 +82,8 @@
   managerStateName: string // 管理状态
   validDate: string // 有效日期
 }
+
+export interface IMenu {
+  name: string // 名字
+  id: string
+}
diff --git a/src/views/device/receive/solve/solveDetail.vue b/src/views/device/receive/solve/solveDetail.vue
new file mode 100644
index 0000000..8076684
--- /dev/null
+++ b/src/views/device/receive/solve/solveDetail.vue
@@ -0,0 +1,257 @@
+<script lang="ts" setup name="Detail">
+import { onMounted, ref } from 'vue'
+import { useRoute, useRouter } from 'vue-router'
+import { ElLoading } from 'element-plus'
+import type { Ref } from 'vue'
+import dayjs from 'dayjs'
+import type { IdeviceList, IdeviceListQuery } from '../receive'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getReceiveApplyListDetail } from '@/api/device/receive'
+import type { userType } from '@/views/system/user/user-interface'
+import { getUserList } from '@/api/system/user'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+
+const $route = useRoute()
+const { proxy } = getCurrentInstance() as any
+const useDeptList = ref<deptType[]>([]) // 部门列表
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const total = ref(20)// 总数
+// 表单数据
+const form = ref({
+  id: '',
+  processId: '', // 流程id--查询审批记录使用
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 领用时间
+  applyDesc: '', // 申请说明
+})
+const list = ref<IdeviceList[]>([])// 表格数据
+// 查询条件
+const listQuery: Ref<IdeviceListQuery> = ref({
+  equipmentName: '', // 仪器名称
+  equipmentNo: '', // 设备编号
+  modelNo: '', // 型号
+  mesureRange: '', // 测量范围
+  useDeptName: '', // 使用部门
+  usePersonName: '', // 使用人
+  managerStateName: '', // 管理状态
+  validDate: '', // 有效日期
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '设备编号', value: 'equipmentNo', align: 'center', width: '230' },
+  { text: '设备名称', value: 'equipmentName', align: 'center' },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: '测量范围', value: 'mesureRange', align: 'center' },
+  { text: '使用部门', value: 'useDeptName', align: 'center' },
+  { text: '使用人', value: 'usePersonName', align: 'center' },
+  { text: '管理状态', value: 'managerStateName', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center' },
+])
+
+// 编辑、详情--获取详细信息
+const fetchReceiveApplyListDetail = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
+    form.value.applyUnit = res.data.applyUnit // 部门
+    form.value.applyName = res.data.applyName// 申请名称
+    form.value.applyPerson = res.data.applyPerson// 申请人
+    form.value.time = res.data.time // 领用时间
+    form.value.applyDesc = res.data.applyDesc // 申请说明
+    list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
+      return {
+        ...item,
+        validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+      }
+    })
+    loading.close()
+  })
+}
+
+// 点击关闭
+const $router = useRouter()
+const close = () => {
+  $router.back()
+}
+
+// 打印
+const printObj = ref({
+  id: 'lysq', // 需要打印元素的id
+  popTitle: '设备领用详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备领用详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+  })
+}
+
+// 获取使用部门
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res: any) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+onMounted(async () => {
+  form.value.id = $route.query.id as string // id
+  form.value.processId = $route.query.processId as string // 任务id
+
+  // 获取部门信息
+  await fetchDeptTreeList()
+  // 获取人员列表
+  await fetchUserList()
+  // 编辑、详情获取详情页信息
+  fetchReceiveApplyListDetail() // 获取详细信息
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="设备领用处理-详情">
+      <template #btns>
+        <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div id="lysq" class="lysq-create-check">
+      <div class="top-info">
+        <detail-block title="领用申请">
+          <div class="form-area">
+            <el-form
+              ref="ruleFormRef"
+              :model="form"
+              label-width="120px"
+            >
+              <el-row :gutter="24">
+                <el-col :span="6">
+                  <el-form-item label="申请名称" prop="applyName">
+                    <el-input v-model="form.applyName" disabled />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="申请单位" prop="applyUnit">
+                    <dept-select
+                      v-model="form.applyUnit"
+                      :data="useDeptList"
+                      disabled
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="申请人" prop="applyPerson">
+                    <el-select v-model="form.applyPerson" disabled style="width: 100%;">
+                      <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="领用时间" prop="time">
+                    <el-date-picker
+                      v-model="form.time"
+                      type="datetime"
+                      format="YYYY-MM-DD hh:mm"
+                      value-format="YYYY-MM-DD hh:mm"
+                      disabled
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="申请说明" prop="applyDesc">
+                    <el-input v-model="form.applyDesc" type="textarea" disabled autosize />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
+          </div>
+        </detail-block>
+      </div>
+      <detail-block title="设备领用列表">
+        <el-table
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          />
+        </el-table>
+      </detail-block>
+      <detail-block title="审批流程">
+        <approval-record :process-id="form.processId" />
+      </detail-block>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.lysq-create-check {
+  margin-top: 10px;
+
+  .top-info {
+    display: flex;
+    flex-direction: column;
+    width: 100%;
+    padding-right: 10px;
+    border-radius: 10px;
+    background-color: #fff;
+    // padding: 10px;
+
+    .title-button {
+      display: flex;
+      align-items: center;
+
+      &::before {
+        content: "";
+        flex: 1;
+      }
+
+      .button-group {
+        flex: 1;
+        display: flex;
+        justify-content: flex-end;
+      }
+    }
+
+    .form-area {
+      margin-top: 40px;
+    }
+  }
+}
+</style>
+
+<style lang="scss">
+.lysq-create-check {
+  .el-form-item--default .el-form-item__label {
+    color: #000;
+  }
+}
+</style>
diff --git a/src/views/device/receive/solve/solveList.vue b/src/views/device/receive/solve/solveList.vue
new file mode 100644
index 0000000..b541f35
--- /dev/null
+++ b/src/views/device/receive/solve/solveList.vue
@@ -0,0 +1,436 @@
+<script lang="ts" setup name="SolveList">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
+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 { exportFile } from '@/utils/exportUtils'
+import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+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 {
+  delReceiveApplyList,
+  exportReceiveApplyList,
+  getReceiveApplyList,
+  updateProcessResult,
+} from '@/api/device/receive'
+
+const useDeptList = ref<deptType[]>([]) // 部门列表
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+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 listQuery: Ref<IlistQuery> = ref({
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  equipmentApplyProcessResult: active.value, // 设备申请处理结果--4待领用、5已领用
+  approvalStatus: '4', // 审批状态--已通过
+  processResult: active.value, // 	处置结果--4待领用、5已领用
+  applyType: '1', // 申请类型 领用1
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+  offset: 1,
+  limit: 20,
+})
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+
+// 表格数据
+const list = ref<IsolveListType[]>([])
+const { proxy } = getCurrentInstance() as any
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '申请编号', value: 'applyNo', align: 'center' },
+  { text: '申请名称', value: 'applyName', align: 'center' },
+  { text: '申请部门', value: 'applyUnitName', align: 'center' },
+  { text: '申请人', value: 'applyPersonName', align: 'center' },
+  { text: '领用时间', value: 'time', align: 'center' },
+  { text: '申请说明', value: 'applyDesc', align: 'center' },
+  { text: '审批状态', value: 'approvalStatus', align: 'center' },
+])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: '4', // 	审批状态--已通过
+    processResult: active.value, // 	处置结果
+    applyType: '1', // 申请类型 领用1
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+    equipmentApplyProcessResult: active.value, // 设备申请处理结果
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', ''] // 把时间选择框置空
+  fetchData(true)
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.startTime = timeRange.value[0] as string || ''
+  listQuery.value.endTime = timeRange.value[1] as string || ''
+  getReceiveApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IsolveListType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap[item.approvalStatus],
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 导出
+const exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    const params = {
+      applyNo: listQuery.value.applyNo, // 申请编号
+      applyName: listQuery.value.applyName, // 申请名称
+      applyUnit: listQuery.value.applyUnit, // 申请部门
+      applyPerson: listQuery.value.applyPerson, // 申请人
+      startTime: listQuery.value.startTime, // 申请开始日期
+      endTime: listQuery.value.endTime, // 申请结束日期
+      equipmentApplyProcessResult: listQuery.value.equipmentApplyProcessResult, // 设备申请处理结果--4待领用、5已领用
+      approvalStatus: listQuery.value.approvalStatus, // 	审批状态
+      processResult: listQuery.value.processResult, // 	处置结果
+      applyType: listQuery.value.applyType, // 申请类型 领用1
+      createUser: listQuery.value.createUser, // 创建人
+      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+      offset: 1,
+      limit: 20,
+      ids: checkoutList.value,
+    }
+    // 调导出接口
+    exportReceiveApplyList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备领用处理列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备领用处理列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: IsolveListType) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备领用处理列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 操作
+const $router = useRouter()
+const handleEdit = (row: IsolveListType, val: string) => {
+  if (val === '查看') {
+    $router.push({
+      path: '/receive/solveDetail',
+      query: {
+        id: row.id,
+        processId: row.processId, // 查询审批记录使用
+      },
+    })
+  }
+  else {
+    ElMessageBox.confirm(
+    `确认${val}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+    )
+      .then(() => {
+        if (val === '领用' || val === '退领') {
+          const processResult = val === '领用' ? '5' : '4'
+          updateProcessResult({ id: row.id, processResult }).then(() => {
+            ElMessage.success(`已${val}`)
+            fetchData(true)
+          })
+        }
+        if (val === '删除') {
+          delReceiveApplyList({ id: row.id, taskId: row.taskId }).then(() => {
+            ElMessage.success(`已${val}`)
+            fetchData(true)
+          })
+        }
+      })
+  }
+}
+
+// 右上角按钮切换
+const changeCurrentButton = (val: string) => {
+  active.value = val
+  window.sessionStorage.setItem('solveButtonBoxActive', val)
+  clearList()
+}
+
+// 标签识别
+const execTag = () => {}
+
+// 获取用户列表
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 获取使用部门
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res: any) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+onMounted(() => {
+  if (window.sessionStorage.getItem('solveButtonBoxActive')) {
+    active.value = window.sessionStorage.getItem('solveButtonBoxActive')!
+  }
+  else {
+    active.value = '4' // 未领用
+  }
+  nextTick(() => {
+    // 获取表格数据
+    fetchData(true)
+    // 获取使用部门
+    fetchDeptTreeList()
+    // 获取人员列表
+    fetchUserList()
+  })
+})
+onUnmounted(() => {
+  window.sessionStorage.setItem('solveButtonBoxActive', '')
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyNo"
+          placeholder="申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyName"
+          placeholder="申请名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
+      </search-item>
+      <search-item>
+        <el-form-item prop="applyPerson">
+          <el-select
+            v-model="listQuery.applyPerson"
+            placeholder="请选择申请人"
+            style="width: 100%;"
+            filterable
+            remote
+            remote-show-suffix
+            :remote-method="remoteMethod"
+            :loading="applyPersonLoading"
+          >
+            <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+          </el-select>
+        </el-form-item>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY-MM-DD hh:mm"
+          value-format="YYYY-MM-DD hh:mm"
+          start-placeholder="领用开始时间"
+          end-placeholder="领用结束时间"
+        />
+      </search-item>
+    </search-area>
+
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-device" title="标签识别" @click="execTag" />
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @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="scope">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="handleEdit(scope.row, '查看')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if="active === '4'"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(scope.row, '领用')"
+              >
+                领用
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="active === '4'"
+                size="small"
+                link
+                type="danger"
+                @click="handleEdit(scope.row, '删除')"
+              >
+                删除
+              </el-button>
+              <el-button
+                v-if="active === '5'"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(scope.row, '退领')"
+              >
+                退领
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+    <button-box
+      :active="active"
+      :menu="menu"
+      @changeCurrentButton="changeCurrentButton"
+    />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
+

diff --git a/src/api/customer/overtime.ts b/src/api/customer/overtime.ts
deleted file mode 100644
index 9f349d6..0000000
--- a/src/api/customer/overtime.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * 到期样品接口
- */
-import request from '../index'
-import type { IOvertimeListQuery } from '@/views/customer/sample/overTime/overtime_list_interface'
-const prefix = '/meter'
-
-// 列表查询
-export function getOverTimeList(data: IOvertimeListQuery) {
-  return request({
-    url: `${prefix}/sample/overtime/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 导出列表
-export function exportOverTimeList(data: Omit<IOvertimeListQuery, 'limit' | 'offset'>) {
-  return request({
-    url: `${prefix}/sample/overtime/listExport`,
-    method: 'post',
-    responseType: 'blob',
-    data,
-  })
-}
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index 2610494..21a9c9e 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -59,3 +59,20 @@
   })
 }
 
+// 查询检定记录
+export function getMesureRecords(data: { id: string }) {
+  return request({
+    url: `${prefix}/sample/mesureRecordsBySampleId`,
+    method: 'post',
+    data,
+  })
+}
+
+// 查询检定证书
+export function getCertification(data: { id: string }) {
+  return request({
+    url: `${prefix}/sample/certificationBySampleId`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components.d.ts b/src/components.d.ts
index 227585d..90f2dde 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -21,6 +21,7 @@
     BarCodeBind: typeof import('./components/BarCodeBind/index.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
+    ButtonBox: typeof import('./components/buttonBox/buttonBox.vue')['default']
     CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default']
     CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
diff --git a/src/components/buttonBox/buttonBox.vue b/src/components/buttonBox/buttonBox.vue
new file mode 100644
index 0000000..cf93686
--- /dev/null
+++ b/src/components/buttonBox/buttonBox.vue
@@ -0,0 +1,49 @@
+<!-- 列表页右上角按钮组 -->
+<script lang="ts" setup name="ButtonBox">
+import type { PropType } from 'vue'
+import { ref } from 'vue'
+import type { IMenu } from '../../views/device/receive/receive'
+
+const props = defineProps({
+  active: String,
+  menu: {
+    type: Array as PropType<IMenu[]>,
+  },
+})
+const emits = defineEmits(['changeCurrentButton'])
+
+const current = ref('')
+watch(current, (newValue) => {
+  emits('changeCurrentButton', newValue)
+})
+watch(() => props.active, (newValue) => {
+  current.value = newValue!
+  console.log('pppppp', newValue)
+})
+</script>
+
+<template>
+  <div class="container">
+    <div class="btns">
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.id" :label="item.id">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 69px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 36f5104..fb6758e 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -481,7 +481,7 @@
       {
         path: 'applyList',
         name: 'ApplyList',
-        component: () => import('@/views/device/receive/applyList.vue'),
+        component: () => import('@/views/device/receive/apply/applyList.vue'),
         meta: {
           title: '设备领用申请',
           icon: 'ep:key',
@@ -491,7 +491,7 @@
       {
         path: ':type',
         name: 'ApplyListDetail',
-        component: () => import('@/views/device/receive/createOrCheck.vue'),
+        component: () => import('@/views/device/receive/apply/applyEdit.vue'),
         meta: {
           title: '设备领用申请',
           icon: 'ep:key',
@@ -503,7 +503,7 @@
       {
         path: 'solveList',
         name: 'SolveList',
-        component: () => import('@/views/device/receive/solveList.vue'),
+        component: () => import('@/views/device/receive/solve/solveList.vue'),
         meta: {
           title: '设备领用处理',
           icon: 'ep:key',
@@ -513,7 +513,7 @@
       {
         path: 'solveDetail',
         name: 'SolveListDetail',
-        component: () => import('@/views/device/receive/solveComponent/detail.vue'),
+        component: () => import('@/views/device/receive/solve/solveDetail.vue'),
         meta: {
           title: '设备领用处理',
           icon: 'ep:key',
diff --git a/src/views/customer/bench/bench.vue b/src/views/customer/bench/bench.vue
index 6b502fc..3b8f274 100644
--- a/src/views/customer/bench/bench.vue
+++ b/src/views/customer/bench/bench.vue
@@ -1,15 +1,53 @@
 <script lang="ts" setup name="DeviceBench">
-import { getCurrentInstance, ref } from 'vue'
+import { ref } from 'vue'
 import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
 import type { planReturn } from './bench-interface'
 import Linechart from '@/components/Echart/LineChart.vue'
 import type { lineDataI } from '@/components/Echart/echart-interface'
 import { getCustomerExpireData, getHighQualityCustomerList, getSampleAddData, getSampleExpireData } from '@/api/customer/bench'
+import { getSampleList } from '@/api/customer/sampleList'
+import type { IOvertimeListQuery } from '@/views/customer/sample/overTime/overtime_list_interface'
+import { getAdviceList } from '@/api/customer/advice'
+import type { IAdvice, IAdviceQuery } from '@/views/customer/advice/advice_interface'
 
+const reg = /(\d{4})\年(\d{2})月/ // 把2022年3月转为2022-03
 // 每个展示块高度
 const blockHeight = ref(300)
 const blockWidth = ref(400)
-const { proxy } = getCurrentInstance() as any
+
+// 到期样品查询条件
+const dueSampleListQuery: Ref<IOvertimeListQuery> = ref({
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 型号
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  startTime: '', // 检定开始时间
+  endTime: '', // 检定结束时间
+  overtimeStatus: '1', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+  offset: 1,
+  limit: 20,
+})
+
+// 客户关系查询条件
+const customerRelationsListQuery: Ref<IAdviceQuery> = ref({
+  adviceNo: '', // 投诉编号
+  customerName: '', // 公司名称
+  customerNo: '', // 客户编号
+  startTime: '', // 投诉开始时间
+  endTime: '', // 投诉结束时间
+  offset: 1,
+  limit: 20,
+})
+
+const dueSampleTableLoading = ref(false) // 到期样品表格loading
+const customerRelationsTableLoading = ref(false) // 客户关系loading
+const sampleAddLoading = ref(false) // 样品新增趋势loading
+const customerAddLoading = ref(false) // 客户新增趋势loading
+const sampleExpireLoading = ref(false) // 样品到期趋势loading
+const highQualityCustomerLoading = ref(false) // 优质客户名单loading
+
 // 到期样品表格数据
 const dueSampleTableData = ref()
 // 到期样品表头
@@ -64,54 +102,81 @@
   blockWidth.value = (document.body.clientWidth - 180 - 20 - 20) / 3
   console.log(blockHeight.value, blockWidth.value - 20)
 }
+
 window.addEventListener('resize', () => {
   calcBlockSize()
 })
 
 // 获取样品新增趋势数据
 function fetchSampleAddData() {
+  sampleAddLoading.value = true
   getSampleAddData().then((res) => {
-    sampleAddXData.value = res.data.map((item: planReturn) => {
-      // return item.date.replace('年', '-')
-      return item.date
-    })
+    sampleAddXData.value = res.data.map((item: planReturn) => item.date.replace(reg, '$1-$2'))
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     sampleAddYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
-    sampleAddData.value = [{ name: '客户', data: yValue }]
+    sampleAddData.value = [{ name: '样品', data: yValue }]
+    sampleAddLoading.value = false
   })
 }
 
 // 获取样品到期趋势数据
 function fetchSampleExpireData() {
+  sampleExpireLoading.value = true
   getSampleExpireData().then((res) => {
-    sampleExpireXData.value = res.data.map((item: planReturn) => item.date)
+    sampleExpireXData.value = res.data.map((item: planReturn) => item.date.replace(reg, '$1-$2'))
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     sampleExpireYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
-    sampleExpireData.value = [{ name: '客户', data: yValue }]
+    sampleExpireData.value = [{ name: '样品', data: yValue }]
+    sampleExpireLoading.value = false
   })
 }
 
 // 获取优质客户名单
 function fetchHighQualityCustomerList() {
+  highQualityCustomerLoading.value = true
   getHighQualityCustomerList().then((res) => {
     highQualityCustomerTableData.value = res.data.rows
+    highQualityCustomerLoading.value = false
   })
 }
 // 获取客户新增趋势数据
 function fetchCustomerExpireData() {
+  customerAddLoading.value = true
   getCustomerExpireData().then((res) => {
-    customerAddXData.value = res.data.map((item: planReturn) => item.date)
+    customerAddXData.value = res.data.map((item: planReturn) => item.date.replace(reg, '$1-$2'))
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     customerAddYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
     customerAddData.value = [{ name: '客户', data: yValue }]
+    customerAddLoading.value = false
   })
 }
 
 // 获取到期样品表格数据
+function fetchDueSampleTableData() {
+  dueSampleTableLoading.value = true
+  getSampleList(dueSampleListQuery.value).then((response) => {
+    dueSampleTableData.value = response.data.rows
+    dueSampleTableLoading.value = false
+  })
+}
 // 获取客户关系表格数据
+function fetchcustomerRelationsTableData() {
+  customerRelationsTableLoading.value = true
+  getAdviceList(customerRelationsListQuery.value).then((res) => {
+    customerRelationsTabledata.value = res.data.rows.map((item: IAdvice) => {
+      return {
+        ...item,
+        adviceClass: item.adviceClass === '0' ? '建议' : item.adviceClass === '1' ? '投诉' : '其他',
+      }
+    })
+    customerRelationsTableLoading.value = false
+  })
+}
 
 onMounted(() => {
   calcBlockSize()
+  fetchDueSampleTableData() // 到期样品表格
+  fetchcustomerRelationsTableData() // 客户关系表格
   fetchSampleAddData()// 样品新增趋势
   fetchSampleExpireData()// 样品到期趋势
   fetchCustomerExpireData()// 客户新增趋势
@@ -125,6 +190,7 @@
       <el-row :gutter="10">
         <el-col :span="8">
           <bench-col
+            v-loading="dueSampleTableLoading"
             icon="icon-book"
             title="到期样品"
             path-url="/sample/overtime"
@@ -145,6 +211,7 @@
         </el-col>
         <el-col :span="8">
           <bench-col
+            v-loading="sampleAddLoading"
             icon="icon-line"
             title="样品新增趋势"
             :height="blockHeight"
@@ -159,6 +226,7 @@
         </el-col>
         <el-col :span="8">
           <bench-col
+            v-loading="sampleExpireLoading"
             icon="icon-line"
             title="样品到期趋势"
             :height="blockHeight"
@@ -177,6 +245,7 @@
       <el-row :gutter="10">
         <el-col :span="8">
           <bench-col
+            v-loading="customerRelationsTableLoading"
             icon="icon-book"
             title="客户关系"
             path-url="/customerManage/advice"
@@ -197,6 +266,7 @@
         </el-col>
         <el-col :span="8">
           <bench-col
+            v-loading="customerAddLoading"
             icon="icon-line"
             title="客户新增趋势"
             :height="blockHeight"
@@ -211,6 +281,7 @@
         </el-col>
         <el-col :span="8">
           <bench-col
+            v-loading="highQualityCustomerLoading"
             icon="icon-book"
             title="优质客户名单"
             :style="{ height: blockHeight }"
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index e7d1acb..359c94d 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -8,7 +8,7 @@
 import selectCustomer from './selectCustomer.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import { addSample, getCertification, getMesureRecords, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
@@ -69,6 +69,7 @@
   sampleName: '', // 样品名称
   sampleModel: '', // 样品型号
   manufacturingNo: '', // 出厂编号
+  customerId: '', // 委托方id
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   phone: '', // 委托方电话
@@ -138,12 +139,17 @@
 })
 
 // 获取检定记录
-const fetchMeasureRecords = function (query = null) {
-  dataList.value.measureRecords = []
+const fetchMeasureRecords = (query = null) => {
+  getMesureRecords({ id: infoId.value }).then((res) => {
+    dataList.value.measureRecords = res.data.rows
+  })
 }
+
 // 获取检定证书
-const fetchCertifications = function (query = null) {
-  dataList.value.certificationRecords = []
+const fetchCertifications = (query = null) => {
+  getCertification({ id: infoId.value }).then((res) => {
+    dataList.value.certificationRecords = res.data.rows
+  })
 }
 
 // 菜单
@@ -151,12 +157,12 @@
   {
     name: '检定记录',
     columns: [
-      { text: '委托单编号', value: 'orderCode' },
-      { text: '委托单日期', value: 'orderTime' },
-      { text: '委托方代码', value: 'customerCode' },
-      { text: '委托方名称', value: 'customerName' },
-      { text: '送检人', value: 'deliverer' },
-      { text: '送检日期', value: 'deliverTime' },
+      { text: '委托单编号', value: 'orderCode', align: 'center' },
+      { text: '委托单日期', value: 'orderTime', align: 'center' },
+      { text: '委托方代码', value: 'customerCode', align: 'center' },
+      { text: '委托方名称', value: 'customerName', align: 'center' },
+      { text: '送检人', value: 'deliverer', align: 'center' },
+      { text: '送检日期', value: 'deliverTime', align: 'center' },
     ],
     list: 'measureRecords',
     pagination: true,
@@ -165,11 +171,11 @@
   {
     name: '检定证书',
     columns: [
-      { text: '证书编号', value: 'certificationCode' },
-      { text: '证书名称', value: 'certificationName' },
-      { text: '证书类型', value: 'certificationType' },
-      { text: '证书出具日期', value: 'effectiveDate' },
-      { text: '证书有效期', value: 'expirationDate' },
+      { text: '证书编号', value: 'certificationCode', align: 'center' },
+      { text: '证书名称', value: 'certificationName', align: 'center' },
+      { text: '证书类型', value: 'certificationType', align: 'center' },
+      { text: '证书出具日期', value: 'effectiveDate', align: 'center' },
+      { text: '证书有效期', value: 'expirationDate', align: 'center' },
     ],
     list: 'certificationRecords',
     pagination: true,
@@ -233,18 +239,18 @@
 // 委托方代码获取焦点
 const customerNoFocus = () => {
   visible.value = true
-  console.log(visible.value)
 }
 
 // 选好委托方
 const confirmCheckout = (val: Array<ICustomer>) => {
   if (val && val.length) {
     const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo
-    dataForm.value.customerName = getValue.customerName
-    dataForm.value.phone = getValue.phone
-    dataForm.value.postalCode = getValue.postalCode
-    dataForm.value.customerAddress = getValue.briefName
+    dataForm.value.customerNo = getValue.customerNo // 委托方代码
+    dataForm.value.customerId = getValue.id // 委托方id
+    dataForm.value.customerName = getValue.customerName // 委托方名称
+    dataForm.value.phone = getValue.phone // 电话
+    dataForm.value.postalCode = getValue.postalCode // 邮编
+    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
   }
 }
 
@@ -296,6 +302,7 @@
 const getInfo = () => {
   getSapmleDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data
+    dataForm.value.ABC = res.data.abc
     for (const item of menu) {
       item.searchFunc()
     }
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index a2c4307..c3690d4 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -35,6 +35,7 @@
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center', width: '180px' },
 ])
 // 表格数据
@@ -47,6 +48,7 @@
 const checkoutList = ref<string[]>([])
 // 文件上传input
 const fileRef = ref()
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -62,6 +64,7 @@
     loadingTable.value = false
   })
 }
+
 // 多选发生改变时
 function handleSelectionChange(e: any) {
   checkoutList.value = e.map((item: { id: string }) => item.id)
@@ -71,6 +74,7 @@
 const handleEdit = (row: ISampleList, pageType: 'edit' | 'detail') => {
   $router.push(`/sample/${pageType}/${row.id}`)
 }
+
 // 点击删除
 const handleDelete = (row: ISampleList) => {
   ElMessageBox.confirm(
@@ -94,10 +98,12 @@
       })
     })
 }
+
 // 点击搜索
 const searchList = () => {
   fetchData(true)
 }
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -112,7 +118,7 @@
     offset: 1,
     limit: 20,
   }
-  timeRange.value = ['', '']
+  timeRange.value = ['', ''] // 置空筛选时间
   fetchData(true)
 }
 
@@ -138,10 +144,12 @@
     ElMessage.error('请上传pdf格式')
   }
 }
+
 // 模板下载
 const templateDownload = () => {
 
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -157,10 +165,12 @@
 const uploadAll = () => {
   fileRef.value.click()
 }
+
 // 新建样品
 const add = () => {
   $router.push('/sample/add')
 }
+
 // 导出
 const exportAll = () => {
   const loading = ElLoading.service({
@@ -293,11 +303,13 @@
         <template #columns>
           <el-table-column label="操作" align="center" fixed="right" width="120">
             <template #default="{ row }">
+              <!-- 有orderid(关联了委托书)不允许编辑 -->
               <el-button
                 v-if="proxy.hasPerm('/sample/list/update')"
                 size="small"
                 type="primary"
                 link
+                :disabled="`${row.orderId}` !== ''"
                 @click="handleEdit(row, 'edit')"
               >
                 编辑
@@ -310,11 +322,13 @@
               >
                 详情
               </el-button>
+              <!-- 检测中的样品不允许删除 -->
               <el-button
                 v-if="proxy.hasPerm('/sample/list/delete')"
                 size="small"
                 link
                 type="danger"
+                :disabled="row.sampleSatus !== '3'"
                 @click="handleDelete(row)"
               >
                 删除
diff --git a/src/views/customer/sample/list/sample_list_interface.ts b/src/views/customer/sample/list/sample_list_interface.ts
index 707c8b5..81498a5 100644
--- a/src/views/customer/sample/list/sample_list_interface.ts
+++ b/src/views/customer/sample/list/sample_list_interface.ts
@@ -33,6 +33,7 @@
   sampleModel: string // 样品型号
   manufacturingNo: string // 出厂编号
   customerNo: string // 委托方代码
+  customerId: string // 委托方id
   customerName: string // 委托方名称
   phone: string // 委托方电话
   postalCode: string // 委托方邮编
diff --git a/src/views/customer/sample/list/selectCustomer.vue b/src/views/customer/sample/list/selectCustomer.vue
index 5de352d..0eef7d0 100644
--- a/src/views/customer/sample/list/selectCustomer.vue
+++ b/src/views/customer/sample/list/selectCustomer.vue
@@ -6,7 +6,8 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getCustomerList } from '@/api/customer/customer'
 import { getDictByCode } from '@/api/system/dict'
-const props = defineProps({
+
+defineProps({
   visible: {
     type: Boolean,
     default: false,
@@ -14,18 +15,9 @@
 })
 const emits = defineEmits(['changeVisible', 'confirmCheckout'])
 
-const visibleDialog = computed({
-  get() {
-    return props.visible
-  },
-  set(val) {
-    emits('changeVisible', val)
-  },
-})
-
 // 查询条件
 const listQuery: Ref<ICustomerQuery> = ref({
-  bussinessSize: '', // 业务规模
+  businessSize: '', // 业务规模
   customerName: '', // 公司名称
   customerNo: '', // 客户编号
   grade: '', // 履约评级
@@ -37,40 +29,20 @@
   name: string
   value: string
 }
-// const companySizeList = ref<dictType[]>([]) // 公司规模列表
+
 const businessSizeList = ref<dictType[]>([]) // 业务规模列表
 const gradeList = ref<dictType[]>([]) // 履约评级列表
-// const evaluationList = ref<dictType[]>([]) // 整体评价列表
-function getDict() {
-  // // 获取公司规模
-  // getDictByCode('companySize').then((response) => {
-  //   companySizeList.value = response.data
-  // })
-  // 获取业务规模
-  getDictByCode('businessSize').then((response) => {
-    businessSizeList.value = response.data
-  })
-  // 获取履约评级
-  getDictByCode('grade').then((response) => {
-    gradeList.value = response.data
-  })
-  // // 获取整体评价
-  // getDictByCode('evaluation').then((response) => {
-  //   evaluationList.value = response.data
-  // })
-}
-getDict()
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '客户编号', value: 'customerNo', width: '160', align: 'center', fixed: true },
-  { text: '客户名称', value: 'customerName', width: '120', align: 'center', fixed: true },
-  { text: '公司规模', value: 'companySizeName', align: 'center', fixed: false },
-  { text: '业务规模', value: 'businessSizeName', align: 'center', fixed: false },
-  { text: '履约评级', value: 'gradeName', align: 'center', fixed: false },
-  { text: '整体评价', value: 'evaluationName', align: 'center', fixed: false },
-  { text: '公司地址', value: 'briefName', align: 'center', fixed: false },
-  { text: '创建时间', value: 'createTime', align: 'center', width: '180px', fixed: false },
-  { text: '备注', value: 'remark', align: 'center', fixed: false },
+  { text: '客户名称', value: 'customerName', align: 'center', fixed: true },
+  { text: '公司规模', value: 'companySizeName', width: '110', align: 'center' },
+  { text: '业务规模', value: 'businessSizeName', width: '130', align: 'center' },
+  { text: '履约评级', value: 'gradeName', width: '90', align: 'center' },
+  { text: '整体评价', value: 'evaluationName', width: '110', align: 'center' },
+  { text: '公司地址', value: 'fullAddress', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
+  { text: '备注', value: 'remark', align: 'center' },
 ])
 // 表格数据
 const list = ref<ICustomer[]>([])
@@ -81,44 +53,42 @@
 // 选中的内容
 const checkoutList = ref<string[]>([])
 
-// 数据查询
+function getDict() {
+  // 获取业务规模
+  getDictByCode('businessSize').then((response) => {
+    businessSizeList.value = response.data
+  })
+  // 获取履约评级
+  getDictByCode('grade').then((response) => {
+    gradeList.value = response.data
+  })
+}
+getDict()
+
+// 表格数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getCustomerList(listQuery.value).then((response) => {
-  //   // 模拟数据
-  //   response.data.rows = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', customerAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  //   list.value = response.data.rows.map((item: ICustomer) => {
-  //     if (item.companyProvinceName && item.companyCityName) {
-  //       item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-  //     }
-  //     else {
-  //       item.briefName = item.companyProvinceName || item.companyCityName
-  //     }
-  //     return item
-  //   })
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-
-  // 模拟数据
-  const response = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', customerAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' },
-    { bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', customerAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '2集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' },
-    { bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', customerAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '3集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  list.value = response.map((item: ICustomer) => {
-    if (item.companyProvinceName && item.companyCityName) {
-      item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-    }
-    else {
-      item.briefName = item.companyProvinceName || item.companyCityName
-    }
-    return item
+  getCustomerList(listQuery.value).then((response) => {
+    // 模拟数据
+    list.value = response.data.rows.map((item: ICustomer) => {
+      if (item.addressProvinceName && item.addressCityName) {
+        item.fullAddress = `${item.addressProvinceName}/${item.addressCityName}`
+      }
+      else if (item.addressProvinceName || item.addressCityName) {
+        item.fullAddress = item.addressProvinceName || item.addressCityName
+      }
+      else if (item.addressCountryName) {
+        item.fullAddress = item.addressCountryName
+      }
+      return item
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
   })
-  total.value = 50
-  loadingTable.value = false
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -131,7 +101,7 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    bussinessSize: '', // 业务规模
+    businessSize: '', // 业务规模
     customerName: '', // 公司名称
     customerNo: '', // 客户编号
     grade: '', // 履约评级
@@ -155,9 +125,9 @@
 const cancle = () => {
   emits('changeVisible', false)
 }
+
 // 点击确定
 const clickConfirm = () => {
-  console.log(checkoutList.value)
   if (!checkoutList.value.length) {
     ElMessage({
       message: '请选中',
diff --git a/src/views/customer/sample/overTime/detail.vue b/src/views/customer/sample/overTime/detail.vue
index f553724..1adcbf8 100644
--- a/src/views/customer/sample/overTime/detail.vue
+++ b/src/views/customer/sample/overTime/detail.vue
@@ -184,6 +184,7 @@
 const getInfo = () => {
   getSapmleDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data
+    dataForm.value.ABC = res.data.abc
     for (const item of menu) {
       item.searchFunc()
     }
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index c8f90a1..05fe276 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -19,8 +19,8 @@
   sampleModel: '', // 型号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
-  startTime: '1', // 检定开始时间
-  endTime: '1', // 检定结束时间
+  startTime: '', // 检定开始时间
+  endTime: '', // 检定结束时间
   overtimeStatus: '1', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
   offset: 1,
   limit: 20,
diff --git a/src/views/device/receive/apply/applyEdit.vue b/src/views/device/receive/apply/applyEdit.vue
new file mode 100644
index 0000000..5194bdb
--- /dev/null
+++ b/src/views/device/receive/apply/applyEdit.vue
@@ -0,0 +1,552 @@
+<script lang="ts" setup name="CreateOrCheck">
+import { onMounted, reactive, ref } from 'vue'
+import type { Ref } from 'vue'
+import dayjs from 'dayjs'
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { useRoute, useRouter } from 'vue-router'
+import type { IdeviceList, IdeviceListQuery } from '../receive'
+import SelectDeviceDialog from '../selectDeviceDialog.vue'
+import { toTreeList } from '@/utils/structure'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import {
+  getReceiveApplyListDetail,
+  saveAddReceiveApplyList,
+  saveEditReceiveApplyList,
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import type { userType } from '@/views/system/user/user-interface'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { getDeptTreeList } from '@/api/system/dept'
+import { getUserList } from '@/api/system/user'
+import { submitApproval } from '@/api/approval'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+
+const $route = useRoute()
+const approvalDialog = ref() // 审批对话框显隐
+const typeValue = ref() // add、edit、detail
+const approvalStatus = ref() // 审批类型
+const useDeptList = ref<deptType[]>([]) // 部门列表
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false)
+const isMulti = ref(false) // 是否批量添加(允许多选)
+const selectIndex = ref() // 点击选择的index--点击第几行
+const dialogSelectDiviceVisible = ref(false) // 控制选择设备对话框显隐
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+// 选中的内容
+const checkoutList = ref([])
+// 表单数据
+const form = ref({
+  taskId: '', // 任务id（审批用）
+  id: '',
+  processId: '', // 流程id--查询审批记录使用
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 领用时间
+  applyDesc: '', // 申请说明
+})
+const ruleFormRef = ref<FormInstance>() as any
+const list = ref<IdeviceList[]>([])// 表格数据
+
+// 查询条件
+const listQuery: Ref<IdeviceListQuery> = ref({
+  equipmentName: '', // 仪器名称
+  equipmentNo: '', // 设备编号
+  modelNo: '', // 型号
+  mesureRange: '', // 测量范围
+  useDeptName: '', // 使用部门
+  usePersonName: '', // 使用人
+  managerStateName: '', // 管理状态
+  validDate: '', // 有效日期
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '设备编号', value: 'equipmentNo', align: 'center', width: '230' },
+  { text: '设备名称', value: 'equipmentName', align: 'center' },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: '测量范围', value: 'mesureRange', align: 'center' },
+  { text: '使用部门', value: 'useDeptName', align: 'center' },
+  { text: '使用人', value: 'usePersonName', align: 'center' },
+  { text: '管理状态', value: 'managerStateName', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center' },
+])
+// 表单校验规则
+const rules = reactive<FormRules>({
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'change' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  time: [{ type: 'date', required: true, message: '领用时间不能为空', trigger: 'change' }],
+  applyDesc: [{ required: true, message: '申请说明不能为空', trigger: 'blur' }],
+})
+
+const $router = useRouter()
+// 点击关闭
+const close = () => {
+  $router.back()
+}
+
+const handleClick = (val: string) => {
+  if (val === 'agree') { // 同意
+    approvalDialog.value.initDialog('agree', form.value.taskId)
+  }
+  else if (val === 'reject') { // 驳回
+    approvalDialog.value.initDialog('reject', form.value.taskId)
+  }
+  else if (val === 'refuse') { // 拒绝
+    approvalDialog.value.initDialog('refuse', form.value.taskId)
+  }
+  else if (val === 'revoke') {
+    const params = {
+      taskId: form.value.taskId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认撤回该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        submitApproval('revoke', params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已撤回',
+          })
+        })
+        close()
+      })
+  }
+}
+
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+
+// 删除行
+const delRow = () => {
+  if (checkoutList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    checkoutList.value.forEach((item: IdeviceListQuery) => {
+      list.value.forEach((element, index) => {
+        if (element.equipmentNo === item.equipmentNo) {
+          list.value.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+
+// 增加行
+const addRow = () => {
+  const index = list.value.findIndex(item => !item.equipmentNo)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条设备信息')
+    return
+  }
+  list.value.push({
+    equipmentName: '', // 设备名称
+    equipmentNo: '', // 设备编号
+    modelNo: '', // 型号
+    mesureRange: '', // 测量范围
+    useDeptName: '', // 使用部门
+    usePersonName: '', // 使用人
+    managerStateName: '', // 管理状态
+    validDate: '', // 有效日期
+    equipmentId: '', // 设备ID
+  })
+}
+
+// 点击选择
+const handleSelect = (index: number, row: IdeviceList) => {
+  dialogSelectDiviceVisible.value = true // 选择设备对话框显隐
+  isMulti.value = false // 是否单选, false单选、true表格多选
+  selectIndex.value = index
+}
+
+// 点击批量添加
+const multiAdd = () => {
+  dialogSelectDiviceVisible.value = true
+  isMulti.value = true
+}
+
+// 选择设备对话框关闭
+const closeDialog = () => {
+  dialogSelectDiviceVisible.value = false
+}
+
+// 选择好设备了, 添加选好的设备到表格中
+const updateDeviceConfirm = (val: Array<IdeviceList>) => {
+  if (isMulti.value) { // 批量增加时push
+    val.forEach((item: IdeviceList) => {
+    // 只添加列表里不存在的
+      const index = list.value.findIndex((i: IdeviceList) => item.equipmentNo === i.equipmentNo)
+      if (index === -1) {
+        list.value.push(item)
+      }
+    })
+  }
+  else { // 单选替换
+    const index = list.value.findIndex((i: IdeviceList) => val[0].equipmentNo === i.equipmentNo)
+    if (index !== -1) {
+      ElMessage.warning('此设备已添加过')
+      return
+    }
+    list.value.splice(selectIndex.value, 1, val[0])
+  }
+}
+
+// 保存
+const save = () => {
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      // 保存之前清除空行、避免传给后端无用空对象
+      const index = list.value.findIndex((item: IdeviceList) => !item.equipmentNo)
+      if (index !== -1) {
+        list.value.splice(index, 1)
+      }
+      const params = {
+        applyName: form.value.applyName, // 申请名称
+        applyUnit: form.value.applyUnit, // 申请单位
+        applyPerson: form.value.applyPerson, // 申请人
+        time: form.value.time, // 领用时间
+        applyDesc: form.value.applyDesc, // 申请说明
+        applyType: '1', // 申请类型 领用1
+        id: form.value.id,
+        equipmentList: list.value.map((item) => {
+          return {
+            equipmentId: item.id!,
+          }
+        }),
+      }
+      // 新建
+      if (typeValue.value === 'add') {
+        saveAddReceiveApplyList(params).then((res) => {
+          form.value.id = res.data
+          ElMessage.success('保存成功')
+          loading.close()
+        })
+      }
+      // 保存
+      else if (typeValue.value === 'edit') {
+        saveEditReceiveApplyList(params).then((res) => {
+          form.value.id = res.data
+          ElMessage.success('保存成功')
+          loading.close()
+        })
+      }
+    }
+    else {
+      console.log('表单校验不通过')
+    }
+  })
+}
+
+// 提交表单
+const submit = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (form.value.id) {
+    const params = {
+      id: form.value.id,
+      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL, // 表单id
+    }
+    submitReceiveApplyList(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    })
+  }
+  else {
+    ElMessage.info('请先保存再提交！')
+  }
+}
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 获取使用部门
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res: any) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+// 审批结束回调
+const approvalSuccess = () => {
+  close()
+}
+
+// 编辑、详情--获取详细信息
+const fetchReceiveApplyListDetail = () => {
+  getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
+    form.value.applyUnit = res.data.applyUnit // 部门
+    form.value.applyName = res.data.applyName // 申请名称
+    form.value.applyPerson = res.data.applyPerson// 申请人
+    form.value.time = res.data.time // 领用时间
+    form.value.applyDesc = res.data.applyDesc // 申请说明
+    list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
+      return {
+        ...item,
+        validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+      }
+    })
+  })
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+onMounted(() => {
+  typeValue.value = $route.query.typeValue // 类型add、edit、detail
+  form.value.id = $route.query.id as string // id
+  form.value.taskId = $route.query.taskId as string // 任务id
+  form.value.processId = $route.query.processId as string // 任务id
+  approvalStatus.value = $route.query.approvalStatus // 审批类型
+  // 编辑、详情获取详情页信息
+  if (typeValue.value === 'edit' || typeValue.value === 'detail') {
+    fetchReceiveApplyListDetail() // 获取详细信息
+  }
+
+  // 获取部门信息
+  fetchDeptTreeList()
+  // 获取人员列表--申请人使用
+  fetchUserList()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`设备领用申请-${textMap[typeValue]}`">
+      <template #btns>
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('agree')">
+          同意
+        </el-button>
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('reject')">
+          驳回
+        </el-button>
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('refuse')">
+          拒绝
+        </el-button>
+        <el-button v-if="typeValue === 'add'" type="primary" @click="submit">
+          提交
+        </el-button>
+        <el-button v-if="typeValue === 'add' || typeValue === 'edit'" type="primary" @click="save">
+          保存
+        </el-button>
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '3'" type="primary" @click="handleClick('revoke')">
+          撤回
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div class="create-check">
+      <div class="top-info">
+        <!-- 表单 -->
+        <div class="form-area">
+          <el-form
+            ref="ruleFormRef"
+            :model="form"
+            label-width="120px"
+            :rules="rules"
+          >
+            <el-row :gutter="24">
+              <el-col :span="6">
+                <el-form-item label="申请名称" prop="applyName">
+                  <el-input
+                    v-model="form.applyName"
+                    :placeholder="typeValue === 'detail' ? '' : '请输入申请名称'"
+                    clearable
+                    :disabled="typeValue === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="申请单位" prop="applyUnit">
+                  <dept-select
+                    v-model="form.applyUnit"
+                    placeholder="请选择申请单位"
+                    :data="useDeptList"
+                    :disabled="typeValue === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="申请人" prop="applyPerson">
+                  <el-select
+                    v-model="form.applyPerson"
+                    :disabled="typeValue === 'detail'"
+                    placeholder="请选择申请人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="领用时间" prop="time">
+                  <el-date-picker
+                    v-model="form.time"
+                    type="datetime"
+                    placeholder="请选择领用时间"
+                    format="YYYY-MM-DD hh:mm"
+                    value-format="YYYY-MM-DD hh:mm"
+                    :disabled="typeValue === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="申请说明" prop="applyDesc">
+                  <el-input v-model="form.applyDesc" type="textarea" autosize clearable :disabled="typeValue === 'detail'" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </div>
+      </div>
+      <!-- 表格 -->
+      <detail-block title="设备领用列表">
+        <template #btns>
+          <el-button v-if="typeValue !== 'detail'" type="primary" @click="multiAdd">
+            批量添加
+          </el-button>
+          <el-button v-if="typeValue !== 'detail'" type="primary" @click="addRow">
+            增加行
+          </el-button>
+          <el-button v-if="typeValue !== 'detail'" type="info" @click="delRow">
+            删除行
+          </el-button>
+        </template>
+        <el-table
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column v-if="typeValue !== 'detail'" type="selection" width="38" />
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          >
+            <template v-if="item.value === 'equipmentNo' && (typeValue === 'add' || typeValue === 'edit')" #default="scope">
+              <el-input v-model="scope.row.equipmentNo" placeholder="请选择设备" class="input">
+                <template #append>
+                  <el-button size="small" @click="handleSelect(scope.$index, scope.row)">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+
+      <detail-block v-if="typeValue === 'detail'" title="审批流程">
+        <approval-record :process-id="form.processId" />
+      </detail-block>
+    </div>
+    <select-device-dialog
+      :dialog-select-divice-visible="dialogSelectDiviceVisible"
+      :is-multi="isMulti"
+      @closeDialog="closeDialog"
+      @updateDeviceConfirm="updateDeviceConfirm"
+    />
+
+    <!-- 同意、驳回、拒绝对话框显示 -->
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.create-check {
+  margin-top: 10px;
+
+  .top-info {
+    display: flex;
+    flex-direction: column;
+    width: 100%;
+    padding-right: 10px;
+    border-radius: 10px;
+    background-color: #fff;
+    // padding: 10px;
+
+    .title-button {
+      display: flex;
+      align-items: center;
+
+      &::before {
+        content: "";
+        flex: 1;
+      }
+
+      .button-group {
+        flex: 1;
+        display: flex;
+        justify-content: flex-end;
+      }
+    }
+
+    .form-area {
+      margin-top: 40px;
+    }
+  }
+}
+</style>
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
new file mode 100644
index 0000000..abf559c
--- /dev/null
+++ b/src/views/device/receive/apply/applyList.vue
@@ -0,0 +1,542 @@
+<script lang="ts" setup name="ApplyList">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+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 ButtonBox from '@/components/buttonBox/buttonBox.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { exportFile } from '@/utils/exportUtils'
+import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import {
+  delReceiveApplyList,
+  exportReceiveApplyList,
+  getReceiveApplyList,
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import { submitApproval } from '@/api/approval'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import type { userType } from '@/views/system/user/user-interface'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { getUserList } from '@/api/system/user'
+
+const loadingTable = ref(false) // 表格loading
+const active = ref('') // 选中的按钮
+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 listQuery: Ref<IlistQuery> = ref({
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  approvalStatus: active.value, // 	审批状态
+  processResult: '', // 	处置结果
+  applyType: '1', // 申请类型 领用1
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+  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 columns = ref<TableColumn[]>([
+  { text: '申请编号', value: 'applyNo', align: 'center' },
+  { text: '申请名称', value: 'applyName', align: 'center' },
+  { text: '申请部门', value: 'applyUnitName', align: 'center' },
+  { text: '申请人', value: 'applyPersonName', align: 'center' },
+  { text: '领用时间', value: 'time', align: 'center' },
+  { text: '申请说明', value: 'applyDesc', align: 'center' },
+  { text: '审批状态', value: 'approvalStatus', align: 'center' },
+])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 筛选时间段数据
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.startTime = timeRange.value[0] as string || ''
+  listQuery.value.endTime = timeRange.value[1] as string || ''
+  listQuery.value.approvalStatus = active.value
+  getReceiveApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IlistType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap[item.approvalStatus],
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: active.value, // 	审批状态
+    processResult: '', // 	处置结果
+    applyType: '1', // 申请类型 领用1
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', '']
+  fetchData(true)
+}
+
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+const $router = useRouter()
+
+// 新建
+const add = () => {
+  $router.push({ path: '/receive/add', query: { typeValue: 'add' } })
+}
+
+// 导出
+const exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    const params = {
+      applyNo: listQuery.value.applyNo, // 申请编号
+      applyName: listQuery.value.applyName, // 申请名称
+      applyUnit: listQuery.value.applyUnit, // 申请部门
+      applyPerson: listQuery.value.applyPerson, // 申请人
+      startTime: listQuery.value.startTime, // 申请开始日期
+      endTime: listQuery.value.endTime, // 申请结束日期
+      approvalStatus: listQuery.value.approvalStatus, // 	审批状态
+      processResult: listQuery.value.processResult, // 	处置结果
+      applyType: listQuery.value.applyType, // 申请类型 领用0
+      createUser: listQuery.value.createUser, // 创建人
+      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+      offset: 1,
+      limit: 20,
+      ids: checkoutList.value,
+    }
+    // 调导出接口
+    exportReceiveApplyList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备领用申请列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备领用申请列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: IlistType) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备领用申请列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 操作
+const handleEdit = (row: IlistType, val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      taskId: row.taskId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        submitApproval('revoke', params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+        })
+        fetchData(true)
+      })
+  }
+  else if (val === '删除') {
+    ElMessageBox.confirm(
+      '确认删除该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        delReceiveApplyList({ id: row.id, taskId: row.taskId }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '提交') {
+    ElMessageBox.confirm(
+      '确认提交该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        submitReceiveApplyList({ id: row.id, formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已提交',
+          })
+        })
+        fetchData(true)
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', row.taskId)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', row.taskId)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', row.taskId)
+  }
+  else if (val === '查看' || val === '编辑') {
+    $router.push({
+      path: `/receive/${title}`,
+      query: {
+        typeValue: title,
+        approvalStatus: approvalStatusReserveMap[row.approvalStatus],
+        id: row.id,
+        taskId: row.taskId,
+        processId: row.processId, // 查询审批记录使用
+      },
+    })
+  }
+}
+// 按钮切换
+const changeCurrentButton = (val: string) => {
+  active.value = val
+  window.sessionStorage.setItem('buttonBoxActive', val)
+  clearList()
+}
+
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 获取用户列表(增加模糊查询)
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 获取使用部门
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res: any) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+onMounted(() => {
+  if (window.sessionStorage.getItem('buttonBoxActive')) {
+    active.value = window.sessionStorage.getItem('buttonBoxActive')!
+  }
+  else {
+    active.value = '0' // 全部
+  }
+  nextTick(() => {
+    fetchData(true) // 获取表格数据
+    // 获取使用部门
+    fetchDeptTreeList() // 获取使用部门
+    fetchUserList() // 获取人员列表
+  })
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyNo"
+          placeholder="申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyName"
+          placeholder="申请名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.applyPerson"
+          placeholder="请选择申请人"
+          style="width: 100%;"
+          filterable
+          remote
+          remote-show-suffix
+          :remote-method="remoteMethod"
+          :loading="applyPersonLoading"
+        >
+          <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY-MM-DD hh:mm"
+          value-format="YYYY-MM-DD hh:mm"
+          start-placeholder="领用开始时间"
+          end-placeholder="领用结束时间"
+        />
+      </search-item>
+    </search-area>
+
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @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="220" fixed="right">
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="handleEdit(row, '查看', 'detail')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (active === '0' || active === '2')"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (active === '0' || active === '2')"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (active === '0' || active === '2')"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '编辑', 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (active === '0' || active === '3')"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (active !== '4' && active !== '5')"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatus === '未通过' || row.approvalStatus === '已通过'"
+                @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+    <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
+
diff --git a/src/views/device/receive/applyList.vue b/src/views/device/receive/applyList.vue
deleted file mode 100644
index 63e1ee8..0000000
--- a/src/views/device/receive/applyList.vue
+++ /dev/null
@@ -1,523 +0,0 @@
-<script lang="ts" setup name="ApplyList">
-import { ref } from 'vue'
-import type { Ref } from 'vue'
-import type { DateModelType } from 'element-plus'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { useRouter } from 'vue-router'
-import type { IlistQuery, IlistType } from '@/views/device/receive/receive'
-import ButtonBox from '@/views/device/receive/buttonBox.vue'
-import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-import { exportFile } from '@/utils/exportUtils'
-import { printJSON } from '@/utils/printUtils'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
-import {
-  delReceiveApplyList,
-  exportReceiveApplyList,
-  getReceiveApplyList,
-  submitReceiveApplyList,
-} from '@/api/device/receive'
-import { submitApproval } from '@/api/approval'
-import { getDeptTreeList } from '@/api/system/dept'
-import { toTreeList } from '@/utils/structure'
-import type { userType } from '@/views/system/user/user-interface'
-import type { deptType } from '@/views/device/standingBook/standingBook-interface'
-import { getUserList } from '@/api/system/user'
-
-const loadingTable = ref(false) // 表格loading
-const active = ref('0') // 选中的按钮
-const approvalDialog = ref() // 审批对话框显隐
-const useDeptList = ref<deptType[]>([]) // 部门列表
-const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
-const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
-const applyPersonLoading = ref(false) // 申请人模糊搜索框loading
-
-// 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  applyNo: '', // 申请编号
-  applyName: '', // 申请名称
-  applyUnit: '', // 申请部门id
-  applyUnitName: '', // 申请部门名称
-  applyPerson: '', // 申请人id
-  applyPersonName: '', // 申请人姓名
-  startTime: '', // 领用开始日期
-  endTime: '', // 领用结束日期
-  approvalStatus: '', // 	审批状态
-  processResult: '', // 	处置结果
-  applyType: '1', // 申请类型 领用1
-  createUser: '', // 创建人
-  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
-  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 columns = ref<TableColumn[]>([
-  { text: '申请编号', value: 'applyNo', align: 'center' },
-  { text: '申请名称', value: 'applyName', align: 'center' },
-  { text: '申请部门', value: 'applyUnitName', align: 'center' },
-  { text: '申请人', value: 'applyPersonName', align: 'center' },
-  { text: '领用时间', value: 'time', align: 'center' },
-  { text: '申请说明', value: 'applyDesc', align: 'center' },
-  { text: '审批状态', value: 'approvalStatus', align: 'center' },
-])
-// 选中的内容
-const checkoutList = ref<string[]>([])
-// 筛选时间段数据
-const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-
-// 数据查询
-function fetchData(isNowPage = false) {
-  loadingTable.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.value.offset = 1
-  }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
-  listQuery.value.approvalStatus = active.value
-  getReceiveApplyList(listQuery.value).then((response) => {
-    list.value = response.data.rows.map((item: IlistType) => {
-      return {
-        ...item,
-        approvalStatus: approvalStatusMap[item.approvalStatus],
-      }
-    })
-    total.value = parseInt(response.data.total)
-    loadingTable.value = false
-  })
-}
-
-// 重置
-const clearList = () => {
-  listQuery.value = {
-    applyNo: '', // 申请编号
-    applyName: '', // 申请名称
-    applyUnit: '', // 申请部门
-    applyPerson: '', // 申请人
-    startTime: '', // 申请开始日期
-    endTime: '', // 申请结束日期
-    approvalStatus: '', // 	审批状态
-    processResult: '', // 	处置结果
-    applyType: '1', // 申请类型 领用1
-    createUser: '', // 创建人
-    formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
-    offset: 1,
-    limit: 20,
-  }
-  timeRange.value = ['', '']
-  fetchData(true)
-}
-
-// 搜索
-const searchList = () => {
-  fetchData(true)
-}
-
-// 多选发生改变时
-const handleSelectionChange = (e: any) => {
-  checkoutList.value = e.map((item: { id: string }) => item.id)
-}
-const $router = useRouter()
-
-// 新建
-const add = () => {
-  $router.push({ path: '/receive/add', query: { typeValue: 'add' } })
-}
-
-// 导出
-const exportAll = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: '下载中请稍后',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (list.value.length > 0) {
-    const params = {
-      applyNo: listQuery.value.applyNo, // 申请编号
-      applyName: listQuery.value.applyName, // 申请名称
-      applyUnit: listQuery.value.applyUnit, // 申请部门
-      applyPerson: listQuery.value.applyPerson, // 申请人
-      startTime: listQuery.value.startTime, // 申请开始日期
-      endTime: listQuery.value.endTime, // 申请结束日期
-      approvalStatus: listQuery.value.approvalStatus, // 	审批状态
-      processResult: listQuery.value.processResult, // 	处置结果
-      applyType: listQuery.value.applyType, // 申请类型 领用0
-      createUser: listQuery.value.createUser, // 创建人
-      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
-      offset: 1,
-      limit: 20,
-      ids: checkoutList.value,
-    }
-    // 调导出接口
-    exportReceiveApplyList(params).then((res) => {
-      const blob = new Blob([res.data])
-      exportFile(blob, '设备领用申请列表.xlsx')
-    })
-  }
-  else {
-    ElMessage.warning('无数据可导出数据')
-  }
-  loading.close()
-}
-
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  fetchData(true)
-}
-
-// 打印列表
-function printList() {
-  // 打印列
-  const properties = columns.value.map((item) => {
-    return {
-      field: item.value,
-      displayName: item.text,
-    }
-  })
-  if (checkoutList.value.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '设备领用申请列表')
-  }
-  else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: IlistType) => checkoutList.value.includes(item.id))
-    printJSON(printList, properties, '设备领用申请列表')
-  }
-  else {
-    ElMessage.warning('无可打印内容')
-  }
-}
-
-// 操作
-const handleEdit = (row: IlistType, val: string, title = '') => {
-  if (val === '取消') {
-    const params = {
-      taskId: row.taskId!,
-      comments: '',
-    }
-    ElMessageBox.confirm(
-      '确认取消该审批吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        submitApproval('revoke', params).then((res) => {
-          ElMessage({
-            type: 'success',
-            message: '取消成功',
-          })
-        })
-        fetchData(true)
-      })
-  }
-  else if (val === '删除') {
-    ElMessageBox.confirm(
-      '确认删除该审批吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        delReceiveApplyList({ id: row.id, taskId: row.taskId }).then((res) => {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          fetchData(true)
-        })
-      })
-  }
-  else if (val === '提交') {
-    ElMessageBox.confirm(
-      '确认提交该审批吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        submitReceiveApplyList({ id: row.id, formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL }).then((res) => {
-          ElMessage({
-            type: 'success',
-            message: '已提交',
-          })
-        })
-        fetchData(true)
-      })
-  }
-  else if (val === '同意') {
-    approvalDialog.value.initDialog('agree', row.taskId)
-  }
-  else if (val === '驳回') {
-    approvalDialog.value.initDialog('reject', row.taskId)
-  }
-  else if (val === '拒绝') {
-    approvalDialog.value.initDialog('refuse', row.taskId)
-  }
-  else if (val === '查看' || val === '编辑') {
-    $router.push({
-      path: `/receive/${title}`,
-      query: {
-        typeValue: title,
-        approvalStatus: approvalStatusReserveMap[row.approvalStatus],
-        id: row.id,
-        taskId: row.taskId,
-        processId: row.processId, // 查询审批记录使用
-      },
-    })
-  }
-}
-// 按钮切换
-const changeCurrentButton = (val: string) => {
-  active.value = val
-  clearList()
-}
-
-// 审批结束回调
-const approvalSuccess = () => {
-  fetchData(true)
-}
-
-// 选择器模糊查询
-const remoteMethod = (query: string) => {
-  if (query) {
-    applyPersonLoading.value = true
-    setTimeout(() => {
-      applyPersonLoading.value = false
-      usePersonOptions.value = usePersonList.value.filter((item) => {
-        return item.name.toLowerCase().includes(query.toLowerCase())
-      })
-    }, 200)
-  }
-  else {
-    usePersonOptions.value = usePersonList.value
-  }
-}
-
-// 获取用户列表(增加模糊查询)
-const fetchUserList = () => {
-  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
-    usePersonList.value = res.data.rows
-    usePersonOptions.value = res.data.rows
-  })
-}
-
-// 获取使用部门
-const fetchDeptTreeList = () => {
-  getDeptTreeList().then((res: any) => {
-    if (res.data) { // 将列表转树结构
-      useDeptList.value = toTreeList(res.data, '0', true)
-    }
-  })
-}
-
-onMounted(() => {
-  fetchData(true)
-  // 获取使用部门
-  fetchDeptTreeList()
-  fetchUserList()
-})
-</script>
-
-<template>
-  <app-container>
-    <search-area
-      :need-clear="true"
-      @search="searchList" @clear="clearList"
-    >
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.applyNo"
-          placeholder="申请编号"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.applyName"
-          placeholder="申请名称"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
-      </search-item>
-      <search-item>
-        <el-select
-          v-model="listQuery.applyPerson"
-          placeholder="请选择申请人"
-          style="width: 100%;"
-          filterable
-          remote
-          remote-show-suffix
-          :remote-method="remoteMethod"
-          :loading="applyPersonLoading"
-        >
-          <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="timeRange"
-          type="daterange"
-          range-separator="到"
-          format="YYYY-MM-DD"
-          value-format="YYYY-MM-DD"
-          start-placeholder="领用开始日期"
-          end-placeholder="领用结束日期"
-        />
-      </search-item>
-    </search-area>
-
-    <table-container>
-      <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
-      </template>
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @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="220" fixed="right">
-            <template #default="{ row }">
-              <el-button
-                size="small"
-                type="primary"
-                link
-                @click="handleEdit(row, '查看', 'detail')"
-              >
-                查看
-              </el-button>
-              <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (active === '0' || active === '2')"
-                size="small"
-                link
-                type="primary"
-                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
-                @click="handleEdit(row, '同意')"
-              >
-                同意
-              </el-button>
-              <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (active === '0' || active === '2')"
-                size="small"
-                link
-                type="primary"
-                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
-                @click="handleEdit(row, '驳回')"
-              >
-                驳回
-              </el-button>
-              <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (active === '0' || active === '2')"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
-                @click="handleEdit(row, '拒绝')"
-              >
-                拒绝
-              </el-button>
-              <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
-                size="small"
-                link
-                type="primary"
-                @click="handleEdit(row, '编辑', 'edit')"
-              >
-                编辑
-              </el-button>
-              <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
-                size="small"
-                link
-                type="primary"
-                @click="handleEdit(row, '提交')"
-              >
-                提交
-              </el-button>
-              <!-- 是发起者且审批中可以取消 -->
-              <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (active === '0' || active === '3')"
-                size="small"
-                link
-                type="info"
-                :disabled="row.approvalStatus !== '审批中'"
-                @click="handleEdit(row, '取消')"
-              >
-                取消
-              </el-button>
-              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-              <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (active !== '4' && active !== '5')"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatus === '未通过' || row.approvalStatus === '已通过'"
-                @click="handleEdit(row, '删除')"
-              >
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <button-box :active="active" @changeCurrentButton="changeCurrentButton" />
-    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-  </app-container>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-</style>
-
diff --git a/src/views/device/receive/buttonBox.vue b/src/views/device/receive/buttonBox.vue
deleted file mode 100644
index 4205fa8..0000000
--- a/src/views/device/receive/buttonBox.vue
+++ /dev/null
@@ -1,46 +0,0 @@
-<script lang="ts" setup name="ButtonBox">
-import { ref } from 'vue'
-const emits = defineEmits(['changeCurrentButton'])
-const menu = [
-  { name: '全部', id: '0' },
-  { name: '草稿箱', id: '1' },
-  { name: '待审批', id: '2' },
-  { name: '审批中', id: '3' },
-  { name: '已通过', id: '4' },
-  { name: '未通过', id: '5' },
-  { name: '已取消', id: '6' },
-]
-const current = ref('0')
-watch(current, (newValue) => {
-  emits('changeCurrentButton', newValue)
-})
-</script>
-
-<template>
-  <div class="container">
-    <div class="btns">
-      <!-- 三级菜单 -->
-      <el-radio-group v-model="current">
-        <el-radio-button v-for="item in menu" :key="item.id" :label="item.id">
-          {{ item.name }}
-        </el-radio-button>
-      </el-radio-group>
-    </div>
-    <!-- 展示区域 -->
-    <!-- <component :is="currentComp" /> -->
-  </div>
-</template>
-
-<style lang="scss" scoped>
-.container {
-  position: relative;
-
-  .btns {
-    position: fixed;
-    top: 69px;
-    right: 15px;
-    z-index: 999;
-  }
-}
-</style>
-
diff --git a/src/views/device/receive/createOrCheck.vue b/src/views/device/receive/createOrCheck.vue
deleted file mode 100644
index 9cbc3bc..0000000
--- a/src/views/device/receive/createOrCheck.vue
+++ /dev/null
@@ -1,552 +0,0 @@
-<script lang="ts" setup name="CreateOrCheck">
-import { onMounted, reactive, ref } from 'vue'
-import type { Ref } from 'vue'
-import dayjs from 'dayjs'
-import type { FormInstance, FormRules } from 'element-plus'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { useRoute, useRouter } from 'vue-router'
-import type { IdeviceList, IdeviceListQuery } from './receive'
-import SelectDeviceDialog from './selectDeviceDialog.vue'
-import { toTreeList } from '@/utils/structure'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
-import {
-  getReceiveApplyListDetail,
-  saveAddReceiveApplyList,
-  saveEditReceiveApplyList,
-  submitReceiveApplyList,
-} from '@/api/device/receive'
-import type { userType } from '@/views/system/user/user-interface'
-import type { deptType } from '@/views/device/standingBook/standingBook-interface'
-import { getDeptTreeList } from '@/api/system/dept'
-import { getUserList } from '@/api/system/user'
-import { submitApproval } from '@/api/approval'
-import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
-
-const $route = useRoute()
-const approvalDialog = ref() // 审批对话框显隐
-const typeValue = ref() // add、edit、detail
-const approvalStatus = ref() // 审批类型
-const useDeptList = ref<deptType[]>([]) // 部门列表
-const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
-const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
-const applyPersonLoading = ref(false)
-const isMulti = ref(false) // 是否批量添加(允许多选)
-const selectIndex = ref() // 点击选择的index--点击第几行
-const dialogSelectDiviceVisible = ref(false) // 控制选择设备对话框显隐
-const textMap: { [key: string]: string } = {
-  edit: '编辑',
-  add: '新建',
-  detail: '详情',
-}// 字典
-// 选中的内容
-const checkoutList = ref([])
-// 表单数据
-const form = ref({
-  taskId: '', // 任务id（审批用）
-  id: '',
-  processId: '', // 流程id--查询审批记录使用
-  applyName: '', // 申请名称
-  applyUnit: '', // 申请单位
-  applyPerson: '', // 申请人
-  time: '', // 领用时间
-  applyDesc: '', // 申请说明
-})
-const ruleFormRef = ref<FormInstance>() as any
-const list = ref<IdeviceList[]>([])// 表格数据
-
-// 查询条件
-const listQuery: Ref<IdeviceListQuery> = ref({
-  equipmentName: '', // 仪器名称
-  equipmentNo: '', // 设备编号
-  modelNo: '', // 型号
-  mesureRange: '', // 测量范围
-  useDeptName: '', // 使用部门
-  usePersonName: '', // 使用人
-  managerStateName: '', // 管理状态
-  validDate: '', // 有效日期
-  offset: 1,
-  limit: 20,
-})
-// 表头
-const columns = ref<TableColumn[]>([
-  { text: '设备编号', value: 'equipmentNo', align: 'center', width: '230' },
-  { text: '设备名称', value: 'equipmentName', align: 'center' },
-  { text: '型号', value: 'modelNo', align: 'center' },
-  { text: '测量范围', value: 'mesureRange', align: 'center' },
-  { text: '使用部门', value: 'useDeptName', align: 'center' },
-  { text: '使用人', value: 'usePersonName', align: 'center' },
-  { text: '管理状态', value: 'managerStateName', align: 'center' },
-  { text: '有效日期', value: 'validDate', align: 'center' },
-])
-// 表单校验规则
-const rules = reactive<FormRules>({
-  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
-  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'change' }],
-  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
-  time: [{ type: 'date', required: true, message: '领用时间不能为空', trigger: 'change' }],
-  applyDesc: [{ required: true, message: '申请说明不能为空', trigger: 'blur' }],
-})
-
-const $router = useRouter()
-// 点击关闭
-const close = () => {
-  $router.back()
-}
-
-const handleClick = (val: string) => {
-  if (val === 'agree') { // 同意
-    approvalDialog.value.initDialog('agree', form.value.taskId)
-  }
-  else if (val === 'reject') { // 驳回
-    approvalDialog.value.initDialog('reject', form.value.taskId)
-  }
-  else if (val === 'refuse') { // 拒绝
-    approvalDialog.value.initDialog('refuse', form.value.taskId)
-  }
-  else if (val === 'revoke') {
-    const params = {
-      taskId: form.value.taskId!,
-      comments: '',
-    }
-    ElMessageBox.confirm(
-      '确认撤回该审批吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        submitApproval('revoke', params).then((res) => {
-          ElMessage({
-            type: 'success',
-            message: '已撤回',
-          })
-        })
-        close()
-      })
-  }
-}
-
-// 多选发生改变时
-const handleSelectionChange = (e: any) => {
-  checkoutList.value = e
-}
-
-// 删除行
-const delRow = () => {
-  if (checkoutList.value.length <= 0) {
-    ElMessage({
-      message: '请选中要删除的行',
-      type: 'warning',
-    })
-  }
-  else {
-    checkoutList.value.forEach((item: IdeviceListQuery) => {
-      list.value.forEach((element, index) => {
-        if (element.equipmentNo === item.equipmentNo) {
-          list.value.splice(index, 1)
-        }
-      })
-    })
-  }
-}
-
-// 增加行
-const addRow = () => {
-  const index = list.value.findIndex(item => !item.equipmentNo)
-  if (index !== -1) {
-    ElMessage.warning('请完善上一条设备信息')
-    return
-  }
-  list.value.push({
-    equipmentName: '', // 设备名称
-    equipmentNo: '', // 设备编号
-    modelNo: '', // 型号
-    mesureRange: '', // 测量范围
-    useDeptName: '', // 使用部门
-    usePersonName: '', // 使用人
-    managerStateName: '', // 管理状态
-    validDate: '', // 有效日期
-    equipmentId: '', // 设备ID
-  })
-}
-
-// 点击选择
-const handleSelect = (index: number, row: IdeviceList) => {
-  dialogSelectDiviceVisible.value = true // 选择设备对话框显隐
-  isMulti.value = false // 是否单选, false单选、true表格多选
-  selectIndex.value = index
-}
-
-// 点击批量添加
-const multiAdd = () => {
-  dialogSelectDiviceVisible.value = true
-  isMulti.value = true
-}
-
-// 选择设备对话框关闭
-const closeDialog = () => {
-  dialogSelectDiviceVisible.value = false
-}
-
-// 选择好设备了, 添加选好的设备到表格中
-const updateDeviceConfirm = (val: Array<IdeviceList>) => {
-  if (isMulti.value) { // 批量增加时push
-    val.forEach((item: IdeviceList) => {
-    // 只添加列表里不存在的
-      const index = list.value.findIndex((i: IdeviceList) => item.equipmentNo === i.equipmentNo)
-      if (index === -1) {
-        list.value.push(item)
-      }
-    })
-  }
-  else { // 单选替换
-    const index = list.value.findIndex((i: IdeviceList) => val[0].equipmentNo === i.equipmentNo)
-    if (index !== -1) {
-      ElMessage.warning('此设备已添加过')
-      return
-    }
-    list.value.splice(selectIndex.value, 1, val[0])
-  }
-}
-
-// 保存
-const save = () => {
-  ruleFormRef.value.validate((valid: boolean) => {
-    if (valid) {
-      const loading = ElLoading.service({
-        lock: true,
-        background: 'rgba(255, 255, 255, 0.8)',
-      })
-      // 保存之前清除空行、避免传给后端无用空对象
-      const index = list.value.findIndex((item: IdeviceList) => !item.equipmentNo)
-      if (index !== -1) {
-        list.value.splice(index, 1)
-      }
-      const params = {
-        applyName: form.value.applyName, // 申请名称
-        applyUnit: form.value.applyUnit, // 申请单位
-        applyPerson: form.value.applyPerson, // 申请人
-        time: form.value.time, // 领用时间
-        applyDesc: form.value.applyDesc, // 申请说明
-        applyType: '1', // 申请类型 领用1
-        id: form.value.id,
-        equipmentList: list.value.map((item) => {
-          return {
-            equipmentId: item.id!,
-          }
-        }),
-      }
-      // 新建
-      if (typeValue.value === 'add') {
-        saveAddReceiveApplyList(params).then((res) => {
-          form.value.id = res.data
-          ElMessage.success('保存成功')
-          loading.close()
-        })
-      }
-      // 保存
-      else if (typeValue.value === 'edit') {
-        saveEditReceiveApplyList(params).then((res) => {
-          form.value.id = res.data
-          ElMessage.success('保存成功')
-          loading.close()
-        })
-      }
-    }
-    else {
-      console.log('表单校验不通过')
-    }
-  })
-}
-
-// 提交表单
-const submit = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (form.value.id) {
-    const params = {
-      id: form.value.id,
-      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL, // 表单id
-    }
-    submitReceiveApplyList(params).then(() => {
-      ElMessage.success('提交成功')
-      loading.close()
-      close()
-    })
-  }
-  else {
-    ElMessage.info('请先保存再提交！')
-  }
-}
-
-// 获取用户列表--（是否有不分页接口？）
-const fetchUserList = () => {
-  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
-    usePersonList.value = res.data.rows
-    usePersonOptions.value = res.data.rows
-  })
-}
-
-// 获取使用部门
-const fetchDeptTreeList = () => {
-  getDeptTreeList().then((res: any) => {
-    if (res.data) { // 将列表转树结构
-      useDeptList.value = toTreeList(res.data, '0', true)
-    }
-  })
-}
-
-// 审批结束回调
-const approvalSuccess = () => {
-  close()
-}
-
-// 编辑、详情--获取详细信息
-const fetchReceiveApplyListDetail = () => {
-  getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
-    form.value.applyUnit = res.data.applyUnit // 部门
-    form.value.applyName = res.data.applyName // 申请名称
-    form.value.applyPerson = res.data.applyPerson// 申请人
-    form.value.time = res.data.time // 领用时间
-    form.value.applyDesc = res.data.applyDesc // 申请说明
-    list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
-      return {
-        ...item,
-        validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
-      }
-    })
-  })
-}
-
-// 选择器模糊查询
-const remoteMethod = (query: string) => {
-  if (query) {
-    applyPersonLoading.value = true
-    setTimeout(() => {
-      applyPersonLoading.value = false
-      usePersonOptions.value = usePersonList.value.filter((item) => {
-        return item.name.toLowerCase().includes(query.toLowerCase())
-      })
-    }, 200)
-  }
-  else {
-    usePersonOptions.value = usePersonList.value
-  }
-}
-
-onMounted(() => {
-  typeValue.value = $route.query.typeValue // 类型add、edit、detail
-  form.value.id = $route.query.id as string // id
-  form.value.taskId = $route.query.taskId as string // 任务id
-  form.value.processId = $route.query.processId as string // 任务id
-  approvalStatus.value = $route.query.approvalStatus // 审批类型
-  // 编辑、详情获取详情页信息
-  if (typeValue.value === 'edit' || typeValue.value === 'detail') {
-    fetchReceiveApplyListDetail() // 获取详细信息
-  }
-
-  // 获取部门信息
-  fetchDeptTreeList()
-  // 获取人员列表--申请人使用
-  fetchUserList()
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="`设备领用申请-${textMap[typeValue]}`">
-      <template #btns>
-        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('agree')">
-          同意
-        </el-button>
-        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('reject')">
-          驳回
-        </el-button>
-        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('refuse')">
-          拒绝
-        </el-button>
-        <el-button v-if="typeValue === 'add' || typeValue === 'edit'" type="primary" @click="save">
-          保存
-        </el-button>
-        <el-button v-if="typeValue === 'add'" type="primary" @click="submit">
-          提交
-        </el-button>
-        <el-button v-if="typeValue === 'edit' && approvalStatus === '3'" type="primary" @click="handleClick('revoke')">
-          撤回
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-    <div class="create-check">
-      <div class="top-info">
-        <!-- 表单 -->
-        <div class="form-area">
-          <el-form
-            ref="ruleFormRef"
-            :model="form"
-            label-width="120px"
-            :rules="rules"
-          >
-            <el-row :gutter="24">
-              <el-col :span="6">
-                <el-form-item label="申请名称" prop="applyName">
-                  <el-input
-                    v-model="form.applyName"
-                    :placeholder="typeValue === 'detail' ? '' : '请输入申请名称'"
-                    clearable
-                    :disabled="typeValue === 'detail'"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="申请单位" prop="applyUnit">
-                  <dept-select
-                    v-model="form.applyUnit"
-                    placeholder="请选择申请单位"
-                    :data="useDeptList"
-                    :disabled="typeValue === 'detail'"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="申请人" prop="applyPerson">
-                  <el-select
-                    v-model="form.applyPerson"
-                    :disabled="typeValue === 'detail'"
-                    placeholder="请选择申请人"
-                    style="width: 100%;"
-                    filterable
-                    remote
-                    remote-show-suffix
-                    :remote-method="remoteMethod"
-                    :loading="applyPersonLoading"
-                  >
-                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="领用时间" prop="time">
-                  <el-date-picker
-                    v-model="form.time"
-                    type="datetime"
-                    placeholder="请选择领用时间"
-                    format="YYYY-MM-DD hh:mm"
-                    value-format="YYYY-MM-DD hh:mm"
-                    :disabled="typeValue === 'detail'"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="申请说明" prop="applyDesc">
-                  <el-input v-model="form.applyDesc" type="textarea" autosize clearable :disabled="typeValue === 'detail'" />
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </el-form>
-        </div>
-      </div>
-      <!-- 表格 -->
-      <detail-block title="设备领用列表">
-        <template #btns>
-          <el-button v-if="typeValue !== 'detail'" type="primary" @click="multiAdd">
-            批量添加
-          </el-button>
-          <el-button v-if="typeValue !== 'detail'" type="primary" @click="addRow">
-            增加行
-          </el-button>
-          <el-button v-if="typeValue !== 'detail'" type="info" @click="delRow">
-            删除行
-          </el-button>
-        </template>
-        <el-table
-          :data="list"
-          border
-          style="width: 100%;"
-          max-height="600"
-          @selection-change="handleSelectionChange"
-        >
-          <el-table-column type="selection" width="38" />
-          <el-table-column align="center" label="序号" width="80" type="index" />
-          <el-table-column
-            v-for="item in columns"
-            :key="item.value"
-            :prop="item.value"
-            :label="item.text"
-            :width="item.width"
-            show-overflow-tooltip
-            align="center"
-          >
-            <template v-if="item.value === 'equipmentNo' && (typeValue === 'add' || typeValue === 'edit')" #default="scope">
-              <el-input v-model="scope.row.equipmentNo" placeholder="请选择设备" class="input">
-                <template #append>
-                  <el-button size="small" @click="handleSelect(scope.$index, scope.row)">
-                    选择
-                  </el-button>
-                </template>
-              </el-input>
-            </template>
-          </el-table-column>
-        </el-table>
-      </detail-block>
-
-      <detail-block v-if="typeValue === 'detail'" title="审批流程">
-        <approval-record :process-id="form.processId" />
-      </detail-block>
-    </div>
-    <select-device-dialog
-      :dialog-select-divice-visible="dialogSelectDiviceVisible"
-      :is-multi="isMulti"
-      @closeDialog="closeDialog"
-      @updateDeviceConfirm="updateDeviceConfirm"
-    />
-
-    <!-- 同意、驳回、拒绝对话框显示 -->
-    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-  </app-container>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-.create-check {
-  margin-top: 10px;
-
-  .top-info {
-    display: flex;
-    flex-direction: column;
-    width: 100%;
-    padding-right: 10px;
-    border-radius: 10px;
-    background-color: #fff;
-    // padding: 10px;
-
-    .title-button {
-      display: flex;
-      align-items: center;
-
-      &::before {
-        content: "";
-        flex: 1;
-      }
-
-      .button-group {
-        flex: 1;
-        display: flex;
-        justify-content: flex-end;
-      }
-    }
-
-    .form-area {
-      margin-top: 40px;
-    }
-  }
-}
-</style>
diff --git a/src/views/device/receive/receive.ts b/src/views/device/receive/receive.ts
index 2754aee..056fe60 100644
--- a/src/views/device/receive/receive.ts
+++ b/src/views/device/receive/receive.ts
@@ -82,3 +82,8 @@
   managerStateName: string // 管理状态
   validDate: string // 有效日期
 }
+
+export interface IMenu {
+  name: string // 名字
+  id: string
+}
diff --git a/src/views/device/receive/solve/solveDetail.vue b/src/views/device/receive/solve/solveDetail.vue
new file mode 100644
index 0000000..8076684
--- /dev/null
+++ b/src/views/device/receive/solve/solveDetail.vue
@@ -0,0 +1,257 @@
+<script lang="ts" setup name="Detail">
+import { onMounted, ref } from 'vue'
+import { useRoute, useRouter } from 'vue-router'
+import { ElLoading } from 'element-plus'
+import type { Ref } from 'vue'
+import dayjs from 'dayjs'
+import type { IdeviceList, IdeviceListQuery } from '../receive'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getReceiveApplyListDetail } from '@/api/device/receive'
+import type { userType } from '@/views/system/user/user-interface'
+import { getUserList } from '@/api/system/user'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+
+const $route = useRoute()
+const { proxy } = getCurrentInstance() as any
+const useDeptList = ref<deptType[]>([]) // 部门列表
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const total = ref(20)// 总数
+// 表单数据
+const form = ref({
+  id: '',
+  processId: '', // 流程id--查询审批记录使用
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 领用时间
+  applyDesc: '', // 申请说明
+})
+const list = ref<IdeviceList[]>([])// 表格数据
+// 查询条件
+const listQuery: Ref<IdeviceListQuery> = ref({
+  equipmentName: '', // 仪器名称
+  equipmentNo: '', // 设备编号
+  modelNo: '', // 型号
+  mesureRange: '', // 测量范围
+  useDeptName: '', // 使用部门
+  usePersonName: '', // 使用人
+  managerStateName: '', // 管理状态
+  validDate: '', // 有效日期
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '设备编号', value: 'equipmentNo', align: 'center', width: '230' },
+  { text: '设备名称', value: 'equipmentName', align: 'center' },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: '测量范围', value: 'mesureRange', align: 'center' },
+  { text: '使用部门', value: 'useDeptName', align: 'center' },
+  { text: '使用人', value: 'usePersonName', align: 'center' },
+  { text: '管理状态', value: 'managerStateName', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center' },
+])
+
+// 编辑、详情--获取详细信息
+const fetchReceiveApplyListDetail = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
+    form.value.applyUnit = res.data.applyUnit // 部门
+    form.value.applyName = res.data.applyName// 申请名称
+    form.value.applyPerson = res.data.applyPerson// 申请人
+    form.value.time = res.data.time // 领用时间
+    form.value.applyDesc = res.data.applyDesc // 申请说明
+    list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
+      return {
+        ...item,
+        validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+      }
+    })
+    loading.close()
+  })
+}
+
+// 点击关闭
+const $router = useRouter()
+const close = () => {
+  $router.back()
+}
+
+// 打印
+const printObj = ref({
+  id: 'lysq', // 需要打印元素的id
+  popTitle: '设备领用详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备领用详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+  })
+}
+
+// 获取使用部门
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res: any) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+onMounted(async () => {
+  form.value.id = $route.query.id as string // id
+  form.value.processId = $route.query.processId as string // 任务id
+
+  // 获取部门信息
+  await fetchDeptTreeList()
+  // 获取人员列表
+  await fetchUserList()
+  // 编辑、详情获取详情页信息
+  fetchReceiveApplyListDetail() // 获取详细信息
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="设备领用处理-详情">
+      <template #btns>
+        <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div id="lysq" class="lysq-create-check">
+      <div class="top-info">
+        <detail-block title="领用申请">
+          <div class="form-area">
+            <el-form
+              ref="ruleFormRef"
+              :model="form"
+              label-width="120px"
+            >
+              <el-row :gutter="24">
+                <el-col :span="6">
+                  <el-form-item label="申请名称" prop="applyName">
+                    <el-input v-model="form.applyName" disabled />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="申请单位" prop="applyUnit">
+                    <dept-select
+                      v-model="form.applyUnit"
+                      :data="useDeptList"
+                      disabled
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="申请人" prop="applyPerson">
+                    <el-select v-model="form.applyPerson" disabled style="width: 100%;">
+                      <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="领用时间" prop="time">
+                    <el-date-picker
+                      v-model="form.time"
+                      type="datetime"
+                      format="YYYY-MM-DD hh:mm"
+                      value-format="YYYY-MM-DD hh:mm"
+                      disabled
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="申请说明" prop="applyDesc">
+                    <el-input v-model="form.applyDesc" type="textarea" disabled autosize />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
+          </div>
+        </detail-block>
+      </div>
+      <detail-block title="设备领用列表">
+        <el-table
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          />
+        </el-table>
+      </detail-block>
+      <detail-block title="审批流程">
+        <approval-record :process-id="form.processId" />
+      </detail-block>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.lysq-create-check {
+  margin-top: 10px;
+
+  .top-info {
+    display: flex;
+    flex-direction: column;
+    width: 100%;
+    padding-right: 10px;
+    border-radius: 10px;
+    background-color: #fff;
+    // padding: 10px;
+
+    .title-button {
+      display: flex;
+      align-items: center;
+
+      &::before {
+        content: "";
+        flex: 1;
+      }
+
+      .button-group {
+        flex: 1;
+        display: flex;
+        justify-content: flex-end;
+      }
+    }
+
+    .form-area {
+      margin-top: 40px;
+    }
+  }
+}
+</style>
+
+<style lang="scss">
+.lysq-create-check {
+  .el-form-item--default .el-form-item__label {
+    color: #000;
+  }
+}
+</style>
diff --git a/src/views/device/receive/solve/solveList.vue b/src/views/device/receive/solve/solveList.vue
new file mode 100644
index 0000000..b541f35
--- /dev/null
+++ b/src/views/device/receive/solve/solveList.vue
@@ -0,0 +1,436 @@
+<script lang="ts" setup name="SolveList">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
+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 { exportFile } from '@/utils/exportUtils'
+import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+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 {
+  delReceiveApplyList,
+  exportReceiveApplyList,
+  getReceiveApplyList,
+  updateProcessResult,
+} from '@/api/device/receive'
+
+const useDeptList = ref<deptType[]>([]) // 部门列表
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+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 listQuery: Ref<IlistQuery> = ref({
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  equipmentApplyProcessResult: active.value, // 设备申请处理结果--4待领用、5已领用
+  approvalStatus: '4', // 审批状态--已通过
+  processResult: active.value, // 	处置结果--4待领用、5已领用
+  applyType: '1', // 申请类型 领用1
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+  offset: 1,
+  limit: 20,
+})
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+
+// 表格数据
+const list = ref<IsolveListType[]>([])
+const { proxy } = getCurrentInstance() as any
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '申请编号', value: 'applyNo', align: 'center' },
+  { text: '申请名称', value: 'applyName', align: 'center' },
+  { text: '申请部门', value: 'applyUnitName', align: 'center' },
+  { text: '申请人', value: 'applyPersonName', align: 'center' },
+  { text: '领用时间', value: 'time', align: 'center' },
+  { text: '申请说明', value: 'applyDesc', align: 'center' },
+  { text: '审批状态', value: 'approvalStatus', align: 'center' },
+])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: '4', // 	审批状态--已通过
+    processResult: active.value, // 	处置结果
+    applyType: '1', // 申请类型 领用1
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+    equipmentApplyProcessResult: active.value, // 设备申请处理结果
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', ''] // 把时间选择框置空
+  fetchData(true)
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.startTime = timeRange.value[0] as string || ''
+  listQuery.value.endTime = timeRange.value[1] as string || ''
+  getReceiveApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IsolveListType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap[item.approvalStatus],
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 导出
+const exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    const params = {
+      applyNo: listQuery.value.applyNo, // 申请编号
+      applyName: listQuery.value.applyName, // 申请名称
+      applyUnit: listQuery.value.applyUnit, // 申请部门
+      applyPerson: listQuery.value.applyPerson, // 申请人
+      startTime: listQuery.value.startTime, // 申请开始日期
+      endTime: listQuery.value.endTime, // 申请结束日期
+      equipmentApplyProcessResult: listQuery.value.equipmentApplyProcessResult, // 设备申请处理结果--4待领用、5已领用
+      approvalStatus: listQuery.value.approvalStatus, // 	审批状态
+      processResult: listQuery.value.processResult, // 	处置结果
+      applyType: listQuery.value.applyType, // 申请类型 领用1
+      createUser: listQuery.value.createUser, // 创建人
+      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+      offset: 1,
+      limit: 20,
+      ids: checkoutList.value,
+    }
+    // 调导出接口
+    exportReceiveApplyList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备领用处理列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备领用处理列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: IsolveListType) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备领用处理列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 操作
+const $router = useRouter()
+const handleEdit = (row: IsolveListType, val: string) => {
+  if (val === '查看') {
+    $router.push({
+      path: '/receive/solveDetail',
+      query: {
+        id: row.id,
+        processId: row.processId, // 查询审批记录使用
+      },
+    })
+  }
+  else {
+    ElMessageBox.confirm(
+    `确认${val}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+    )
+      .then(() => {
+        if (val === '领用' || val === '退领') {
+          const processResult = val === '领用' ? '5' : '4'
+          updateProcessResult({ id: row.id, processResult }).then(() => {
+            ElMessage.success(`已${val}`)
+            fetchData(true)
+          })
+        }
+        if (val === '删除') {
+          delReceiveApplyList({ id: row.id, taskId: row.taskId }).then(() => {
+            ElMessage.success(`已${val}`)
+            fetchData(true)
+          })
+        }
+      })
+  }
+}
+
+// 右上角按钮切换
+const changeCurrentButton = (val: string) => {
+  active.value = val
+  window.sessionStorage.setItem('solveButtonBoxActive', val)
+  clearList()
+}
+
+// 标签识别
+const execTag = () => {}
+
+// 获取用户列表
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 获取使用部门
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res: any) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+onMounted(() => {
+  if (window.sessionStorage.getItem('solveButtonBoxActive')) {
+    active.value = window.sessionStorage.getItem('solveButtonBoxActive')!
+  }
+  else {
+    active.value = '4' // 未领用
+  }
+  nextTick(() => {
+    // 获取表格数据
+    fetchData(true)
+    // 获取使用部门
+    fetchDeptTreeList()
+    // 获取人员列表
+    fetchUserList()
+  })
+})
+onUnmounted(() => {
+  window.sessionStorage.setItem('solveButtonBoxActive', '')
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyNo"
+          placeholder="申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyName"
+          placeholder="申请名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
+      </search-item>
+      <search-item>
+        <el-form-item prop="applyPerson">
+          <el-select
+            v-model="listQuery.applyPerson"
+            placeholder="请选择申请人"
+            style="width: 100%;"
+            filterable
+            remote
+            remote-show-suffix
+            :remote-method="remoteMethod"
+            :loading="applyPersonLoading"
+          >
+            <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+          </el-select>
+        </el-form-item>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY-MM-DD hh:mm"
+          value-format="YYYY-MM-DD hh:mm"
+          start-placeholder="领用开始时间"
+          end-placeholder="领用结束时间"
+        />
+      </search-item>
+    </search-area>
+
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-device" title="标签识别" @click="execTag" />
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @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="scope">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="handleEdit(scope.row, '查看')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if="active === '4'"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(scope.row, '领用')"
+              >
+                领用
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="active === '4'"
+                size="small"
+                link
+                type="danger"
+                @click="handleEdit(scope.row, '删除')"
+              >
+                删除
+              </el-button>
+              <el-button
+                v-if="active === '5'"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(scope.row, '退领')"
+              >
+                退领
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+    <button-box
+      :active="active"
+      :menu="menu"
+      @changeCurrentButton="changeCurrentButton"
+    />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
+
diff --git a/src/views/device/receive/solveComponent/buttonBox.vue b/src/views/device/receive/solveComponent/buttonBox.vue
deleted file mode 100644
index 4a4de71..0000000
--- a/src/views/device/receive/solveComponent/buttonBox.vue
+++ /dev/null
@@ -1,41 +0,0 @@
-<script lang="ts" setup name="ButtonBox">
-import { ref } from 'vue'
-const emits = defineEmits(['changeCurrentButton'])
-const menu = [
-  { name: '未领用', id: '4' },
-  { name: '已领用', id: '5' },
-]
-const current = ref('4')
-watch(current, (newValue) => {
-  console.log(newValue)
-  emits('changeCurrentButton', newValue)
-})
-</script>
-
-<template>
-  <div class="container">
-    <div class="btns">
-      <!-- 三级菜单 -->
-      <el-radio-group v-model="current">
-        <el-radio-button v-for="item in menu" :key="item.id" :label="item.id">
-          {{ item.name }}
-        </el-radio-button>
-      </el-radio-group>
-    </div>
-    <!-- 展示区域 -->
-  </div>
-</template>
-
-<style lang="scss" scoped>
-.container {
-  position: relative;
-
-  .btns {
-    position: fixed;
-    top: 76px;
-    right: 15px;
-    z-index: 999;
-  }
-}
-</style>
-

diff --git a/src/api/customer/overtime.ts b/src/api/customer/overtime.ts
deleted file mode 100644
index 9f349d6..0000000
--- a/src/api/customer/overtime.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * 到期样品接口
- */
-import request from '../index'
-import type { IOvertimeListQuery } from '@/views/customer/sample/overTime/overtime_list_interface'
-const prefix = '/meter'
-
-// 列表查询
-export function getOverTimeList(data: IOvertimeListQuery) {
-  return request({
-    url: `${prefix}/sample/overtime/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 导出列表
-export function exportOverTimeList(data: Omit<IOvertimeListQuery, 'limit' | 'offset'>) {
-  return request({
-    url: `${prefix}/sample/overtime/listExport`,
-    method: 'post',
-    responseType: 'blob',
-    data,
-  })
-}
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index 2610494..21a9c9e 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -59,3 +59,20 @@
   })
 }
 
+// 查询检定记录
+export function getMesureRecords(data: { id: string }) {
+  return request({
+    url: `${prefix}/sample/mesureRecordsBySampleId`,
+    method: 'post',
+    data,
+  })
+}
+
+// 查询检定证书
+export function getCertification(data: { id: string }) {
+  return request({
+    url: `${prefix}/sample/certificationBySampleId`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components.d.ts b/src/components.d.ts
index 227585d..90f2dde 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -21,6 +21,7 @@
     BarCodeBind: typeof import('./components/BarCodeBind/index.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
+    ButtonBox: typeof import('./components/buttonBox/buttonBox.vue')['default']
     CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default']
     CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
diff --git a/src/components/buttonBox/buttonBox.vue b/src/components/buttonBox/buttonBox.vue
new file mode 100644
index 0000000..cf93686
--- /dev/null
+++ b/src/components/buttonBox/buttonBox.vue
@@ -0,0 +1,49 @@
+<!-- 列表页右上角按钮组 -->
+<script lang="ts" setup name="ButtonBox">
+import type { PropType } from 'vue'
+import { ref } from 'vue'
+import type { IMenu } from '../../views/device/receive/receive'
+
+const props = defineProps({
+  active: String,
+  menu: {
+    type: Array as PropType<IMenu[]>,
+  },
+})
+const emits = defineEmits(['changeCurrentButton'])
+
+const current = ref('')
+watch(current, (newValue) => {
+  emits('changeCurrentButton', newValue)
+})
+watch(() => props.active, (newValue) => {
+  current.value = newValue!
+  console.log('pppppp', newValue)
+})
+</script>
+
+<template>
+  <div class="container">
+    <div class="btns">
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.id" :label="item.id">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 69px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 36f5104..fb6758e 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -481,7 +481,7 @@
       {
         path: 'applyList',
         name: 'ApplyList',
-        component: () => import('@/views/device/receive/applyList.vue'),
+        component: () => import('@/views/device/receive/apply/applyList.vue'),
         meta: {
           title: '设备领用申请',
           icon: 'ep:key',
@@ -491,7 +491,7 @@
       {
         path: ':type',
         name: 'ApplyListDetail',
-        component: () => import('@/views/device/receive/createOrCheck.vue'),
+        component: () => import('@/views/device/receive/apply/applyEdit.vue'),
         meta: {
           title: '设备领用申请',
           icon: 'ep:key',
@@ -503,7 +503,7 @@
       {
         path: 'solveList',
         name: 'SolveList',
-        component: () => import('@/views/device/receive/solveList.vue'),
+        component: () => import('@/views/device/receive/solve/solveList.vue'),
         meta: {
           title: '设备领用处理',
           icon: 'ep:key',
@@ -513,7 +513,7 @@
       {
         path: 'solveDetail',
         name: 'SolveListDetail',
-        component: () => import('@/views/device/receive/solveComponent/detail.vue'),
+        component: () => import('@/views/device/receive/solve/solveDetail.vue'),
         meta: {
           title: '设备领用处理',
           icon: 'ep:key',
diff --git a/src/views/customer/bench/bench.vue b/src/views/customer/bench/bench.vue
index 6b502fc..3b8f274 100644
--- a/src/views/customer/bench/bench.vue
+++ b/src/views/customer/bench/bench.vue
@@ -1,15 +1,53 @@
 <script lang="ts" setup name="DeviceBench">
-import { getCurrentInstance, ref } from 'vue'
+import { ref } from 'vue'
 import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
 import type { planReturn } from './bench-interface'
 import Linechart from '@/components/Echart/LineChart.vue'
 import type { lineDataI } from '@/components/Echart/echart-interface'
 import { getCustomerExpireData, getHighQualityCustomerList, getSampleAddData, getSampleExpireData } from '@/api/customer/bench'
+import { getSampleList } from '@/api/customer/sampleList'
+import type { IOvertimeListQuery } from '@/views/customer/sample/overTime/overtime_list_interface'
+import { getAdviceList } from '@/api/customer/advice'
+import type { IAdvice, IAdviceQuery } from '@/views/customer/advice/advice_interface'
 
+const reg = /(\d{4})\年(\d{2})月/ // 把2022年3月转为2022-03
 // 每个展示块高度
 const blockHeight = ref(300)
 const blockWidth = ref(400)
-const { proxy } = getCurrentInstance() as any
+
+// 到期样品查询条件
+const dueSampleListQuery: Ref<IOvertimeListQuery> = ref({
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 型号
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  startTime: '', // 检定开始时间
+  endTime: '', // 检定结束时间
+  overtimeStatus: '1', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+  offset: 1,
+  limit: 20,
+})
+
+// 客户关系查询条件
+const customerRelationsListQuery: Ref<IAdviceQuery> = ref({
+  adviceNo: '', // 投诉编号
+  customerName: '', // 公司名称
+  customerNo: '', // 客户编号
+  startTime: '', // 投诉开始时间
+  endTime: '', // 投诉结束时间
+  offset: 1,
+  limit: 20,
+})
+
+const dueSampleTableLoading = ref(false) // 到期样品表格loading
+const customerRelationsTableLoading = ref(false) // 客户关系loading
+const sampleAddLoading = ref(false) // 样品新增趋势loading
+const customerAddLoading = ref(false) // 客户新增趋势loading
+const sampleExpireLoading = ref(false) // 样品到期趋势loading
+const highQualityCustomerLoading = ref(false) // 优质客户名单loading
+
 // 到期样品表格数据
 const dueSampleTableData = ref()
 // 到期样品表头
@@ -64,54 +102,81 @@
   blockWidth.value = (document.body.clientWidth - 180 - 20 - 20) / 3
   console.log(blockHeight.value, blockWidth.value - 20)
 }
+
 window.addEventListener('resize', () => {
   calcBlockSize()
 })
 
 // 获取样品新增趋势数据
 function fetchSampleAddData() {
+  sampleAddLoading.value = true
   getSampleAddData().then((res) => {
-    sampleAddXData.value = res.data.map((item: planReturn) => {
-      // return item.date.replace('年', '-')
-      return item.date
-    })
+    sampleAddXData.value = res.data.map((item: planReturn) => item.date.replace(reg, '$1-$2'))
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     sampleAddYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
-    sampleAddData.value = [{ name: '客户', data: yValue }]
+    sampleAddData.value = [{ name: '样品', data: yValue }]
+    sampleAddLoading.value = false
   })
 }
 
 // 获取样品到期趋势数据
 function fetchSampleExpireData() {
+  sampleExpireLoading.value = true
   getSampleExpireData().then((res) => {
-    sampleExpireXData.value = res.data.map((item: planReturn) => item.date)
+    sampleExpireXData.value = res.data.map((item: planReturn) => item.date.replace(reg, '$1-$2'))
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     sampleExpireYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
-    sampleExpireData.value = [{ name: '客户', data: yValue }]
+    sampleExpireData.value = [{ name: '样品', data: yValue }]
+    sampleExpireLoading.value = false
   })
 }
 
 // 获取优质客户名单
 function fetchHighQualityCustomerList() {
+  highQualityCustomerLoading.value = true
   getHighQualityCustomerList().then((res) => {
     highQualityCustomerTableData.value = res.data.rows
+    highQualityCustomerLoading.value = false
   })
 }
 // 获取客户新增趋势数据
 function fetchCustomerExpireData() {
+  customerAddLoading.value = true
   getCustomerExpireData().then((res) => {
-    customerAddXData.value = res.data.map((item: planReturn) => item.date)
+    customerAddXData.value = res.data.map((item: planReturn) => item.date.replace(reg, '$1-$2'))
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     customerAddYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
     customerAddData.value = [{ name: '客户', data: yValue }]
+    customerAddLoading.value = false
   })
 }
 
 // 获取到期样品表格数据
+function fetchDueSampleTableData() {
+  dueSampleTableLoading.value = true
+  getSampleList(dueSampleListQuery.value).then((response) => {
+    dueSampleTableData.value = response.data.rows
+    dueSampleTableLoading.value = false
+  })
+}
 // 获取客户关系表格数据
+function fetchcustomerRelationsTableData() {
+  customerRelationsTableLoading.value = true
+  getAdviceList(customerRelationsListQuery.value).then((res) => {
+    customerRelationsTabledata.value = res.data.rows.map((item: IAdvice) => {
+      return {
+        ...item,
+        adviceClass: item.adviceClass === '0' ? '建议' : item.adviceClass === '1' ? '投诉' : '其他',
+      }
+    })
+    customerRelationsTableLoading.value = false
+  })
+}
 
 onMounted(() => {
   calcBlockSize()
+  fetchDueSampleTableData() // 到期样品表格
+  fetchcustomerRelationsTableData() // 客户关系表格
   fetchSampleAddData()// 样品新增趋势
   fetchSampleExpireData()// 样品到期趋势
   fetchCustomerExpireData()// 客户新增趋势
@@ -125,6 +190,7 @@
       <el-row :gutter="10">
         <el-col :span="8">
           <bench-col
+            v-loading="dueSampleTableLoading"
             icon="icon-book"
             title="到期样品"
             path-url="/sample/overtime"
@@ -145,6 +211,7 @@
         </el-col>
         <el-col :span="8">
           <bench-col
+            v-loading="sampleAddLoading"
             icon="icon-line"
             title="样品新增趋势"
             :height="blockHeight"
@@ -159,6 +226,7 @@
         </el-col>
         <el-col :span="8">
           <bench-col
+            v-loading="sampleExpireLoading"
             icon="icon-line"
             title="样品到期趋势"
             :height="blockHeight"
@@ -177,6 +245,7 @@
       <el-row :gutter="10">
         <el-col :span="8">
           <bench-col
+            v-loading="customerRelationsTableLoading"
             icon="icon-book"
             title="客户关系"
             path-url="/customerManage/advice"
@@ -197,6 +266,7 @@
         </el-col>
         <el-col :span="8">
           <bench-col
+            v-loading="customerAddLoading"
             icon="icon-line"
             title="客户新增趋势"
             :height="blockHeight"
@@ -211,6 +281,7 @@
         </el-col>
         <el-col :span="8">
           <bench-col
+            v-loading="highQualityCustomerLoading"
             icon="icon-book"
             title="优质客户名单"
             :style="{ height: blockHeight }"
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index e7d1acb..359c94d 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -8,7 +8,7 @@
 import selectCustomer from './selectCustomer.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import { addSample, getCertification, getMesureRecords, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
@@ -69,6 +69,7 @@
   sampleName: '', // 样品名称
   sampleModel: '', // 样品型号
   manufacturingNo: '', // 出厂编号
+  customerId: '', // 委托方id
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   phone: '', // 委托方电话
@@ -138,12 +139,17 @@
 })
 
 // 获取检定记录
-const fetchMeasureRecords = function (query = null) {
-  dataList.value.measureRecords = []
+const fetchMeasureRecords = (query = null) => {
+  getMesureRecords({ id: infoId.value }).then((res) => {
+    dataList.value.measureRecords = res.data.rows
+  })
 }
+
 // 获取检定证书
-const fetchCertifications = function (query = null) {
-  dataList.value.certificationRecords = []
+const fetchCertifications = (query = null) => {
+  getCertification({ id: infoId.value }).then((res) => {
+    dataList.value.certificationRecords = res.data.rows
+  })
 }
 
 // 菜单
@@ -151,12 +157,12 @@
   {
     name: '检定记录',
     columns: [
-      { text: '委托单编号', value: 'orderCode' },
-      { text: '委托单日期', value: 'orderTime' },
-      { text: '委托方代码', value: 'customerCode' },
-      { text: '委托方名称', value: 'customerName' },
-      { text: '送检人', value: 'deliverer' },
-      { text: '送检日期', value: 'deliverTime' },
+      { text: '委托单编号', value: 'orderCode', align: 'center' },
+      { text: '委托单日期', value: 'orderTime', align: 'center' },
+      { text: '委托方代码', value: 'customerCode', align: 'center' },
+      { text: '委托方名称', value: 'customerName', align: 'center' },
+      { text: '送检人', value: 'deliverer', align: 'center' },
+      { text: '送检日期', value: 'deliverTime', align: 'center' },
     ],
     list: 'measureRecords',
     pagination: true,
@@ -165,11 +171,11 @@
   {
     name: '检定证书',
     columns: [
-      { text: '证书编号', value: 'certificationCode' },
-      { text: '证书名称', value: 'certificationName' },
-      { text: '证书类型', value: 'certificationType' },
-      { text: '证书出具日期', value: 'effectiveDate' },
-      { text: '证书有效期', value: 'expirationDate' },
+      { text: '证书编号', value: 'certificationCode', align: 'center' },
+      { text: '证书名称', value: 'certificationName', align: 'center' },
+      { text: '证书类型', value: 'certificationType', align: 'center' },
+      { text: '证书出具日期', value: 'effectiveDate', align: 'center' },
+      { text: '证书有效期', value: 'expirationDate', align: 'center' },
     ],
     list: 'certificationRecords',
     pagination: true,
@@ -233,18 +239,18 @@
 // 委托方代码获取焦点
 const customerNoFocus = () => {
   visible.value = true
-  console.log(visible.value)
 }
 
 // 选好委托方
 const confirmCheckout = (val: Array<ICustomer>) => {
   if (val && val.length) {
     const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo
-    dataForm.value.customerName = getValue.customerName
-    dataForm.value.phone = getValue.phone
-    dataForm.value.postalCode = getValue.postalCode
-    dataForm.value.customerAddress = getValue.briefName
+    dataForm.value.customerNo = getValue.customerNo // 委托方代码
+    dataForm.value.customerId = getValue.id // 委托方id
+    dataForm.value.customerName = getValue.customerName // 委托方名称
+    dataForm.value.phone = getValue.phone // 电话
+    dataForm.value.postalCode = getValue.postalCode // 邮编
+    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
   }
 }
 
@@ -296,6 +302,7 @@
 const getInfo = () => {
   getSapmleDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data
+    dataForm.value.ABC = res.data.abc
     for (const item of menu) {
       item.searchFunc()
     }
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index a2c4307..c3690d4 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -35,6 +35,7 @@
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center', width: '180px' },
 ])
 // 表格数据
@@ -47,6 +48,7 @@
 const checkoutList = ref<string[]>([])
 // 文件上传input
 const fileRef = ref()
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -62,6 +64,7 @@
     loadingTable.value = false
   })
 }
+
 // 多选发生改变时
 function handleSelectionChange(e: any) {
   checkoutList.value = e.map((item: { id: string }) => item.id)
@@ -71,6 +74,7 @@
 const handleEdit = (row: ISampleList, pageType: 'edit' | 'detail') => {
   $router.push(`/sample/${pageType}/${row.id}`)
 }
+
 // 点击删除
 const handleDelete = (row: ISampleList) => {
   ElMessageBox.confirm(
@@ -94,10 +98,12 @@
       })
     })
 }
+
 // 点击搜索
 const searchList = () => {
   fetchData(true)
 }
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -112,7 +118,7 @@
     offset: 1,
     limit: 20,
   }
-  timeRange.value = ['', '']
+  timeRange.value = ['', ''] // 置空筛选时间
   fetchData(true)
 }
 
@@ -138,10 +144,12 @@
     ElMessage.error('请上传pdf格式')
   }
 }
+
 // 模板下载
 const templateDownload = () => {
 
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -157,10 +165,12 @@
 const uploadAll = () => {
   fileRef.value.click()
 }
+
 // 新建样品
 const add = () => {
   $router.push('/sample/add')
 }
+
 // 导出
 const exportAll = () => {
   const loading = ElLoading.service({
@@ -293,11 +303,13 @@
         <template #columns>
           <el-table-column label="操作" align="center" fixed="right" width="120">
             <template #default="{ row }">
+              <!-- 有orderid(关联了委托书)不允许编辑 -->
               <el-button
                 v-if="proxy.hasPerm('/sample/list/update')"
                 size="small"
                 type="primary"
                 link
+                :disabled="`${row.orderId}` !== ''"
                 @click="handleEdit(row, 'edit')"
               >
                 编辑
@@ -310,11 +322,13 @@
               >
                 详情
               </el-button>
+              <!-- 检测中的样品不允许删除 -->
               <el-button
                 v-if="proxy.hasPerm('/sample/list/delete')"
                 size="small"
                 link
                 type="danger"
+                :disabled="row.sampleSatus !== '3'"
                 @click="handleDelete(row)"
               >
                 删除
diff --git a/src/views/customer/sample/list/sample_list_interface.ts b/src/views/customer/sample/list/sample_list_interface.ts
index 707c8b5..81498a5 100644
--- a/src/views/customer/sample/list/sample_list_interface.ts
+++ b/src/views/customer/sample/list/sample_list_interface.ts
@@ -33,6 +33,7 @@
   sampleModel: string // 样品型号
   manufacturingNo: string // 出厂编号
   customerNo: string // 委托方代码
+  customerId: string // 委托方id
   customerName: string // 委托方名称
   phone: string // 委托方电话
   postalCode: string // 委托方邮编
diff --git a/src/views/customer/sample/list/selectCustomer.vue b/src/views/customer/sample/list/selectCustomer.vue
index 5de352d..0eef7d0 100644
--- a/src/views/customer/sample/list/selectCustomer.vue
+++ b/src/views/customer/sample/list/selectCustomer.vue
@@ -6,7 +6,8 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getCustomerList } from '@/api/customer/customer'
 import { getDictByCode } from '@/api/system/dict'
-const props = defineProps({
+
+defineProps({
   visible: {
     type: Boolean,
     default: false,
@@ -14,18 +15,9 @@
 })
 const emits = defineEmits(['changeVisible', 'confirmCheckout'])
 
-const visibleDialog = computed({
-  get() {
-    return props.visible
-  },
-  set(val) {
-    emits('changeVisible', val)
-  },
-})
-
 // 查询条件
 const listQuery: Ref<ICustomerQuery> = ref({
-  bussinessSize: '', // 业务规模
+  businessSize: '', // 业务规模
   customerName: '', // 公司名称
   customerNo: '', // 客户编号
   grade: '', // 履约评级
@@ -37,40 +29,20 @@
   name: string
   value: string
 }
-// const companySizeList = ref<dictType[]>([]) // 公司规模列表
+
 const businessSizeList = ref<dictType[]>([]) // 业务规模列表
 const gradeList = ref<dictType[]>([]) // 履约评级列表
-// const evaluationList = ref<dictType[]>([]) // 整体评价列表
-function getDict() {
-  // // 获取公司规模
-  // getDictByCode('companySize').then((response) => {
-  //   companySizeList.value = response.data
-  // })
-  // 获取业务规模
-  getDictByCode('businessSize').then((response) => {
-    businessSizeList.value = response.data
-  })
-  // 获取履约评级
-  getDictByCode('grade').then((response) => {
-    gradeList.value = response.data
-  })
-  // // 获取整体评价
-  // getDictByCode('evaluation').then((response) => {
-  //   evaluationList.value = response.data
-  // })
-}
-getDict()
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '客户编号', value: 'customerNo', width: '160', align: 'center', fixed: true },
-  { text: '客户名称', value: 'customerName', width: '120', align: 'center', fixed: true },
-  { text: '公司规模', value: 'companySizeName', align: 'center', fixed: false },
-  { text: '业务规模', value: 'businessSizeName', align: 'center', fixed: false },
-  { text: '履约评级', value: 'gradeName', align: 'center', fixed: false },
-  { text: '整体评价', value: 'evaluationName', align: 'center', fixed: false },
-  { text: '公司地址', value: 'briefName', align: 'center', fixed: false },
-  { text: '创建时间', value: 'createTime', align: 'center', width: '180px', fixed: false },
-  { text: '备注', value: 'remark', align: 'center', fixed: false },
+  { text: '客户名称', value: 'customerName', align: 'center', fixed: true },
+  { text: '公司规模', value: 'companySizeName', width: '110', align: 'center' },
+  { text: '业务规模', value: 'businessSizeName', width: '130', align: 'center' },
+  { text: '履约评级', value: 'gradeName', width: '90', align: 'center' },
+  { text: '整体评价', value: 'evaluationName', width: '110', align: 'center' },
+  { text: '公司地址', value: 'fullAddress', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
+  { text: '备注', value: 'remark', align: 'center' },
 ])
 // 表格数据
 const list = ref<ICustomer[]>([])
@@ -81,44 +53,42 @@
 // 选中的内容
 const checkoutList = ref<string[]>([])
 
-// 数据查询
+function getDict() {
+  // 获取业务规模
+  getDictByCode('businessSize').then((response) => {
+    businessSizeList.value = response.data
+  })
+  // 获取履约评级
+  getDictByCode('grade').then((response) => {
+    gradeList.value = response.data
+  })
+}
+getDict()
+
+// 表格数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getCustomerList(listQuery.value).then((response) => {
-  //   // 模拟数据
-  //   response.data.rows = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', customerAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  //   list.value = response.data.rows.map((item: ICustomer) => {
-  //     if (item.companyProvinceName && item.companyCityName) {
-  //       item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-  //     }
-  //     else {
-  //       item.briefName = item.companyProvinceName || item.companyCityName
-  //     }
-  //     return item
-  //   })
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-
-  // 模拟数据
-  const response = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', customerAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' },
-    { bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', customerAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '2集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' },
-    { bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', customerAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '3集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  list.value = response.map((item: ICustomer) => {
-    if (item.companyProvinceName && item.companyCityName) {
-      item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-    }
-    else {
-      item.briefName = item.companyProvinceName || item.companyCityName
-    }
-    return item
+  getCustomerList(listQuery.value).then((response) => {
+    // 模拟数据
+    list.value = response.data.rows.map((item: ICustomer) => {
+      if (item.addressProvinceName && item.addressCityName) {
+        item.fullAddress = `${item.addressProvinceName}/${item.addressCityName}`
+      }
+      else if (item.addressProvinceName || item.addressCityName) {
+        item.fullAddress = item.addressProvinceName || item.addressCityName
+      }
+      else if (item.addressCountryName) {
+        item.fullAddress = item.addressCountryName
+      }
+      return item
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
   })
-  total.value = 50
-  loadingTable.value = false
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -131,7 +101,7 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    bussinessSize: '', // 业务规模
+    businessSize: '', // 业务规模
     customerName: '', // 公司名称
     customerNo: '', // 客户编号
     grade: '', // 履约评级
@@ -155,9 +125,9 @@
 const cancle = () => {
   emits('changeVisible', false)
 }
+
 // 点击确定
 const clickConfirm = () => {
-  console.log(checkoutList.value)
   if (!checkoutList.value.length) {
     ElMessage({
       message: '请选中',
diff --git a/src/views/customer/sample/overTime/detail.vue b/src/views/customer/sample/overTime/detail.vue
index f553724..1adcbf8 100644
--- a/src/views/customer/sample/overTime/detail.vue
+++ b/src/views/customer/sample/overTime/detail.vue
@@ -184,6 +184,7 @@
 const getInfo = () => {
   getSapmleDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data
+    dataForm.value.ABC = res.data.abc
     for (const item of menu) {
       item.searchFunc()
     }
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index c8f90a1..05fe276 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -19,8 +19,8 @@
   sampleModel: '', // 型号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
-  startTime: '1', // 检定开始时间
-  endTime: '1', // 检定结束时间
+  startTime: '', // 检定开始时间
+  endTime: '', // 检定结束时间
   overtimeStatus: '1', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
   offset: 1,
   limit: 20,
diff --git a/src/views/device/receive/apply/applyEdit.vue b/src/views/device/receive/apply/applyEdit.vue
new file mode 100644
index 0000000..5194bdb
--- /dev/null
+++ b/src/views/device/receive/apply/applyEdit.vue
@@ -0,0 +1,552 @@
+<script lang="ts" setup name="CreateOrCheck">
+import { onMounted, reactive, ref } from 'vue'
+import type { Ref } from 'vue'
+import dayjs from 'dayjs'
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { useRoute, useRouter } from 'vue-router'
+import type { IdeviceList, IdeviceListQuery } from '../receive'
+import SelectDeviceDialog from '../selectDeviceDialog.vue'
+import { toTreeList } from '@/utils/structure'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import {
+  getReceiveApplyListDetail,
+  saveAddReceiveApplyList,
+  saveEditReceiveApplyList,
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import type { userType } from '@/views/system/user/user-interface'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { getDeptTreeList } from '@/api/system/dept'
+import { getUserList } from '@/api/system/user'
+import { submitApproval } from '@/api/approval'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+
+const $route = useRoute()
+const approvalDialog = ref() // 审批对话框显隐
+const typeValue = ref() // add、edit、detail
+const approvalStatus = ref() // 审批类型
+const useDeptList = ref<deptType[]>([]) // 部门列表
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false)
+const isMulti = ref(false) // 是否批量添加(允许多选)
+const selectIndex = ref() // 点击选择的index--点击第几行
+const dialogSelectDiviceVisible = ref(false) // 控制选择设备对话框显隐
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+// 选中的内容
+const checkoutList = ref([])
+// 表单数据
+const form = ref({
+  taskId: '', // 任务id（审批用）
+  id: '',
+  processId: '', // 流程id--查询审批记录使用
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 领用时间
+  applyDesc: '', // 申请说明
+})
+const ruleFormRef = ref<FormInstance>() as any
+const list = ref<IdeviceList[]>([])// 表格数据
+
+// 查询条件
+const listQuery: Ref<IdeviceListQuery> = ref({
+  equipmentName: '', // 仪器名称
+  equipmentNo: '', // 设备编号
+  modelNo: '', // 型号
+  mesureRange: '', // 测量范围
+  useDeptName: '', // 使用部门
+  usePersonName: '', // 使用人
+  managerStateName: '', // 管理状态
+  validDate: '', // 有效日期
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '设备编号', value: 'equipmentNo', align: 'center', width: '230' },
+  { text: '设备名称', value: 'equipmentName', align: 'center' },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: '测量范围', value: 'mesureRange', align: 'center' },
+  { text: '使用部门', value: 'useDeptName', align: 'center' },
+  { text: '使用人', value: 'usePersonName', align: 'center' },
+  { text: '管理状态', value: 'managerStateName', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center' },
+])
+// 表单校验规则
+const rules = reactive<FormRules>({
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'change' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  time: [{ type: 'date', required: true, message: '领用时间不能为空', trigger: 'change' }],
+  applyDesc: [{ required: true, message: '申请说明不能为空', trigger: 'blur' }],
+})
+
+const $router = useRouter()
+// 点击关闭
+const close = () => {
+  $router.back()
+}
+
+const handleClick = (val: string) => {
+  if (val === 'agree') { // 同意
+    approvalDialog.value.initDialog('agree', form.value.taskId)
+  }
+  else if (val === 'reject') { // 驳回
+    approvalDialog.value.initDialog('reject', form.value.taskId)
+  }
+  else if (val === 'refuse') { // 拒绝
+    approvalDialog.value.initDialog('refuse', form.value.taskId)
+  }
+  else if (val === 'revoke') {
+    const params = {
+      taskId: form.value.taskId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认撤回该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        submitApproval('revoke', params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已撤回',
+          })
+        })
+        close()
+      })
+  }
+}
+
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+
+// 删除行
+const delRow = () => {
+  if (checkoutList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    checkoutList.value.forEach((item: IdeviceListQuery) => {
+      list.value.forEach((element, index) => {
+        if (element.equipmentNo === item.equipmentNo) {
+          list.value.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+
+// 增加行
+const addRow = () => {
+  const index = list.value.findIndex(item => !item.equipmentNo)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条设备信息')
+    return
+  }
+  list.value.push({
+    equipmentName: '', // 设备名称
+    equipmentNo: '', // 设备编号
+    modelNo: '', // 型号
+    mesureRange: '', // 测量范围
+    useDeptName: '', // 使用部门
+    usePersonName: '', // 使用人
+    managerStateName: '', // 管理状态
+    validDate: '', // 有效日期
+    equipmentId: '', // 设备ID
+  })
+}
+
+// 点击选择
+const handleSelect = (index: number, row: IdeviceList) => {
+  dialogSelectDiviceVisible.value = true // 选择设备对话框显隐
+  isMulti.value = false // 是否单选, false单选、true表格多选
+  selectIndex.value = index
+}
+
+// 点击批量添加
+const multiAdd = () => {
+  dialogSelectDiviceVisible.value = true
+  isMulti.value = true
+}
+
+// 选择设备对话框关闭
+const closeDialog = () => {
+  dialogSelectDiviceVisible.value = false
+}
+
+// 选择好设备了, 添加选好的设备到表格中
+const updateDeviceConfirm = (val: Array<IdeviceList>) => {
+  if (isMulti.value) { // 批量增加时push
+    val.forEach((item: IdeviceList) => {
+    // 只添加列表里不存在的
+      const index = list.value.findIndex((i: IdeviceList) => item.equipmentNo === i.equipmentNo)
+      if (index === -1) {
+        list.value.push(item)
+      }
+    })
+  }
+  else { // 单选替换
+    const index = list.value.findIndex((i: IdeviceList) => val[0].equipmentNo === i.equipmentNo)
+    if (index !== -1) {
+      ElMessage.warning('此设备已添加过')
+      return
+    }
+    list.value.splice(selectIndex.value, 1, val[0])
+  }
+}
+
+// 保存
+const save = () => {
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      // 保存之前清除空行、避免传给后端无用空对象
+      const index = list.value.findIndex((item: IdeviceList) => !item.equipmentNo)
+      if (index !== -1) {
+        list.value.splice(index, 1)
+      }
+      const params = {
+        applyName: form.value.applyName, // 申请名称
+        applyUnit: form.value.applyUnit, // 申请单位
+        applyPerson: form.value.applyPerson, // 申请人
+        time: form.value.time, // 领用时间
+        applyDesc: form.value.applyDesc, // 申请说明
+        applyType: '1', // 申请类型 领用1
+        id: form.value.id,
+        equipmentList: list.value.map((item) => {
+          return {
+            equipmentId: item.id!,
+          }
+        }),
+      }
+      // 新建
+      if (typeValue.value === 'add') {
+        saveAddReceiveApplyList(params).then((res) => {
+          form.value.id = res.data
+          ElMessage.success('保存成功')
+          loading.close()
+        })
+      }
+      // 保存
+      else if (typeValue.value === 'edit') {
+        saveEditReceiveApplyList(params).then((res) => {
+          form.value.id = res.data
+          ElMessage.success('保存成功')
+          loading.close()
+        })
+      }
+    }
+    else {
+      console.log('表单校验不通过')
+    }
+  })
+}
+
+// 提交表单
+const submit = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (form.value.id) {
+    const params = {
+      id: form.value.id,
+      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL, // 表单id
+    }
+    submitReceiveApplyList(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    })
+  }
+  else {
+    ElMessage.info('请先保存再提交！')
+  }
+}
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 获取使用部门
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res: any) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+// 审批结束回调
+const approvalSuccess = () => {
+  close()
+}
+
+// 编辑、详情--获取详细信息
+const fetchReceiveApplyListDetail = () => {
+  getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
+    form.value.applyUnit = res.data.applyUnit // 部门
+    form.value.applyName = res.data.applyName // 申请名称
+    form.value.applyPerson = res.data.applyPerson// 申请人
+    form.value.time = res.data.time // 领用时间
+    form.value.applyDesc = res.data.applyDesc // 申请说明
+    list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
+      return {
+        ...item,
+        validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+      }
+    })
+  })
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+onMounted(() => {
+  typeValue.value = $route.query.typeValue // 类型add、edit、detail
+  form.value.id = $route.query.id as string // id
+  form.value.taskId = $route.query.taskId as string // 任务id
+  form.value.processId = $route.query.processId as string // 任务id
+  approvalStatus.value = $route.query.approvalStatus // 审批类型
+  // 编辑、详情获取详情页信息
+  if (typeValue.value === 'edit' || typeValue.value === 'detail') {
+    fetchReceiveApplyListDetail() // 获取详细信息
+  }
+
+  // 获取部门信息
+  fetchDeptTreeList()
+  // 获取人员列表--申请人使用
+  fetchUserList()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`设备领用申请-${textMap[typeValue]}`">
+      <template #btns>
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('agree')">
+          同意
+        </el-button>
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('reject')">
+          驳回
+        </el-button>
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('refuse')">
+          拒绝
+        </el-button>
+        <el-button v-if="typeValue === 'add'" type="primary" @click="submit">
+          提交
+        </el-button>
+        <el-button v-if="typeValue === 'add' || typeValue === 'edit'" type="primary" @click="save">
+          保存
+        </el-button>
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '3'" type="primary" @click="handleClick('revoke')">
+          撤回
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div class="create-check">
+      <div class="top-info">
+        <!-- 表单 -->
+        <div class="form-area">
+          <el-form
+            ref="ruleFormRef"
+            :model="form"
+            label-width="120px"
+            :rules="rules"
+          >
+            <el-row :gutter="24">
+              <el-col :span="6">
+                <el-form-item label="申请名称" prop="applyName">
+                  <el-input
+                    v-model="form.applyName"
+                    :placeholder="typeValue === 'detail' ? '' : '请输入申请名称'"
+                    clearable
+                    :disabled="typeValue === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="申请单位" prop="applyUnit">
+                  <dept-select
+                    v-model="form.applyUnit"
+                    placeholder="请选择申请单位"
+                    :data="useDeptList"
+                    :disabled="typeValue === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="申请人" prop="applyPerson">
+                  <el-select
+                    v-model="form.applyPerson"
+                    :disabled="typeValue === 'detail'"
+                    placeholder="请选择申请人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="领用时间" prop="time">
+                  <el-date-picker
+                    v-model="form.time"
+                    type="datetime"
+                    placeholder="请选择领用时间"
+                    format="YYYY-MM-DD hh:mm"
+                    value-format="YYYY-MM-DD hh:mm"
+                    :disabled="typeValue === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="申请说明" prop="applyDesc">
+                  <el-input v-model="form.applyDesc" type="textarea" autosize clearable :disabled="typeValue === 'detail'" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </div>
+      </div>
+      <!-- 表格 -->
+      <detail-block title="设备领用列表">
+        <template #btns>
+          <el-button v-if="typeValue !== 'detail'" type="primary" @click="multiAdd">
+            批量添加
+          </el-button>
+          <el-button v-if="typeValue !== 'detail'" type="primary" @click="addRow">
+            增加行
+          </el-button>
+          <el-button v-if="typeValue !== 'detail'" type="info" @click="delRow">
+            删除行
+          </el-button>
+        </template>
+        <el-table
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column v-if="typeValue !== 'detail'" type="selection" width="38" />
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          >
+            <template v-if="item.value === 'equipmentNo' && (typeValue === 'add' || typeValue === 'edit')" #default="scope">
+              <el-input v-model="scope.row.equipmentNo" placeholder="请选择设备" class="input">
+                <template #append>
+                  <el-button size="small" @click="handleSelect(scope.$index, scope.row)">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+
+      <detail-block v-if="typeValue === 'detail'" title="审批流程">
+        <approval-record :process-id="form.processId" />
+      </detail-block>
+    </div>
+    <select-device-dialog
+      :dialog-select-divice-visible="dialogSelectDiviceVisible"
+      :is-multi="isMulti"
+      @closeDialog="closeDialog"
+      @updateDeviceConfirm="updateDeviceConfirm"
+    />
+
+    <!-- 同意、驳回、拒绝对话框显示 -->
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.create-check {
+  margin-top: 10px;
+
+  .top-info {
+    display: flex;
+    flex-direction: column;
+    width: 100%;
+    padding-right: 10px;
+    border-radius: 10px;
+    background-color: #fff;
+    // padding: 10px;
+
+    .title-button {
+      display: flex;
+      align-items: center;
+
+      &::before {
+        content: "";
+        flex: 1;
+      }
+
+      .button-group {
+        flex: 1;
+        display: flex;
+        justify-content: flex-end;
+      }
+    }
+
+    .form-area {
+      margin-top: 40px;
+    }
+  }
+}
+</style>
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
new file mode 100644
index 0000000..abf559c
--- /dev/null
+++ b/src/views/device/receive/apply/applyList.vue
@@ -0,0 +1,542 @@
+<script lang="ts" setup name="ApplyList">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+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 ButtonBox from '@/components/buttonBox/buttonBox.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { exportFile } from '@/utils/exportUtils'
+import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import {
+  delReceiveApplyList,
+  exportReceiveApplyList,
+  getReceiveApplyList,
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import { submitApproval } from '@/api/approval'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import type { userType } from '@/views/system/user/user-interface'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { getUserList } from '@/api/system/user'
+
+const loadingTable = ref(false) // 表格loading
+const active = ref('') // 选中的按钮
+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 listQuery: Ref<IlistQuery> = ref({
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  approvalStatus: active.value, // 	审批状态
+  processResult: '', // 	处置结果
+  applyType: '1', // 申请类型 领用1
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+  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 columns = ref<TableColumn[]>([
+  { text: '申请编号', value: 'applyNo', align: 'center' },
+  { text: '申请名称', value: 'applyName', align: 'center' },
+  { text: '申请部门', value: 'applyUnitName', align: 'center' },
+  { text: '申请人', value: 'applyPersonName', align: 'center' },
+  { text: '领用时间', value: 'time', align: 'center' },
+  { text: '申请说明', value: 'applyDesc', align: 'center' },
+  { text: '审批状态', value: 'approvalStatus', align: 'center' },
+])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 筛选时间段数据
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.startTime = timeRange.value[0] as string || ''
+  listQuery.value.endTime = timeRange.value[1] as string || ''
+  listQuery.value.approvalStatus = active.value
+  getReceiveApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IlistType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap[item.approvalStatus],
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: active.value, // 	审批状态
+    processResult: '', // 	处置结果
+    applyType: '1', // 申请类型 领用1
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', '']
+  fetchData(true)
+}
+
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+const $router = useRouter()
+
+// 新建
+const add = () => {
+  $router.push({ path: '/receive/add', query: { typeValue: 'add' } })
+}
+
+// 导出
+const exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    const params = {
+      applyNo: listQuery.value.applyNo, // 申请编号
+      applyName: listQuery.value.applyName, // 申请名称
+      applyUnit: listQuery.value.applyUnit, // 申请部门
+      applyPerson: listQuery.value.applyPerson, // 申请人
+      startTime: listQuery.value.startTime, // 申请开始日期
+      endTime: listQuery.value.endTime, // 申请结束日期
+      approvalStatus: listQuery.value.approvalStatus, // 	审批状态
+      processResult: listQuery.value.processResult, // 	处置结果
+      applyType: listQuery.value.applyType, // 申请类型 领用0
+      createUser: listQuery.value.createUser, // 创建人
+      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+      offset: 1,
+      limit: 20,
+      ids: checkoutList.value,
+    }
+    // 调导出接口
+    exportReceiveApplyList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备领用申请列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备领用申请列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: IlistType) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备领用申请列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 操作
+const handleEdit = (row: IlistType, val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      taskId: row.taskId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        submitApproval('revoke', params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+        })
+        fetchData(true)
+      })
+  }
+  else if (val === '删除') {
+    ElMessageBox.confirm(
+      '确认删除该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        delReceiveApplyList({ id: row.id, taskId: row.taskId }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '提交') {
+    ElMessageBox.confirm(
+      '确认提交该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        submitReceiveApplyList({ id: row.id, formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已提交',
+          })
+        })
+        fetchData(true)
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', row.taskId)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', row.taskId)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', row.taskId)
+  }
+  else if (val === '查看' || val === '编辑') {
+    $router.push({
+      path: `/receive/${title}`,
+      query: {
+        typeValue: title,
+        approvalStatus: approvalStatusReserveMap[row.approvalStatus],
+        id: row.id,
+        taskId: row.taskId,
+        processId: row.processId, // 查询审批记录使用
+      },
+    })
+  }
+}
+// 按钮切换
+const changeCurrentButton = (val: string) => {
+  active.value = val
+  window.sessionStorage.setItem('buttonBoxActive', val)
+  clearList()
+}
+
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 获取用户列表(增加模糊查询)
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 获取使用部门
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res: any) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+onMounted(() => {
+  if (window.sessionStorage.getItem('buttonBoxActive')) {
+    active.value = window.sessionStorage.getItem('buttonBoxActive')!
+  }
+  else {
+    active.value = '0' // 全部
+  }
+  nextTick(() => {
+    fetchData(true) // 获取表格数据
+    // 获取使用部门
+    fetchDeptTreeList() // 获取使用部门
+    fetchUserList() // 获取人员列表
+  })
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyNo"
+          placeholder="申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyName"
+          placeholder="申请名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.applyPerson"
+          placeholder="请选择申请人"
+          style="width: 100%;"
+          filterable
+          remote
+          remote-show-suffix
+          :remote-method="remoteMethod"
+          :loading="applyPersonLoading"
+        >
+          <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY-MM-DD hh:mm"
+          value-format="YYYY-MM-DD hh:mm"
+          start-placeholder="领用开始时间"
+          end-placeholder="领用结束时间"
+        />
+      </search-item>
+    </search-area>
+
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @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="220" fixed="right">
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="handleEdit(row, '查看', 'detail')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (active === '0' || active === '2')"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (active === '0' || active === '2')"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (active === '0' || active === '2')"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '编辑', 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (active === '0' || active === '3')"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (active !== '4' && active !== '5')"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatus === '未通过' || row.approvalStatus === '已通过'"
+                @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+    <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
+
diff --git a/src/views/device/receive/applyList.vue b/src/views/device/receive/applyList.vue
deleted file mode 100644
index 63e1ee8..0000000
--- a/src/views/device/receive/applyList.vue
+++ /dev/null
@@ -1,523 +0,0 @@
-<script lang="ts" setup name="ApplyList">
-import { ref } from 'vue'
-import type { Ref } from 'vue'
-import type { DateModelType } from 'element-plus'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { useRouter } from 'vue-router'
-import type { IlistQuery, IlistType } from '@/views/device/receive/receive'
-import ButtonBox from '@/views/device/receive/buttonBox.vue'
-import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-import { exportFile } from '@/utils/exportUtils'
-import { printJSON } from '@/utils/printUtils'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
-import {
-  delReceiveApplyList,
-  exportReceiveApplyList,
-  getReceiveApplyList,
-  submitReceiveApplyList,
-} from '@/api/device/receive'
-import { submitApproval } from '@/api/approval'
-import { getDeptTreeList } from '@/api/system/dept'
-import { toTreeList } from '@/utils/structure'
-import type { userType } from '@/views/system/user/user-interface'
-import type { deptType } from '@/views/device/standingBook/standingBook-interface'
-import { getUserList } from '@/api/system/user'
-
-const loadingTable = ref(false) // 表格loading
-const active = ref('0') // 选中的按钮
-const approvalDialog = ref() // 审批对话框显隐
-const useDeptList = ref<deptType[]>([]) // 部门列表
-const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
-const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
-const applyPersonLoading = ref(false) // 申请人模糊搜索框loading
-
-// 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  applyNo: '', // 申请编号
-  applyName: '', // 申请名称
-  applyUnit: '', // 申请部门id
-  applyUnitName: '', // 申请部门名称
-  applyPerson: '', // 申请人id
-  applyPersonName: '', // 申请人姓名
-  startTime: '', // 领用开始日期
-  endTime: '', // 领用结束日期
-  approvalStatus: '', // 	审批状态
-  processResult: '', // 	处置结果
-  applyType: '1', // 申请类型 领用1
-  createUser: '', // 创建人
-  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
-  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 columns = ref<TableColumn[]>([
-  { text: '申请编号', value: 'applyNo', align: 'center' },
-  { text: '申请名称', value: 'applyName', align: 'center' },
-  { text: '申请部门', value: 'applyUnitName', align: 'center' },
-  { text: '申请人', value: 'applyPersonName', align: 'center' },
-  { text: '领用时间', value: 'time', align: 'center' },
-  { text: '申请说明', value: 'applyDesc', align: 'center' },
-  { text: '审批状态', value: 'approvalStatus', align: 'center' },
-])
-// 选中的内容
-const checkoutList = ref<string[]>([])
-// 筛选时间段数据
-const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-
-// 数据查询
-function fetchData(isNowPage = false) {
-  loadingTable.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.value.offset = 1
-  }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
-  listQuery.value.approvalStatus = active.value
-  getReceiveApplyList(listQuery.value).then((response) => {
-    list.value = response.data.rows.map((item: IlistType) => {
-      return {
-        ...item,
-        approvalStatus: approvalStatusMap[item.approvalStatus],
-      }
-    })
-    total.value = parseInt(response.data.total)
-    loadingTable.value = false
-  })
-}
-
-// 重置
-const clearList = () => {
-  listQuery.value = {
-    applyNo: '', // 申请编号
-    applyName: '', // 申请名称
-    applyUnit: '', // 申请部门
-    applyPerson: '', // 申请人
-    startTime: '', // 申请开始日期
-    endTime: '', // 申请结束日期
-    approvalStatus: '', // 	审批状态
-    processResult: '', // 	处置结果
-    applyType: '1', // 申请类型 领用1
-    createUser: '', // 创建人
-    formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
-    offset: 1,
-    limit: 20,
-  }
-  timeRange.value = ['', '']
-  fetchData(true)
-}
-
-// 搜索
-const searchList = () => {
-  fetchData(true)
-}
-
-// 多选发生改变时
-const handleSelectionChange = (e: any) => {
-  checkoutList.value = e.map((item: { id: string }) => item.id)
-}
-const $router = useRouter()
-
-// 新建
-const add = () => {
-  $router.push({ path: '/receive/add', query: { typeValue: 'add' } })
-}
-
-// 导出
-const exportAll = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: '下载中请稍后',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (list.value.length > 0) {
-    const params = {
-      applyNo: listQuery.value.applyNo, // 申请编号
-      applyName: listQuery.value.applyName, // 申请名称
-      applyUnit: listQuery.value.applyUnit, // 申请部门
-      applyPerson: listQuery.value.applyPerson, // 申请人
-      startTime: listQuery.value.startTime, // 申请开始日期
-      endTime: listQuery.value.endTime, // 申请结束日期
-      approvalStatus: listQuery.value.approvalStatus, // 	审批状态
-      processResult: listQuery.value.processResult, // 	处置结果
-      applyType: listQuery.value.applyType, // 申请类型 领用0
-      createUser: listQuery.value.createUser, // 创建人
-      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
-      offset: 1,
-      limit: 20,
-      ids: checkoutList.value,
-    }
-    // 调导出接口
-    exportReceiveApplyList(params).then((res) => {
-      const blob = new Blob([res.data])
-      exportFile(blob, '设备领用申请列表.xlsx')
-    })
-  }
-  else {
-    ElMessage.warning('无数据可导出数据')
-  }
-  loading.close()
-}
-
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  fetchData(true)
-}
-
-// 打印列表
-function printList() {
-  // 打印列
-  const properties = columns.value.map((item) => {
-    return {
-      field: item.value,
-      displayName: item.text,
-    }
-  })
-  if (checkoutList.value.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '设备领用申请列表')
-  }
-  else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: IlistType) => checkoutList.value.includes(item.id))
-    printJSON(printList, properties, '设备领用申请列表')
-  }
-  else {
-    ElMessage.warning('无可打印内容')
-  }
-}
-
-// 操作
-const handleEdit = (row: IlistType, val: string, title = '') => {
-  if (val === '取消') {
-    const params = {
-      taskId: row.taskId!,
-      comments: '',
-    }
-    ElMessageBox.confirm(
-      '确认取消该审批吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        submitApproval('revoke', params).then((res) => {
-          ElMessage({
-            type: 'success',
-            message: '取消成功',
-          })
-        })
-        fetchData(true)
-      })
-  }
-  else if (val === '删除') {
-    ElMessageBox.confirm(
-      '确认删除该审批吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        delReceiveApplyList({ id: row.id, taskId: row.taskId }).then((res) => {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          fetchData(true)
-        })
-      })
-  }
-  else if (val === '提交') {
-    ElMessageBox.confirm(
-      '确认提交该审批吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        submitReceiveApplyList({ id: row.id, formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL }).then((res) => {
-          ElMessage({
-            type: 'success',
-            message: '已提交',
-          })
-        })
-        fetchData(true)
-      })
-  }
-  else if (val === '同意') {
-    approvalDialog.value.initDialog('agree', row.taskId)
-  }
-  else if (val === '驳回') {
-    approvalDialog.value.initDialog('reject', row.taskId)
-  }
-  else if (val === '拒绝') {
-    approvalDialog.value.initDialog('refuse', row.taskId)
-  }
-  else if (val === '查看' || val === '编辑') {
-    $router.push({
-      path: `/receive/${title}`,
-      query: {
-        typeValue: title,
-        approvalStatus: approvalStatusReserveMap[row.approvalStatus],
-        id: row.id,
-        taskId: row.taskId,
-        processId: row.processId, // 查询审批记录使用
-      },
-    })
-  }
-}
-// 按钮切换
-const changeCurrentButton = (val: string) => {
-  active.value = val
-  clearList()
-}
-
-// 审批结束回调
-const approvalSuccess = () => {
-  fetchData(true)
-}
-
-// 选择器模糊查询
-const remoteMethod = (query: string) => {
-  if (query) {
-    applyPersonLoading.value = true
-    setTimeout(() => {
-      applyPersonLoading.value = false
-      usePersonOptions.value = usePersonList.value.filter((item) => {
-        return item.name.toLowerCase().includes(query.toLowerCase())
-      })
-    }, 200)
-  }
-  else {
-    usePersonOptions.value = usePersonList.value
-  }
-}
-
-// 获取用户列表(增加模糊查询)
-const fetchUserList = () => {
-  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
-    usePersonList.value = res.data.rows
-    usePersonOptions.value = res.data.rows
-  })
-}
-
-// 获取使用部门
-const fetchDeptTreeList = () => {
-  getDeptTreeList().then((res: any) => {
-    if (res.data) { // 将列表转树结构
-      useDeptList.value = toTreeList(res.data, '0', true)
-    }
-  })
-}
-
-onMounted(() => {
-  fetchData(true)
-  // 获取使用部门
-  fetchDeptTreeList()
-  fetchUserList()
-})
-</script>
-
-<template>
-  <app-container>
-    <search-area
-      :need-clear="true"
-      @search="searchList" @clear="clearList"
-    >
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.applyNo"
-          placeholder="申请编号"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.applyName"
-          placeholder="申请名称"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
-      </search-item>
-      <search-item>
-        <el-select
-          v-model="listQuery.applyPerson"
-          placeholder="请选择申请人"
-          style="width: 100%;"
-          filterable
-          remote
-          remote-show-suffix
-          :remote-method="remoteMethod"
-          :loading="applyPersonLoading"
-        >
-          <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="timeRange"
-          type="daterange"
-          range-separator="到"
-          format="YYYY-MM-DD"
-          value-format="YYYY-MM-DD"
-          start-placeholder="领用开始日期"
-          end-placeholder="领用结束日期"
-        />
-      </search-item>
-    </search-area>
-
-    <table-container>
-      <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
-      </template>
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @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="220" fixed="right">
-            <template #default="{ row }">
-              <el-button
-                size="small"
-                type="primary"
-                link
-                @click="handleEdit(row, '查看', 'detail')"
-              >
-                查看
-              </el-button>
-              <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (active === '0' || active === '2')"
-                size="small"
-                link
-                type="primary"
-                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
-                @click="handleEdit(row, '同意')"
-              >
-                同意
-              </el-button>
-              <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (active === '0' || active === '2')"
-                size="small"
-                link
-                type="primary"
-                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
-                @click="handleEdit(row, '驳回')"
-              >
-                驳回
-              </el-button>
-              <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (active === '0' || active === '2')"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
-                @click="handleEdit(row, '拒绝')"
-              >
-                拒绝
-              </el-button>
-              <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
-                size="small"
-                link
-                type="primary"
-                @click="handleEdit(row, '编辑', 'edit')"
-              >
-                编辑
-              </el-button>
-              <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
-                size="small"
-                link
-                type="primary"
-                @click="handleEdit(row, '提交')"
-              >
-                提交
-              </el-button>
-              <!-- 是发起者且审批中可以取消 -->
-              <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (active === '0' || active === '3')"
-                size="small"
-                link
-                type="info"
-                :disabled="row.approvalStatus !== '审批中'"
-                @click="handleEdit(row, '取消')"
-              >
-                取消
-              </el-button>
-              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-              <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (active !== '4' && active !== '5')"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatus === '未通过' || row.approvalStatus === '已通过'"
-                @click="handleEdit(row, '删除')"
-              >
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <button-box :active="active" @changeCurrentButton="changeCurrentButton" />
-    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-  </app-container>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-</style>
-
diff --git a/src/views/device/receive/buttonBox.vue b/src/views/device/receive/buttonBox.vue
deleted file mode 100644
index 4205fa8..0000000
--- a/src/views/device/receive/buttonBox.vue
+++ /dev/null
@@ -1,46 +0,0 @@
-<script lang="ts" setup name="ButtonBox">
-import { ref } from 'vue'
-const emits = defineEmits(['changeCurrentButton'])
-const menu = [
-  { name: '全部', id: '0' },
-  { name: '草稿箱', id: '1' },
-  { name: '待审批', id: '2' },
-  { name: '审批中', id: '3' },
-  { name: '已通过', id: '4' },
-  { name: '未通过', id: '5' },
-  { name: '已取消', id: '6' },
-]
-const current = ref('0')
-watch(current, (newValue) => {
-  emits('changeCurrentButton', newValue)
-})
-</script>
-
-<template>
-  <div class="container">
-    <div class="btns">
-      <!-- 三级菜单 -->
-      <el-radio-group v-model="current">
-        <el-radio-button v-for="item in menu" :key="item.id" :label="item.id">
-          {{ item.name }}
-        </el-radio-button>
-      </el-radio-group>
-    </div>
-    <!-- 展示区域 -->
-    <!-- <component :is="currentComp" /> -->
-  </div>
-</template>
-
-<style lang="scss" scoped>
-.container {
-  position: relative;
-
-  .btns {
-    position: fixed;
-    top: 69px;
-    right: 15px;
-    z-index: 999;
-  }
-}
-</style>
-
diff --git a/src/views/device/receive/createOrCheck.vue b/src/views/device/receive/createOrCheck.vue
deleted file mode 100644
index 9cbc3bc..0000000
--- a/src/views/device/receive/createOrCheck.vue
+++ /dev/null
@@ -1,552 +0,0 @@
-<script lang="ts" setup name="CreateOrCheck">
-import { onMounted, reactive, ref } from 'vue'
-import type { Ref } from 'vue'
-import dayjs from 'dayjs'
-import type { FormInstance, FormRules } from 'element-plus'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { useRoute, useRouter } from 'vue-router'
-import type { IdeviceList, IdeviceListQuery } from './receive'
-import SelectDeviceDialog from './selectDeviceDialog.vue'
-import { toTreeList } from '@/utils/structure'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
-import {
-  getReceiveApplyListDetail,
-  saveAddReceiveApplyList,
-  saveEditReceiveApplyList,
-  submitReceiveApplyList,
-} from '@/api/device/receive'
-import type { userType } from '@/views/system/user/user-interface'
-import type { deptType } from '@/views/device/standingBook/standingBook-interface'
-import { getDeptTreeList } from '@/api/system/dept'
-import { getUserList } from '@/api/system/user'
-import { submitApproval } from '@/api/approval'
-import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
-
-const $route = useRoute()
-const approvalDialog = ref() // 审批对话框显隐
-const typeValue = ref() // add、edit、detail
-const approvalStatus = ref() // 审批类型
-const useDeptList = ref<deptType[]>([]) // 部门列表
-const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
-const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
-const applyPersonLoading = ref(false)
-const isMulti = ref(false) // 是否批量添加(允许多选)
-const selectIndex = ref() // 点击选择的index--点击第几行
-const dialogSelectDiviceVisible = ref(false) // 控制选择设备对话框显隐
-const textMap: { [key: string]: string } = {
-  edit: '编辑',
-  add: '新建',
-  detail: '详情',
-}// 字典
-// 选中的内容
-const checkoutList = ref([])
-// 表单数据
-const form = ref({
-  taskId: '', // 任务id（审批用）
-  id: '',
-  processId: '', // 流程id--查询审批记录使用
-  applyName: '', // 申请名称
-  applyUnit: '', // 申请单位
-  applyPerson: '', // 申请人
-  time: '', // 领用时间
-  applyDesc: '', // 申请说明
-})
-const ruleFormRef = ref<FormInstance>() as any
-const list = ref<IdeviceList[]>([])// 表格数据
-
-// 查询条件
-const listQuery: Ref<IdeviceListQuery> = ref({
-  equipmentName: '', // 仪器名称
-  equipmentNo: '', // 设备编号
-  modelNo: '', // 型号
-  mesureRange: '', // 测量范围
-  useDeptName: '', // 使用部门
-  usePersonName: '', // 使用人
-  managerStateName: '', // 管理状态
-  validDate: '', // 有效日期
-  offset: 1,
-  limit: 20,
-})
-// 表头
-const columns = ref<TableColumn[]>([
-  { text: '设备编号', value: 'equipmentNo', align: 'center', width: '230' },
-  { text: '设备名称', value: 'equipmentName', align: 'center' },
-  { text: '型号', value: 'modelNo', align: 'center' },
-  { text: '测量范围', value: 'mesureRange', align: 'center' },
-  { text: '使用部门', value: 'useDeptName', align: 'center' },
-  { text: '使用人', value: 'usePersonName', align: 'center' },
-  { text: '管理状态', value: 'managerStateName', align: 'center' },
-  { text: '有效日期', value: 'validDate', align: 'center' },
-])
-// 表单校验规则
-const rules = reactive<FormRules>({
-  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
-  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'change' }],
-  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
-  time: [{ type: 'date', required: true, message: '领用时间不能为空', trigger: 'change' }],
-  applyDesc: [{ required: true, message: '申请说明不能为空', trigger: 'blur' }],
-})
-
-const $router = useRouter()
-// 点击关闭
-const close = () => {
-  $router.back()
-}
-
-const handleClick = (val: string) => {
-  if (val === 'agree') { // 同意
-    approvalDialog.value.initDialog('agree', form.value.taskId)
-  }
-  else if (val === 'reject') { // 驳回
-    approvalDialog.value.initDialog('reject', form.value.taskId)
-  }
-  else if (val === 'refuse') { // 拒绝
-    approvalDialog.value.initDialog('refuse', form.value.taskId)
-  }
-  else if (val === 'revoke') {
-    const params = {
-      taskId: form.value.taskId!,
-      comments: '',
-    }
-    ElMessageBox.confirm(
-      '确认撤回该审批吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        submitApproval('revoke', params).then((res) => {
-          ElMessage({
-            type: 'success',
-            message: '已撤回',
-          })
-        })
-        close()
-      })
-  }
-}
-
-// 多选发生改变时
-const handleSelectionChange = (e: any) => {
-  checkoutList.value = e
-}
-
-// 删除行
-const delRow = () => {
-  if (checkoutList.value.length <= 0) {
-    ElMessage({
-      message: '请选中要删除的行',
-      type: 'warning',
-    })
-  }
-  else {
-    checkoutList.value.forEach((item: IdeviceListQuery) => {
-      list.value.forEach((element, index) => {
-        if (element.equipmentNo === item.equipmentNo) {
-          list.value.splice(index, 1)
-        }
-      })
-    })
-  }
-}
-
-// 增加行
-const addRow = () => {
-  const index = list.value.findIndex(item => !item.equipmentNo)
-  if (index !== -1) {
-    ElMessage.warning('请完善上一条设备信息')
-    return
-  }
-  list.value.push({
-    equipmentName: '', // 设备名称
-    equipmentNo: '', // 设备编号
-    modelNo: '', // 型号
-    mesureRange: '', // 测量范围
-    useDeptName: '', // 使用部门
-    usePersonName: '', // 使用人
-    managerStateName: '', // 管理状态
-    validDate: '', // 有效日期
-    equipmentId: '', // 设备ID
-  })
-}
-
-// 点击选择
-const handleSelect = (index: number, row: IdeviceList) => {
-  dialogSelectDiviceVisible.value = true // 选择设备对话框显隐
-  isMulti.value = false // 是否单选, false单选、true表格多选
-  selectIndex.value = index
-}
-
-// 点击批量添加
-const multiAdd = () => {
-  dialogSelectDiviceVisible.value = true
-  isMulti.value = true
-}
-
-// 选择设备对话框关闭
-const closeDialog = () => {
-  dialogSelectDiviceVisible.value = false
-}
-
-// 选择好设备了, 添加选好的设备到表格中
-const updateDeviceConfirm = (val: Array<IdeviceList>) => {
-  if (isMulti.value) { // 批量增加时push
-    val.forEach((item: IdeviceList) => {
-    // 只添加列表里不存在的
-      const index = list.value.findIndex((i: IdeviceList) => item.equipmentNo === i.equipmentNo)
-      if (index === -1) {
-        list.value.push(item)
-      }
-    })
-  }
-  else { // 单选替换
-    const index = list.value.findIndex((i: IdeviceList) => val[0].equipmentNo === i.equipmentNo)
-    if (index !== -1) {
-      ElMessage.warning('此设备已添加过')
-      return
-    }
-    list.value.splice(selectIndex.value, 1, val[0])
-  }
-}
-
-// 保存
-const save = () => {
-  ruleFormRef.value.validate((valid: boolean) => {
-    if (valid) {
-      const loading = ElLoading.service({
-        lock: true,
-        background: 'rgba(255, 255, 255, 0.8)',
-      })
-      // 保存之前清除空行、避免传给后端无用空对象
-      const index = list.value.findIndex((item: IdeviceList) => !item.equipmentNo)
-      if (index !== -1) {
-        list.value.splice(index, 1)
-      }
-      const params = {
-        applyName: form.value.applyName, // 申请名称
-        applyUnit: form.value.applyUnit, // 申请单位
-        applyPerson: form.value.applyPerson, // 申请人
-        time: form.value.time, // 领用时间
-        applyDesc: form.value.applyDesc, // 申请说明
-        applyType: '1', // 申请类型 领用1
-        id: form.value.id,
-        equipmentList: list.value.map((item) => {
-          return {
-            equipmentId: item.id!,
-          }
-        }),
-      }
-      // 新建
-      if (typeValue.value === 'add') {
-        saveAddReceiveApplyList(params).then((res) => {
-          form.value.id = res.data
-          ElMessage.success('保存成功')
-          loading.close()
-        })
-      }
-      // 保存
-      else if (typeValue.value === 'edit') {
-        saveEditReceiveApplyList(params).then((res) => {
-          form.value.id = res.data
-          ElMessage.success('保存成功')
-          loading.close()
-        })
-      }
-    }
-    else {
-      console.log('表单校验不通过')
-    }
-  })
-}
-
-// 提交表单
-const submit = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (form.value.id) {
-    const params = {
-      id: form.value.id,
-      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL, // 表单id
-    }
-    submitReceiveApplyList(params).then(() => {
-      ElMessage.success('提交成功')
-      loading.close()
-      close()
-    })
-  }
-  else {
-    ElMessage.info('请先保存再提交！')
-  }
-}
-
-// 获取用户列表--（是否有不分页接口？）
-const fetchUserList = () => {
-  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
-    usePersonList.value = res.data.rows
-    usePersonOptions.value = res.data.rows
-  })
-}
-
-// 获取使用部门
-const fetchDeptTreeList = () => {
-  getDeptTreeList().then((res: any) => {
-    if (res.data) { // 将列表转树结构
-      useDeptList.value = toTreeList(res.data, '0', true)
-    }
-  })
-}
-
-// 审批结束回调
-const approvalSuccess = () => {
-  close()
-}
-
-// 编辑、详情--获取详细信息
-const fetchReceiveApplyListDetail = () => {
-  getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
-    form.value.applyUnit = res.data.applyUnit // 部门
-    form.value.applyName = res.data.applyName // 申请名称
-    form.value.applyPerson = res.data.applyPerson// 申请人
-    form.value.time = res.data.time // 领用时间
-    form.value.applyDesc = res.data.applyDesc // 申请说明
-    list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
-      return {
-        ...item,
-        validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
-      }
-    })
-  })
-}
-
-// 选择器模糊查询
-const remoteMethod = (query: string) => {
-  if (query) {
-    applyPersonLoading.value = true
-    setTimeout(() => {
-      applyPersonLoading.value = false
-      usePersonOptions.value = usePersonList.value.filter((item) => {
-        return item.name.toLowerCase().includes(query.toLowerCase())
-      })
-    }, 200)
-  }
-  else {
-    usePersonOptions.value = usePersonList.value
-  }
-}
-
-onMounted(() => {
-  typeValue.value = $route.query.typeValue // 类型add、edit、detail
-  form.value.id = $route.query.id as string // id
-  form.value.taskId = $route.query.taskId as string // 任务id
-  form.value.processId = $route.query.processId as string // 任务id
-  approvalStatus.value = $route.query.approvalStatus // 审批类型
-  // 编辑、详情获取详情页信息
-  if (typeValue.value === 'edit' || typeValue.value === 'detail') {
-    fetchReceiveApplyListDetail() // 获取详细信息
-  }
-
-  // 获取部门信息
-  fetchDeptTreeList()
-  // 获取人员列表--申请人使用
-  fetchUserList()
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="`设备领用申请-${textMap[typeValue]}`">
-      <template #btns>
-        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('agree')">
-          同意
-        </el-button>
-        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('reject')">
-          驳回
-        </el-button>
-        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('refuse')">
-          拒绝
-        </el-button>
-        <el-button v-if="typeValue === 'add' || typeValue === 'edit'" type="primary" @click="save">
-          保存
-        </el-button>
-        <el-button v-if="typeValue === 'add'" type="primary" @click="submit">
-          提交
-        </el-button>
-        <el-button v-if="typeValue === 'edit' && approvalStatus === '3'" type="primary" @click="handleClick('revoke')">
-          撤回
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-    <div class="create-check">
-      <div class="top-info">
-        <!-- 表单 -->
-        <div class="form-area">
-          <el-form
-            ref="ruleFormRef"
-            :model="form"
-            label-width="120px"
-            :rules="rules"
-          >
-            <el-row :gutter="24">
-              <el-col :span="6">
-                <el-form-item label="申请名称" prop="applyName">
-                  <el-input
-                    v-model="form.applyName"
-                    :placeholder="typeValue === 'detail' ? '' : '请输入申请名称'"
-                    clearable
-                    :disabled="typeValue === 'detail'"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="申请单位" prop="applyUnit">
-                  <dept-select
-                    v-model="form.applyUnit"
-                    placeholder="请选择申请单位"
-                    :data="useDeptList"
-                    :disabled="typeValue === 'detail'"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="申请人" prop="applyPerson">
-                  <el-select
-                    v-model="form.applyPerson"
-                    :disabled="typeValue === 'detail'"
-                    placeholder="请选择申请人"
-                    style="width: 100%;"
-                    filterable
-                    remote
-                    remote-show-suffix
-                    :remote-method="remoteMethod"
-                    :loading="applyPersonLoading"
-                  >
-                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="领用时间" prop="time">
-                  <el-date-picker
-                    v-model="form.time"
-                    type="datetime"
-                    placeholder="请选择领用时间"
-                    format="YYYY-MM-DD hh:mm"
-                    value-format="YYYY-MM-DD hh:mm"
-                    :disabled="typeValue === 'detail'"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="申请说明" prop="applyDesc">
-                  <el-input v-model="form.applyDesc" type="textarea" autosize clearable :disabled="typeValue === 'detail'" />
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </el-form>
-        </div>
-      </div>
-      <!-- 表格 -->
-      <detail-block title="设备领用列表">
-        <template #btns>
-          <el-button v-if="typeValue !== 'detail'" type="primary" @click="multiAdd">
-            批量添加
-          </el-button>
-          <el-button v-if="typeValue !== 'detail'" type="primary" @click="addRow">
-            增加行
-          </el-button>
-          <el-button v-if="typeValue !== 'detail'" type="info" @click="delRow">
-            删除行
-          </el-button>
-        </template>
-        <el-table
-          :data="list"
-          border
-          style="width: 100%;"
-          max-height="600"
-          @selection-change="handleSelectionChange"
-        >
-          <el-table-column type="selection" width="38" />
-          <el-table-column align="center" label="序号" width="80" type="index" />
-          <el-table-column
-            v-for="item in columns"
-            :key="item.value"
-            :prop="item.value"
-            :label="item.text"
-            :width="item.width"
-            show-overflow-tooltip
-            align="center"
-          >
-            <template v-if="item.value === 'equipmentNo' && (typeValue === 'add' || typeValue === 'edit')" #default="scope">
-              <el-input v-model="scope.row.equipmentNo" placeholder="请选择设备" class="input">
-                <template #append>
-                  <el-button size="small" @click="handleSelect(scope.$index, scope.row)">
-                    选择
-                  </el-button>
-                </template>
-              </el-input>
-            </template>
-          </el-table-column>
-        </el-table>
-      </detail-block>
-
-      <detail-block v-if="typeValue === 'detail'" title="审批流程">
-        <approval-record :process-id="form.processId" />
-      </detail-block>
-    </div>
-    <select-device-dialog
-      :dialog-select-divice-visible="dialogSelectDiviceVisible"
-      :is-multi="isMulti"
-      @closeDialog="closeDialog"
-      @updateDeviceConfirm="updateDeviceConfirm"
-    />
-
-    <!-- 同意、驳回、拒绝对话框显示 -->
-    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-  </app-container>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-.create-check {
-  margin-top: 10px;
-
-  .top-info {
-    display: flex;
-    flex-direction: column;
-    width: 100%;
-    padding-right: 10px;
-    border-radius: 10px;
-    background-color: #fff;
-    // padding: 10px;
-
-    .title-button {
-      display: flex;
-      align-items: center;
-
-      &::before {
-        content: "";
-        flex: 1;
-      }
-
-      .button-group {
-        flex: 1;
-        display: flex;
-        justify-content: flex-end;
-      }
-    }
-
-    .form-area {
-      margin-top: 40px;
-    }
-  }
-}
-</style>
diff --git a/src/views/device/receive/receive.ts b/src/views/device/receive/receive.ts
index 2754aee..056fe60 100644
--- a/src/views/device/receive/receive.ts
+++ b/src/views/device/receive/receive.ts
@@ -82,3 +82,8 @@
   managerStateName: string // 管理状态
   validDate: string // 有效日期
 }
+
+export interface IMenu {
+  name: string // 名字
+  id: string
+}
diff --git a/src/views/device/receive/solve/solveDetail.vue b/src/views/device/receive/solve/solveDetail.vue
new file mode 100644
index 0000000..8076684
--- /dev/null
+++ b/src/views/device/receive/solve/solveDetail.vue
@@ -0,0 +1,257 @@
+<script lang="ts" setup name="Detail">
+import { onMounted, ref } from 'vue'
+import { useRoute, useRouter } from 'vue-router'
+import { ElLoading } from 'element-plus'
+import type { Ref } from 'vue'
+import dayjs from 'dayjs'
+import type { IdeviceList, IdeviceListQuery } from '../receive'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getReceiveApplyListDetail } from '@/api/device/receive'
+import type { userType } from '@/views/system/user/user-interface'
+import { getUserList } from '@/api/system/user'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+
+const $route = useRoute()
+const { proxy } = getCurrentInstance() as any
+const useDeptList = ref<deptType[]>([]) // 部门列表
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const total = ref(20)// 总数
+// 表单数据
+const form = ref({
+  id: '',
+  processId: '', // 流程id--查询审批记录使用
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 领用时间
+  applyDesc: '', // 申请说明
+})
+const list = ref<IdeviceList[]>([])// 表格数据
+// 查询条件
+const listQuery: Ref<IdeviceListQuery> = ref({
+  equipmentName: '', // 仪器名称
+  equipmentNo: '', // 设备编号
+  modelNo: '', // 型号
+  mesureRange: '', // 测量范围
+  useDeptName: '', // 使用部门
+  usePersonName: '', // 使用人
+  managerStateName: '', // 管理状态
+  validDate: '', // 有效日期
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '设备编号', value: 'equipmentNo', align: 'center', width: '230' },
+  { text: '设备名称', value: 'equipmentName', align: 'center' },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: '测量范围', value: 'mesureRange', align: 'center' },
+  { text: '使用部门', value: 'useDeptName', align: 'center' },
+  { text: '使用人', value: 'usePersonName', align: 'center' },
+  { text: '管理状态', value: 'managerStateName', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center' },
+])
+
+// 编辑、详情--获取详细信息
+const fetchReceiveApplyListDetail = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
+    form.value.applyUnit = res.data.applyUnit // 部门
+    form.value.applyName = res.data.applyName// 申请名称
+    form.value.applyPerson = res.data.applyPerson// 申请人
+    form.value.time = res.data.time // 领用时间
+    form.value.applyDesc = res.data.applyDesc // 申请说明
+    list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
+      return {
+        ...item,
+        validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+      }
+    })
+    loading.close()
+  })
+}
+
+// 点击关闭
+const $router = useRouter()
+const close = () => {
+  $router.back()
+}
+
+// 打印
+const printObj = ref({
+  id: 'lysq', // 需要打印元素的id
+  popTitle: '设备领用详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备领用详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+  })
+}
+
+// 获取使用部门
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res: any) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+onMounted(async () => {
+  form.value.id = $route.query.id as string // id
+  form.value.processId = $route.query.processId as string // 任务id
+
+  // 获取部门信息
+  await fetchDeptTreeList()
+  // 获取人员列表
+  await fetchUserList()
+  // 编辑、详情获取详情页信息
+  fetchReceiveApplyListDetail() // 获取详细信息
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="设备领用处理-详情">
+      <template #btns>
+        <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div id="lysq" class="lysq-create-check">
+      <div class="top-info">
+        <detail-block title="领用申请">
+          <div class="form-area">
+            <el-form
+              ref="ruleFormRef"
+              :model="form"
+              label-width="120px"
+            >
+              <el-row :gutter="24">
+                <el-col :span="6">
+                  <el-form-item label="申请名称" prop="applyName">
+                    <el-input v-model="form.applyName" disabled />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="申请单位" prop="applyUnit">
+                    <dept-select
+                      v-model="form.applyUnit"
+                      :data="useDeptList"
+                      disabled
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="申请人" prop="applyPerson">
+                    <el-select v-model="form.applyPerson" disabled style="width: 100%;">
+                      <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="领用时间" prop="time">
+                    <el-date-picker
+                      v-model="form.time"
+                      type="datetime"
+                      format="YYYY-MM-DD hh:mm"
+                      value-format="YYYY-MM-DD hh:mm"
+                      disabled
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="申请说明" prop="applyDesc">
+                    <el-input v-model="form.applyDesc" type="textarea" disabled autosize />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
+          </div>
+        </detail-block>
+      </div>
+      <detail-block title="设备领用列表">
+        <el-table
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          />
+        </el-table>
+      </detail-block>
+      <detail-block title="审批流程">
+        <approval-record :process-id="form.processId" />
+      </detail-block>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.lysq-create-check {
+  margin-top: 10px;
+
+  .top-info {
+    display: flex;
+    flex-direction: column;
+    width: 100%;
+    padding-right: 10px;
+    border-radius: 10px;
+    background-color: #fff;
+    // padding: 10px;
+
+    .title-button {
+      display: flex;
+      align-items: center;
+
+      &::before {
+        content: "";
+        flex: 1;
+      }
+
+      .button-group {
+        flex: 1;
+        display: flex;
+        justify-content: flex-end;
+      }
+    }
+
+    .form-area {
+      margin-top: 40px;
+    }
+  }
+}
+</style>
+
+<style lang="scss">
+.lysq-create-check {
+  .el-form-item--default .el-form-item__label {
+    color: #000;
+  }
+}
+</style>
diff --git a/src/views/device/receive/solve/solveList.vue b/src/views/device/receive/solve/solveList.vue
new file mode 100644
index 0000000..b541f35
--- /dev/null
+++ b/src/views/device/receive/solve/solveList.vue
@@ -0,0 +1,436 @@
+<script lang="ts" setup name="SolveList">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
+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 { exportFile } from '@/utils/exportUtils'
+import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+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 {
+  delReceiveApplyList,
+  exportReceiveApplyList,
+  getReceiveApplyList,
+  updateProcessResult,
+} from '@/api/device/receive'
+
+const useDeptList = ref<deptType[]>([]) // 部门列表
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+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 listQuery: Ref<IlistQuery> = ref({
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  equipmentApplyProcessResult: active.value, // 设备申请处理结果--4待领用、5已领用
+  approvalStatus: '4', // 审批状态--已通过
+  processResult: active.value, // 	处置结果--4待领用、5已领用
+  applyType: '1', // 申请类型 领用1
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+  offset: 1,
+  limit: 20,
+})
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+
+// 表格数据
+const list = ref<IsolveListType[]>([])
+const { proxy } = getCurrentInstance() as any
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '申请编号', value: 'applyNo', align: 'center' },
+  { text: '申请名称', value: 'applyName', align: 'center' },
+  { text: '申请部门', value: 'applyUnitName', align: 'center' },
+  { text: '申请人', value: 'applyPersonName', align: 'center' },
+  { text: '领用时间', value: 'time', align: 'center' },
+  { text: '申请说明', value: 'applyDesc', align: 'center' },
+  { text: '审批状态', value: 'approvalStatus', align: 'center' },
+])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: '4', // 	审批状态--已通过
+    processResult: active.value, // 	处置结果
+    applyType: '1', // 申请类型 领用1
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+    equipmentApplyProcessResult: active.value, // 设备申请处理结果
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', ''] // 把时间选择框置空
+  fetchData(true)
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.startTime = timeRange.value[0] as string || ''
+  listQuery.value.endTime = timeRange.value[1] as string || ''
+  getReceiveApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IsolveListType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap[item.approvalStatus],
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 导出
+const exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    const params = {
+      applyNo: listQuery.value.applyNo, // 申请编号
+      applyName: listQuery.value.applyName, // 申请名称
+      applyUnit: listQuery.value.applyUnit, // 申请部门
+      applyPerson: listQuery.value.applyPerson, // 申请人
+      startTime: listQuery.value.startTime, // 申请开始日期
+      endTime: listQuery.value.endTime, // 申请结束日期
+      equipmentApplyProcessResult: listQuery.value.equipmentApplyProcessResult, // 设备申请处理结果--4待领用、5已领用
+      approvalStatus: listQuery.value.approvalStatus, // 	审批状态
+      processResult: listQuery.value.processResult, // 	处置结果
+      applyType: listQuery.value.applyType, // 申请类型 领用1
+      createUser: listQuery.value.createUser, // 创建人
+      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+      offset: 1,
+      limit: 20,
+      ids: checkoutList.value,
+    }
+    // 调导出接口
+    exportReceiveApplyList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备领用处理列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备领用处理列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: IsolveListType) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备领用处理列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 操作
+const $router = useRouter()
+const handleEdit = (row: IsolveListType, val: string) => {
+  if (val === '查看') {
+    $router.push({
+      path: '/receive/solveDetail',
+      query: {
+        id: row.id,
+        processId: row.processId, // 查询审批记录使用
+      },
+    })
+  }
+  else {
+    ElMessageBox.confirm(
+    `确认${val}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+    )
+      .then(() => {
+        if (val === '领用' || val === '退领') {
+          const processResult = val === '领用' ? '5' : '4'
+          updateProcessResult({ id: row.id, processResult }).then(() => {
+            ElMessage.success(`已${val}`)
+            fetchData(true)
+          })
+        }
+        if (val === '删除') {
+          delReceiveApplyList({ id: row.id, taskId: row.taskId }).then(() => {
+            ElMessage.success(`已${val}`)
+            fetchData(true)
+          })
+        }
+      })
+  }
+}
+
+// 右上角按钮切换
+const changeCurrentButton = (val: string) => {
+  active.value = val
+  window.sessionStorage.setItem('solveButtonBoxActive', val)
+  clearList()
+}
+
+// 标签识别
+const execTag = () => {}
+
+// 获取用户列表
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 获取使用部门
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res: any) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+onMounted(() => {
+  if (window.sessionStorage.getItem('solveButtonBoxActive')) {
+    active.value = window.sessionStorage.getItem('solveButtonBoxActive')!
+  }
+  else {
+    active.value = '4' // 未领用
+  }
+  nextTick(() => {
+    // 获取表格数据
+    fetchData(true)
+    // 获取使用部门
+    fetchDeptTreeList()
+    // 获取人员列表
+    fetchUserList()
+  })
+})
+onUnmounted(() => {
+  window.sessionStorage.setItem('solveButtonBoxActive', '')
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyNo"
+          placeholder="申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyName"
+          placeholder="申请名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
+      </search-item>
+      <search-item>
+        <el-form-item prop="applyPerson">
+          <el-select
+            v-model="listQuery.applyPerson"
+            placeholder="请选择申请人"
+            style="width: 100%;"
+            filterable
+            remote
+            remote-show-suffix
+            :remote-method="remoteMethod"
+            :loading="applyPersonLoading"
+          >
+            <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+          </el-select>
+        </el-form-item>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY-MM-DD hh:mm"
+          value-format="YYYY-MM-DD hh:mm"
+          start-placeholder="领用开始时间"
+          end-placeholder="领用结束时间"
+        />
+      </search-item>
+    </search-area>
+
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-device" title="标签识别" @click="execTag" />
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @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="scope">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="handleEdit(scope.row, '查看')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if="active === '4'"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(scope.row, '领用')"
+              >
+                领用
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="active === '4'"
+                size="small"
+                link
+                type="danger"
+                @click="handleEdit(scope.row, '删除')"
+              >
+                删除
+              </el-button>
+              <el-button
+                v-if="active === '5'"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(scope.row, '退领')"
+              >
+                退领
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+    <button-box
+      :active="active"
+      :menu="menu"
+      @changeCurrentButton="changeCurrentButton"
+    />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
+
diff --git a/src/views/device/receive/solveComponent/buttonBox.vue b/src/views/device/receive/solveComponent/buttonBox.vue
deleted file mode 100644
index 4a4de71..0000000
--- a/src/views/device/receive/solveComponent/buttonBox.vue
+++ /dev/null
@@ -1,41 +0,0 @@
-<script lang="ts" setup name="ButtonBox">
-import { ref } from 'vue'
-const emits = defineEmits(['changeCurrentButton'])
-const menu = [
-  { name: '未领用', id: '4' },
-  { name: '已领用', id: '5' },
-]
-const current = ref('4')
-watch(current, (newValue) => {
-  console.log(newValue)
-  emits('changeCurrentButton', newValue)
-})
-</script>
-
-<template>
-  <div class="container">
-    <div class="btns">
-      <!-- 三级菜单 -->
-      <el-radio-group v-model="current">
-        <el-radio-button v-for="item in menu" :key="item.id" :label="item.id">
-          {{ item.name }}
-        </el-radio-button>
-      </el-radio-group>
-    </div>
-    <!-- 展示区域 -->
-  </div>
-</template>
-
-<style lang="scss" scoped>
-.container {
-  position: relative;
-
-  .btns {
-    position: fixed;
-    top: 76px;
-    right: 15px;
-    z-index: 999;
-  }
-}
-</style>
-
diff --git a/src/views/device/receive/solveComponent/detail.vue b/src/views/device/receive/solveComponent/detail.vue
deleted file mode 100644
index 8076684..0000000
--- a/src/views/device/receive/solveComponent/detail.vue
+++ /dev/null
@@ -1,257 +0,0 @@
-<script lang="ts" setup name="Detail">
-import { onMounted, ref } from 'vue'
-import { useRoute, useRouter } from 'vue-router'
-import { ElLoading } from 'element-plus'
-import type { Ref } from 'vue'
-import dayjs from 'dayjs'
-import type { IdeviceList, IdeviceListQuery } from '../receive'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getReceiveApplyListDetail } from '@/api/device/receive'
-import type { userType } from '@/views/system/user/user-interface'
-import { getUserList } from '@/api/system/user'
-import type { deptType } from '@/views/device/standingBook/standingBook-interface'
-import { getDeptTreeList } from '@/api/system/dept'
-import { toTreeList } from '@/utils/structure'
-
-const $route = useRoute()
-const { proxy } = getCurrentInstance() as any
-const useDeptList = ref<deptType[]>([]) // 部门列表
-const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
-const total = ref(20)// 总数
-// 表单数据
-const form = ref({
-  id: '',
-  processId: '', // 流程id--查询审批记录使用
-  applyName: '', // 申请名称
-  applyUnit: '', // 申请单位
-  applyPerson: '', // 申请人
-  time: '', // 领用时间
-  applyDesc: '', // 申请说明
-})
-const list = ref<IdeviceList[]>([])// 表格数据
-// 查询条件
-const listQuery: Ref<IdeviceListQuery> = ref({
-  equipmentName: '', // 仪器名称
-  equipmentNo: '', // 设备编号
-  modelNo: '', // 型号
-  mesureRange: '', // 测量范围
-  useDeptName: '', // 使用部门
-  usePersonName: '', // 使用人
-  managerStateName: '', // 管理状态
-  validDate: '', // 有效日期
-  offset: 1,
-  limit: 20,
-})
-// 表头
-const columns = ref<TableColumn[]>([
-  { text: '设备编号', value: 'equipmentNo', align: 'center', width: '230' },
-  { text: '设备名称', value: 'equipmentName', align: 'center' },
-  { text: '型号', value: 'modelNo', align: 'center' },
-  { text: '测量范围', value: 'mesureRange', align: 'center' },
-  { text: '使用部门', value: 'useDeptName', align: 'center' },
-  { text: '使用人', value: 'usePersonName', align: 'center' },
-  { text: '管理状态', value: 'managerStateName', align: 'center' },
-  { text: '有效日期', value: 'validDate', align: 'center' },
-])
-
-// 编辑、详情--获取详细信息
-const fetchReceiveApplyListDetail = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
-    form.value.applyUnit = res.data.applyUnit // 部门
-    form.value.applyName = res.data.applyName// 申请名称
-    form.value.applyPerson = res.data.applyPerson// 申请人
-    form.value.time = res.data.time // 领用时间
-    form.value.applyDesc = res.data.applyDesc // 申请说明
-    list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
-      return {
-        ...item,
-        validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
-      }
-    })
-    loading.close()
-  })
-}
-
-// 点击关闭
-const $router = useRouter()
-const close = () => {
-  $router.back()
-}
-
-// 打印
-const printObj = ref({
-  id: 'lysq', // 需要打印元素的id
-  popTitle: '设备领用详情', // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备领用详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
-
-// 获取用户列表--（是否有不分页接口？）
-const fetchUserList = () => {
-  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
-    usePersonList.value = res.data.rows
-  })
-}
-
-// 获取使用部门
-const fetchDeptTreeList = () => {
-  getDeptTreeList().then((res: any) => {
-    if (res.data) { // 将列表转树结构
-      useDeptList.value = toTreeList(res.data, '0', true)
-    }
-  })
-}
-
-onMounted(async () => {
-  form.value.id = $route.query.id as string // id
-  form.value.processId = $route.query.processId as string // 任务id
-
-  // 获取部门信息
-  await fetchDeptTreeList()
-  // 获取人员列表
-  await fetchUserList()
-  // 编辑、详情获取详情页信息
-  fetchReceiveApplyListDetail() // 获取详细信息
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page title="设备领用处理-详情">
-      <template #btns>
-        <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
-          打印
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-    <div id="lysq" class="lysq-create-check">
-      <div class="top-info">
-        <detail-block title="领用申请">
-          <div class="form-area">
-            <el-form
-              ref="ruleFormRef"
-              :model="form"
-              label-width="120px"
-            >
-              <el-row :gutter="24">
-                <el-col :span="6">
-                  <el-form-item label="申请名称" prop="applyName">
-                    <el-input v-model="form.applyName" disabled />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                  <el-form-item label="申请单位" prop="applyUnit">
-                    <dept-select
-                      v-model="form.applyUnit"
-                      :data="useDeptList"
-                      disabled
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                  <el-form-item label="申请人" prop="applyPerson">
-                    <el-select v-model="form.applyPerson" disabled style="width: 100%;">
-                      <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                  <el-form-item label="领用时间" prop="time">
-                    <el-date-picker
-                      v-model="form.time"
-                      type="datetime"
-                      format="YYYY-MM-DD hh:mm"
-                      value-format="YYYY-MM-DD hh:mm"
-                      disabled
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="申请说明" prop="applyDesc">
-                    <el-input v-model="form.applyDesc" type="textarea" disabled autosize />
-                  </el-form-item>
-                </el-col>
-              </el-row>
-            </el-form>
-          </div>
-        </detail-block>
-      </div>
-      <detail-block title="设备领用列表">
-        <el-table
-          :data="list"
-          border
-          style="width: 100%;"
-          max-height="600"
-        >
-          <el-table-column align="center" label="序号" width="80" type="index" />
-          <el-table-column
-            v-for="item in columns"
-            :key="item.value"
-            :prop="item.value"
-            :label="item.text"
-            :width="item.width"
-            show-overflow-tooltip
-            align="center"
-          />
-        </el-table>
-      </detail-block>
-      <detail-block title="审批流程">
-        <approval-record :process-id="form.processId" />
-      </detail-block>
-    </div>
-  </app-container>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-.lysq-create-check {
-  margin-top: 10px;
-
-  .top-info {
-    display: flex;
-    flex-direction: column;
-    width: 100%;
-    padding-right: 10px;
-    border-radius: 10px;
-    background-color: #fff;
-    // padding: 10px;
-
-    .title-button {
-      display: flex;
-      align-items: center;
-
-      &::before {
-        content: "";
-        flex: 1;
-      }
-
-      .button-group {
-        flex: 1;
-        display: flex;
-        justify-content: flex-end;
-      }
-    }
-
-    .form-area {
-      margin-top: 40px;
-    }
-  }
-}
-</style>
-
-<style lang="scss">
-.lysq-create-check {
-  .el-form-item--default .el-form-item__label {
-    color: #000;
-  }
-}
-</style>

diff --git a/src/api/customer/overtime.ts b/src/api/customer/overtime.ts
deleted file mode 100644
index 9f349d6..0000000
--- a/src/api/customer/overtime.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * 到期样品接口
- */
-import request from '../index'
-import type { IOvertimeListQuery } from '@/views/customer/sample/overTime/overtime_list_interface'
-const prefix = '/meter'
-
-// 列表查询
-export function getOverTimeList(data: IOvertimeListQuery) {
-  return request({
-    url: `${prefix}/sample/overtime/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 导出列表
-export function exportOverTimeList(data: Omit<IOvertimeListQuery, 'limit' | 'offset'>) {
-  return request({
-    url: `${prefix}/sample/overtime/listExport`,
-    method: 'post',
-    responseType: 'blob',
-    data,
-  })
-}
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index 2610494..21a9c9e 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -59,3 +59,20 @@
   })
 }
 
+// 查询检定记录
+export function getMesureRecords(data: { id: string }) {
+  return request({
+    url: `${prefix}/sample/mesureRecordsBySampleId`,
+    method: 'post',
+    data,
+  })
+}
+
+// 查询检定证书
+export function getCertification(data: { id: string }) {
+  return request({
+    url: `${prefix}/sample/certificationBySampleId`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components.d.ts b/src/components.d.ts
index 227585d..90f2dde 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -21,6 +21,7 @@
     BarCodeBind: typeof import('./components/BarCodeBind/index.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
+    ButtonBox: typeof import('./components/buttonBox/buttonBox.vue')['default']
     CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default']
     CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
diff --git a/src/components/buttonBox/buttonBox.vue b/src/components/buttonBox/buttonBox.vue
new file mode 100644
index 0000000..cf93686
--- /dev/null
+++ b/src/components/buttonBox/buttonBox.vue
@@ -0,0 +1,49 @@
+<!-- 列表页右上角按钮组 -->
+<script lang="ts" setup name="ButtonBox">
+import type { PropType } from 'vue'
+import { ref } from 'vue'
+import type { IMenu } from '../../views/device/receive/receive'
+
+const props = defineProps({
+  active: String,
+  menu: {
+    type: Array as PropType<IMenu[]>,
+  },
+})
+const emits = defineEmits(['changeCurrentButton'])
+
+const current = ref('')
+watch(current, (newValue) => {
+  emits('changeCurrentButton', newValue)
+})
+watch(() => props.active, (newValue) => {
+  current.value = newValue!
+  console.log('pppppp', newValue)
+})
+</script>
+
+<template>
+  <div class="container">
+    <div class="btns">
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.id" :label="item.id">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 69px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 36f5104..fb6758e 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -481,7 +481,7 @@
       {
         path: 'applyList',
         name: 'ApplyList',
-        component: () => import('@/views/device/receive/applyList.vue'),
+        component: () => import('@/views/device/receive/apply/applyList.vue'),
         meta: {
           title: '设备领用申请',
           icon: 'ep:key',
@@ -491,7 +491,7 @@
       {
         path: ':type',
         name: 'ApplyListDetail',
-        component: () => import('@/views/device/receive/createOrCheck.vue'),
+        component: () => import('@/views/device/receive/apply/applyEdit.vue'),
         meta: {
           title: '设备领用申请',
           icon: 'ep:key',
@@ -503,7 +503,7 @@
       {
         path: 'solveList',
         name: 'SolveList',
-        component: () => import('@/views/device/receive/solveList.vue'),
+        component: () => import('@/views/device/receive/solve/solveList.vue'),
         meta: {
           title: '设备领用处理',
           icon: 'ep:key',
@@ -513,7 +513,7 @@
       {
         path: 'solveDetail',
         name: 'SolveListDetail',
-        component: () => import('@/views/device/receive/solveComponent/detail.vue'),
+        component: () => import('@/views/device/receive/solve/solveDetail.vue'),
         meta: {
           title: '设备领用处理',
           icon: 'ep:key',
diff --git a/src/views/customer/bench/bench.vue b/src/views/customer/bench/bench.vue
index 6b502fc..3b8f274 100644
--- a/src/views/customer/bench/bench.vue
+++ b/src/views/customer/bench/bench.vue
@@ -1,15 +1,53 @@
 <script lang="ts" setup name="DeviceBench">
-import { getCurrentInstance, ref } from 'vue'
+import { ref } from 'vue'
 import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
 import type { planReturn } from './bench-interface'
 import Linechart from '@/components/Echart/LineChart.vue'
 import type { lineDataI } from '@/components/Echart/echart-interface'
 import { getCustomerExpireData, getHighQualityCustomerList, getSampleAddData, getSampleExpireData } from '@/api/customer/bench'
+import { getSampleList } from '@/api/customer/sampleList'
+import type { IOvertimeListQuery } from '@/views/customer/sample/overTime/overtime_list_interface'
+import { getAdviceList } from '@/api/customer/advice'
+import type { IAdvice, IAdviceQuery } from '@/views/customer/advice/advice_interface'
 
+const reg = /(\d{4})\年(\d{2})月/ // 把2022年3月转为2022-03
 // 每个展示块高度
 const blockHeight = ref(300)
 const blockWidth = ref(400)
-const { proxy } = getCurrentInstance() as any
+
+// 到期样品查询条件
+const dueSampleListQuery: Ref<IOvertimeListQuery> = ref({
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 型号
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  startTime: '', // 检定开始时间
+  endTime: '', // 检定结束时间
+  overtimeStatus: '1', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+  offset: 1,
+  limit: 20,
+})
+
+// 客户关系查询条件
+const customerRelationsListQuery: Ref<IAdviceQuery> = ref({
+  adviceNo: '', // 投诉编号
+  customerName: '', // 公司名称
+  customerNo: '', // 客户编号
+  startTime: '', // 投诉开始时间
+  endTime: '', // 投诉结束时间
+  offset: 1,
+  limit: 20,
+})
+
+const dueSampleTableLoading = ref(false) // 到期样品表格loading
+const customerRelationsTableLoading = ref(false) // 客户关系loading
+const sampleAddLoading = ref(false) // 样品新增趋势loading
+const customerAddLoading = ref(false) // 客户新增趋势loading
+const sampleExpireLoading = ref(false) // 样品到期趋势loading
+const highQualityCustomerLoading = ref(false) // 优质客户名单loading
+
 // 到期样品表格数据
 const dueSampleTableData = ref()
 // 到期样品表头
@@ -64,54 +102,81 @@
   blockWidth.value = (document.body.clientWidth - 180 - 20 - 20) / 3
   console.log(blockHeight.value, blockWidth.value - 20)
 }
+
 window.addEventListener('resize', () => {
   calcBlockSize()
 })
 
 // 获取样品新增趋势数据
 function fetchSampleAddData() {
+  sampleAddLoading.value = true
   getSampleAddData().then((res) => {
-    sampleAddXData.value = res.data.map((item: planReturn) => {
-      // return item.date.replace('年', '-')
-      return item.date
-    })
+    sampleAddXData.value = res.data.map((item: planReturn) => item.date.replace(reg, '$1-$2'))
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     sampleAddYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
-    sampleAddData.value = [{ name: '客户', data: yValue }]
+    sampleAddData.value = [{ name: '样品', data: yValue }]
+    sampleAddLoading.value = false
   })
 }
 
 // 获取样品到期趋势数据
 function fetchSampleExpireData() {
+  sampleExpireLoading.value = true
   getSampleExpireData().then((res) => {
-    sampleExpireXData.value = res.data.map((item: planReturn) => item.date)
+    sampleExpireXData.value = res.data.map((item: planReturn) => item.date.replace(reg, '$1-$2'))
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     sampleExpireYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
-    sampleExpireData.value = [{ name: '客户', data: yValue }]
+    sampleExpireData.value = [{ name: '样品', data: yValue }]
+    sampleExpireLoading.value = false
   })
 }
 
 // 获取优质客户名单
 function fetchHighQualityCustomerList() {
+  highQualityCustomerLoading.value = true
   getHighQualityCustomerList().then((res) => {
     highQualityCustomerTableData.value = res.data.rows
+    highQualityCustomerLoading.value = false
   })
 }
 // 获取客户新增趋势数据
 function fetchCustomerExpireData() {
+  customerAddLoading.value = true
   getCustomerExpireData().then((res) => {
-    customerAddXData.value = res.data.map((item: planReturn) => item.date)
+    customerAddXData.value = res.data.map((item: planReturn) => item.date.replace(reg, '$1-$2'))
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     customerAddYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
     customerAddData.value = [{ name: '客户', data: yValue }]
+    customerAddLoading.value = false
   })
 }
 
 // 获取到期样品表格数据
+function fetchDueSampleTableData() {
+  dueSampleTableLoading.value = true
+  getSampleList(dueSampleListQuery.value).then((response) => {
+    dueSampleTableData.value = response.data.rows
+    dueSampleTableLoading.value = false
+  })
+}
 // 获取客户关系表格数据
+function fetchcustomerRelationsTableData() {
+  customerRelationsTableLoading.value = true
+  getAdviceList(customerRelationsListQuery.value).then((res) => {
+    customerRelationsTabledata.value = res.data.rows.map((item: IAdvice) => {
+      return {
+        ...item,
+        adviceClass: item.adviceClass === '0' ? '建议' : item.adviceClass === '1' ? '投诉' : '其他',
+      }
+    })
+    customerRelationsTableLoading.value = false
+  })
+}
 
 onMounted(() => {
   calcBlockSize()
+  fetchDueSampleTableData() // 到期样品表格
+  fetchcustomerRelationsTableData() // 客户关系表格
   fetchSampleAddData()// 样品新增趋势
   fetchSampleExpireData()// 样品到期趋势
   fetchCustomerExpireData()// 客户新增趋势
@@ -125,6 +190,7 @@
       <el-row :gutter="10">
         <el-col :span="8">
           <bench-col
+            v-loading="dueSampleTableLoading"
             icon="icon-book"
             title="到期样品"
             path-url="/sample/overtime"
@@ -145,6 +211,7 @@
         </el-col>
         <el-col :span="8">
           <bench-col
+            v-loading="sampleAddLoading"
             icon="icon-line"
             title="样品新增趋势"
             :height="blockHeight"
@@ -159,6 +226,7 @@
         </el-col>
         <el-col :span="8">
           <bench-col
+            v-loading="sampleExpireLoading"
             icon="icon-line"
             title="样品到期趋势"
             :height="blockHeight"
@@ -177,6 +245,7 @@
       <el-row :gutter="10">
         <el-col :span="8">
           <bench-col
+            v-loading="customerRelationsTableLoading"
             icon="icon-book"
             title="客户关系"
             path-url="/customerManage/advice"
@@ -197,6 +266,7 @@
         </el-col>
         <el-col :span="8">
           <bench-col
+            v-loading="customerAddLoading"
             icon="icon-line"
             title="客户新增趋势"
             :height="blockHeight"
@@ -211,6 +281,7 @@
         </el-col>
         <el-col :span="8">
           <bench-col
+            v-loading="highQualityCustomerLoading"
             icon="icon-book"
             title="优质客户名单"
             :style="{ height: blockHeight }"
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index e7d1acb..359c94d 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -8,7 +8,7 @@
 import selectCustomer from './selectCustomer.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import { addSample, getCertification, getMesureRecords, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
@@ -69,6 +69,7 @@
   sampleName: '', // 样品名称
   sampleModel: '', // 样品型号
   manufacturingNo: '', // 出厂编号
+  customerId: '', // 委托方id
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   phone: '', // 委托方电话
@@ -138,12 +139,17 @@
 })
 
 // 获取检定记录
-const fetchMeasureRecords = function (query = null) {
-  dataList.value.measureRecords = []
+const fetchMeasureRecords = (query = null) => {
+  getMesureRecords({ id: infoId.value }).then((res) => {
+    dataList.value.measureRecords = res.data.rows
+  })
 }
+
 // 获取检定证书
-const fetchCertifications = function (query = null) {
-  dataList.value.certificationRecords = []
+const fetchCertifications = (query = null) => {
+  getCertification({ id: infoId.value }).then((res) => {
+    dataList.value.certificationRecords = res.data.rows
+  })
 }
 
 // 菜单
@@ -151,12 +157,12 @@
   {
     name: '检定记录',
     columns: [
-      { text: '委托单编号', value: 'orderCode' },
-      { text: '委托单日期', value: 'orderTime' },
-      { text: '委托方代码', value: 'customerCode' },
-      { text: '委托方名称', value: 'customerName' },
-      { text: '送检人', value: 'deliverer' },
-      { text: '送检日期', value: 'deliverTime' },
+      { text: '委托单编号', value: 'orderCode', align: 'center' },
+      { text: '委托单日期', value: 'orderTime', align: 'center' },
+      { text: '委托方代码', value: 'customerCode', align: 'center' },
+      { text: '委托方名称', value: 'customerName', align: 'center' },
+      { text: '送检人', value: 'deliverer', align: 'center' },
+      { text: '送检日期', value: 'deliverTime', align: 'center' },
     ],
     list: 'measureRecords',
     pagination: true,
@@ -165,11 +171,11 @@
   {
     name: '检定证书',
     columns: [
-      { text: '证书编号', value: 'certificationCode' },
-      { text: '证书名称', value: 'certificationName' },
-      { text: '证书类型', value: 'certificationType' },
-      { text: '证书出具日期', value: 'effectiveDate' },
-      { text: '证书有效期', value: 'expirationDate' },
+      { text: '证书编号', value: 'certificationCode', align: 'center' },
+      { text: '证书名称', value: 'certificationName', align: 'center' },
+      { text: '证书类型', value: 'certificationType', align: 'center' },
+      { text: '证书出具日期', value: 'effectiveDate', align: 'center' },
+      { text: '证书有效期', value: 'expirationDate', align: 'center' },
     ],
     list: 'certificationRecords',
     pagination: true,
@@ -233,18 +239,18 @@
 // 委托方代码获取焦点
 const customerNoFocus = () => {
   visible.value = true
-  console.log(visible.value)
 }
 
 // 选好委托方
 const confirmCheckout = (val: Array<ICustomer>) => {
   if (val && val.length) {
     const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo
-    dataForm.value.customerName = getValue.customerName
-    dataForm.value.phone = getValue.phone
-    dataForm.value.postalCode = getValue.postalCode
-    dataForm.value.customerAddress = getValue.briefName
+    dataForm.value.customerNo = getValue.customerNo // 委托方代码
+    dataForm.value.customerId = getValue.id // 委托方id
+    dataForm.value.customerName = getValue.customerName // 委托方名称
+    dataForm.value.phone = getValue.phone // 电话
+    dataForm.value.postalCode = getValue.postalCode // 邮编
+    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
   }
 }
 
@@ -296,6 +302,7 @@
 const getInfo = () => {
   getSapmleDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data
+    dataForm.value.ABC = res.data.abc
     for (const item of menu) {
       item.searchFunc()
     }
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index a2c4307..c3690d4 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -35,6 +35,7 @@
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center', width: '180px' },
 ])
 // 表格数据
@@ -47,6 +48,7 @@
 const checkoutList = ref<string[]>([])
 // 文件上传input
 const fileRef = ref()
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -62,6 +64,7 @@
     loadingTable.value = false
   })
 }
+
 // 多选发生改变时
 function handleSelectionChange(e: any) {
   checkoutList.value = e.map((item: { id: string }) => item.id)
@@ -71,6 +74,7 @@
 const handleEdit = (row: ISampleList, pageType: 'edit' | 'detail') => {
   $router.push(`/sample/${pageType}/${row.id}`)
 }
+
 // 点击删除
 const handleDelete = (row: ISampleList) => {
   ElMessageBox.confirm(
@@ -94,10 +98,12 @@
       })
     })
 }
+
 // 点击搜索
 const searchList = () => {
   fetchData(true)
 }
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -112,7 +118,7 @@
     offset: 1,
     limit: 20,
   }
-  timeRange.value = ['', '']
+  timeRange.value = ['', ''] // 置空筛选时间
   fetchData(true)
 }
 
@@ -138,10 +144,12 @@
     ElMessage.error('请上传pdf格式')
   }
 }
+
 // 模板下载
 const templateDownload = () => {
 
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -157,10 +165,12 @@
 const uploadAll = () => {
   fileRef.value.click()
 }
+
 // 新建样品
 const add = () => {
   $router.push('/sample/add')
 }
+
 // 导出
 const exportAll = () => {
   const loading = ElLoading.service({
@@ -293,11 +303,13 @@
         <template #columns>
           <el-table-column label="操作" align="center" fixed="right" width="120">
             <template #default="{ row }">
+              <!-- 有orderid(关联了委托书)不允许编辑 -->
               <el-button
                 v-if="proxy.hasPerm('/sample/list/update')"
                 size="small"
                 type="primary"
                 link
+                :disabled="`${row.orderId}` !== ''"
                 @click="handleEdit(row, 'edit')"
               >
                 编辑
@@ -310,11 +322,13 @@
               >
                 详情
               </el-button>
+              <!-- 检测中的样品不允许删除 -->
               <el-button
                 v-if="proxy.hasPerm('/sample/list/delete')"
                 size="small"
                 link
                 type="danger"
+                :disabled="row.sampleSatus !== '3'"
                 @click="handleDelete(row)"
               >
                 删除
diff --git a/src/views/customer/sample/list/sample_list_interface.ts b/src/views/customer/sample/list/sample_list_interface.ts
index 707c8b5..81498a5 100644
--- a/src/views/customer/sample/list/sample_list_interface.ts
+++ b/src/views/customer/sample/list/sample_list_interface.ts
@@ -33,6 +33,7 @@
   sampleModel: string // 样品型号
   manufacturingNo: string // 出厂编号
   customerNo: string // 委托方代码
+  customerId: string // 委托方id
   customerName: string // 委托方名称
   phone: string // 委托方电话
   postalCode: string // 委托方邮编
diff --git a/src/views/customer/sample/list/selectCustomer.vue b/src/views/customer/sample/list/selectCustomer.vue
index 5de352d..0eef7d0 100644
--- a/src/views/customer/sample/list/selectCustomer.vue
+++ b/src/views/customer/sample/list/selectCustomer.vue
@@ -6,7 +6,8 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getCustomerList } from '@/api/customer/customer'
 import { getDictByCode } from '@/api/system/dict'
-const props = defineProps({
+
+defineProps({
   visible: {
     type: Boolean,
     default: false,
@@ -14,18 +15,9 @@
 })
 const emits = defineEmits(['changeVisible', 'confirmCheckout'])
 
-const visibleDialog = computed({
-  get() {
-    return props.visible
-  },
-  set(val) {
-    emits('changeVisible', val)
-  },
-})
-
 // 查询条件
 const listQuery: Ref<ICustomerQuery> = ref({
-  bussinessSize: '', // 业务规模
+  businessSize: '', // 业务规模
   customerName: '', // 公司名称
   customerNo: '', // 客户编号
   grade: '', // 履约评级
@@ -37,40 +29,20 @@
   name: string
   value: string
 }
-// const companySizeList = ref<dictType[]>([]) // 公司规模列表
+
 const businessSizeList = ref<dictType[]>([]) // 业务规模列表
 const gradeList = ref<dictType[]>([]) // 履约评级列表
-// const evaluationList = ref<dictType[]>([]) // 整体评价列表
-function getDict() {
-  // // 获取公司规模
-  // getDictByCode('companySize').then((response) => {
-  //   companySizeList.value = response.data
-  // })
-  // 获取业务规模
-  getDictByCode('businessSize').then((response) => {
-    businessSizeList.value = response.data
-  })
-  // 获取履约评级
-  getDictByCode('grade').then((response) => {
-    gradeList.value = response.data
-  })
-  // // 获取整体评价
-  // getDictByCode('evaluation').then((response) => {
-  //   evaluationList.value = response.data
-  // })
-}
-getDict()
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '客户编号', value: 'customerNo', width: '160', align: 'center', fixed: true },
-  { text: '客户名称', value: 'customerName', width: '120', align: 'center', fixed: true },
-  { text: '公司规模', value: 'companySizeName', align: 'center', fixed: false },
-  { text: '业务规模', value: 'businessSizeName', align: 'center', fixed: false },
-  { text: '履约评级', value: 'gradeName', align: 'center', fixed: false },
-  { text: '整体评价', value: 'evaluationName', align: 'center', fixed: false },
-  { text: '公司地址', value: 'briefName', align: 'center', fixed: false },
-  { text: '创建时间', value: 'createTime', align: 'center', width: '180px', fixed: false },
-  { text: '备注', value: 'remark', align: 'center', fixed: false },
+  { text: '客户名称', value: 'customerName', align: 'center', fixed: true },
+  { text: '公司规模', value: 'companySizeName', width: '110', align: 'center' },
+  { text: '业务规模', value: 'businessSizeName', width: '130', align: 'center' },
+  { text: '履约评级', value: 'gradeName', width: '90', align: 'center' },
+  { text: '整体评价', value: 'evaluationName', width: '110', align: 'center' },
+  { text: '公司地址', value: 'fullAddress', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
+  { text: '备注', value: 'remark', align: 'center' },
 ])
 // 表格数据
 const list = ref<ICustomer[]>([])
@@ -81,44 +53,42 @@
 // 选中的内容
 const checkoutList = ref<string[]>([])
 
-// 数据查询
+function getDict() {
+  // 获取业务规模
+  getDictByCode('businessSize').then((response) => {
+    businessSizeList.value = response.data
+  })
+  // 获取履约评级
+  getDictByCode('grade').then((response) => {
+    gradeList.value = response.data
+  })
+}
+getDict()
+
+// 表格数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getCustomerList(listQuery.value).then((response) => {
-  //   // 模拟数据
-  //   response.data.rows = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', customerAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  //   list.value = response.data.rows.map((item: ICustomer) => {
-  //     if (item.companyProvinceName && item.companyCityName) {
-  //       item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-  //     }
-  //     else {
-  //       item.briefName = item.companyProvinceName || item.companyCityName
-  //     }
-  //     return item
-  //   })
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-
-  // 模拟数据
-  const response = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', customerAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' },
-    { bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', customerAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '2集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' },
-    { bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', customerAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '3集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  list.value = response.map((item: ICustomer) => {
-    if (item.companyProvinceName && item.companyCityName) {
-      item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-    }
-    else {
-      item.briefName = item.companyProvinceName || item.companyCityName
-    }
-    return item
+  getCustomerList(listQuery.value).then((response) => {
+    // 模拟数据
+    list.value = response.data.rows.map((item: ICustomer) => {
+      if (item.addressProvinceName && item.addressCityName) {
+        item.fullAddress = `${item.addressProvinceName}/${item.addressCityName}`
+      }
+      else if (item.addressProvinceName || item.addressCityName) {
+        item.fullAddress = item.addressProvinceName || item.addressCityName
+      }
+      else if (item.addressCountryName) {
+        item.fullAddress = item.addressCountryName
+      }
+      return item
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
   })
-  total.value = 50
-  loadingTable.value = false
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -131,7 +101,7 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    bussinessSize: '', // 业务规模
+    businessSize: '', // 业务规模
     customerName: '', // 公司名称
     customerNo: '', // 客户编号
     grade: '', // 履约评级
@@ -155,9 +125,9 @@
 const cancle = () => {
   emits('changeVisible', false)
 }
+
 // 点击确定
 const clickConfirm = () => {
-  console.log(checkoutList.value)
   if (!checkoutList.value.length) {
     ElMessage({
       message: '请选中',
diff --git a/src/views/customer/sample/overTime/detail.vue b/src/views/customer/sample/overTime/detail.vue
index f553724..1adcbf8 100644
--- a/src/views/customer/sample/overTime/detail.vue
+++ b/src/views/customer/sample/overTime/detail.vue
@@ -184,6 +184,7 @@
 const getInfo = () => {
   getSapmleDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data
+    dataForm.value.ABC = res.data.abc
     for (const item of menu) {
       item.searchFunc()
     }
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index c8f90a1..05fe276 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -19,8 +19,8 @@
   sampleModel: '', // 型号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
-  startTime: '1', // 检定开始时间
-  endTime: '1', // 检定结束时间
+  startTime: '', // 检定开始时间
+  endTime: '', // 检定结束时间
   overtimeStatus: '1', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
   offset: 1,
   limit: 20,
diff --git a/src/views/device/receive/apply/applyEdit.vue b/src/views/device/receive/apply/applyEdit.vue
new file mode 100644
index 0000000..5194bdb
--- /dev/null
+++ b/src/views/device/receive/apply/applyEdit.vue
@@ -0,0 +1,552 @@
+<script lang="ts" setup name="CreateOrCheck">
+import { onMounted, reactive, ref } from 'vue'
+import type { Ref } from 'vue'
+import dayjs from 'dayjs'
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { useRoute, useRouter } from 'vue-router'
+import type { IdeviceList, IdeviceListQuery } from '../receive'
+import SelectDeviceDialog from '../selectDeviceDialog.vue'
+import { toTreeList } from '@/utils/structure'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import {
+  getReceiveApplyListDetail,
+  saveAddReceiveApplyList,
+  saveEditReceiveApplyList,
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import type { userType } from '@/views/system/user/user-interface'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { getDeptTreeList } from '@/api/system/dept'
+import { getUserList } from '@/api/system/user'
+import { submitApproval } from '@/api/approval'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+
+const $route = useRoute()
+const approvalDialog = ref() // 审批对话框显隐
+const typeValue = ref() // add、edit、detail
+const approvalStatus = ref() // 审批类型
+const useDeptList = ref<deptType[]>([]) // 部门列表
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false)
+const isMulti = ref(false) // 是否批量添加(允许多选)
+const selectIndex = ref() // 点击选择的index--点击第几行
+const dialogSelectDiviceVisible = ref(false) // 控制选择设备对话框显隐
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+// 选中的内容
+const checkoutList = ref([])
+// 表单数据
+const form = ref({
+  taskId: '', // 任务id（审批用）
+  id: '',
+  processId: '', // 流程id--查询审批记录使用
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 领用时间
+  applyDesc: '', // 申请说明
+})
+const ruleFormRef = ref<FormInstance>() as any
+const list = ref<IdeviceList[]>([])// 表格数据
+
+// 查询条件
+const listQuery: Ref<IdeviceListQuery> = ref({
+  equipmentName: '', // 仪器名称
+  equipmentNo: '', // 设备编号
+  modelNo: '', // 型号
+  mesureRange: '', // 测量范围
+  useDeptName: '', // 使用部门
+  usePersonName: '', // 使用人
+  managerStateName: '', // 管理状态
+  validDate: '', // 有效日期
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '设备编号', value: 'equipmentNo', align: 'center', width: '230' },
+  { text: '设备名称', value: 'equipmentName', align: 'center' },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: '测量范围', value: 'mesureRange', align: 'center' },
+  { text: '使用部门', value: 'useDeptName', align: 'center' },
+  { text: '使用人', value: 'usePersonName', align: 'center' },
+  { text: '管理状态', value: 'managerStateName', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center' },
+])
+// 表单校验规则
+const rules = reactive<FormRules>({
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'change' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  time: [{ type: 'date', required: true, message: '领用时间不能为空', trigger: 'change' }],
+  applyDesc: [{ required: true, message: '申请说明不能为空', trigger: 'blur' }],
+})
+
+const $router = useRouter()
+// 点击关闭
+const close = () => {
+  $router.back()
+}
+
+const handleClick = (val: string) => {
+  if (val === 'agree') { // 同意
+    approvalDialog.value.initDialog('agree', form.value.taskId)
+  }
+  else if (val === 'reject') { // 驳回
+    approvalDialog.value.initDialog('reject', form.value.taskId)
+  }
+  else if (val === 'refuse') { // 拒绝
+    approvalDialog.value.initDialog('refuse', form.value.taskId)
+  }
+  else if (val === 'revoke') {
+    const params = {
+      taskId: form.value.taskId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认撤回该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        submitApproval('revoke', params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已撤回',
+          })
+        })
+        close()
+      })
+  }
+}
+
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+
+// 删除行
+const delRow = () => {
+  if (checkoutList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    checkoutList.value.forEach((item: IdeviceListQuery) => {
+      list.value.forEach((element, index) => {
+        if (element.equipmentNo === item.equipmentNo) {
+          list.value.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+
+// 增加行
+const addRow = () => {
+  const index = list.value.findIndex(item => !item.equipmentNo)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条设备信息')
+    return
+  }
+  list.value.push({
+    equipmentName: '', // 设备名称
+    equipmentNo: '', // 设备编号
+    modelNo: '', // 型号
+    mesureRange: '', // 测量范围
+    useDeptName: '', // 使用部门
+    usePersonName: '', // 使用人
+    managerStateName: '', // 管理状态
+    validDate: '', // 有效日期
+    equipmentId: '', // 设备ID
+  })
+}
+
+// 点击选择
+const handleSelect = (index: number, row: IdeviceList) => {
+  dialogSelectDiviceVisible.value = true // 选择设备对话框显隐
+  isMulti.value = false // 是否单选, false单选、true表格多选
+  selectIndex.value = index
+}
+
+// 点击批量添加
+const multiAdd = () => {
+  dialogSelectDiviceVisible.value = true
+  isMulti.value = true
+}
+
+// 选择设备对话框关闭
+const closeDialog = () => {
+  dialogSelectDiviceVisible.value = false
+}
+
+// 选择好设备了, 添加选好的设备到表格中
+const updateDeviceConfirm = (val: Array<IdeviceList>) => {
+  if (isMulti.value) { // 批量增加时push
+    val.forEach((item: IdeviceList) => {
+    // 只添加列表里不存在的
+      const index = list.value.findIndex((i: IdeviceList) => item.equipmentNo === i.equipmentNo)
+      if (index === -1) {
+        list.value.push(item)
+      }
+    })
+  }
+  else { // 单选替换
+    const index = list.value.findIndex((i: IdeviceList) => val[0].equipmentNo === i.equipmentNo)
+    if (index !== -1) {
+      ElMessage.warning('此设备已添加过')
+      return
+    }
+    list.value.splice(selectIndex.value, 1, val[0])
+  }
+}
+
+// 保存
+const save = () => {
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      // 保存之前清除空行、避免传给后端无用空对象
+      const index = list.value.findIndex((item: IdeviceList) => !item.equipmentNo)
+      if (index !== -1) {
+        list.value.splice(index, 1)
+      }
+      const params = {
+        applyName: form.value.applyName, // 申请名称
+        applyUnit: form.value.applyUnit, // 申请单位
+        applyPerson: form.value.applyPerson, // 申请人
+        time: form.value.time, // 领用时间
+        applyDesc: form.value.applyDesc, // 申请说明
+        applyType: '1', // 申请类型 领用1
+        id: form.value.id,
+        equipmentList: list.value.map((item) => {
+          return {
+            equipmentId: item.id!,
+          }
+        }),
+      }
+      // 新建
+      if (typeValue.value === 'add') {
+        saveAddReceiveApplyList(params).then((res) => {
+          form.value.id = res.data
+          ElMessage.success('保存成功')
+          loading.close()
+        })
+      }
+      // 保存
+      else if (typeValue.value === 'edit') {
+        saveEditReceiveApplyList(params).then((res) => {
+          form.value.id = res.data
+          ElMessage.success('保存成功')
+          loading.close()
+        })
+      }
+    }
+    else {
+      console.log('表单校验不通过')
+    }
+  })
+}
+
+// 提交表单
+const submit = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (form.value.id) {
+    const params = {
+      id: form.value.id,
+      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL, // 表单id
+    }
+    submitReceiveApplyList(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    })
+  }
+  else {
+    ElMessage.info('请先保存再提交！')
+  }
+}
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 获取使用部门
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res: any) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+// 审批结束回调
+const approvalSuccess = () => {
+  close()
+}
+
+// 编辑、详情--获取详细信息
+const fetchReceiveApplyListDetail = () => {
+  getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
+    form.value.applyUnit = res.data.applyUnit // 部门
+    form.value.applyName = res.data.applyName // 申请名称
+    form.value.applyPerson = res.data.applyPerson// 申请人
+    form.value.time = res.data.time // 领用时间
+    form.value.applyDesc = res.data.applyDesc // 申请说明
+    list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
+      return {
+        ...item,
+        validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+      }
+    })
+  })
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+onMounted(() => {
+  typeValue.value = $route.query.typeValue // 类型add、edit、detail
+  form.value.id = $route.query.id as string // id
+  form.value.taskId = $route.query.taskId as string // 任务id
+  form.value.processId = $route.query.processId as string // 任务id
+  approvalStatus.value = $route.query.approvalStatus // 审批类型
+  // 编辑、详情获取详情页信息
+  if (typeValue.value === 'edit' || typeValue.value === 'detail') {
+    fetchReceiveApplyListDetail() // 获取详细信息
+  }
+
+  // 获取部门信息
+  fetchDeptTreeList()
+  // 获取人员列表--申请人使用
+  fetchUserList()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`设备领用申请-${textMap[typeValue]}`">
+      <template #btns>
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('agree')">
+          同意
+        </el-button>
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('reject')">
+          驳回
+        </el-button>
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('refuse')">
+          拒绝
+        </el-button>
+        <el-button v-if="typeValue === 'add'" type="primary" @click="submit">
+          提交
+        </el-button>
+        <el-button v-if="typeValue === 'add' || typeValue === 'edit'" type="primary" @click="save">
+          保存
+        </el-button>
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '3'" type="primary" @click="handleClick('revoke')">
+          撤回
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div class="create-check">
+      <div class="top-info">
+        <!-- 表单 -->
+        <div class="form-area">
+          <el-form
+            ref="ruleFormRef"
+            :model="form"
+            label-width="120px"
+            :rules="rules"
+          >
+            <el-row :gutter="24">
+              <el-col :span="6">
+                <el-form-item label="申请名称" prop="applyName">
+                  <el-input
+                    v-model="form.applyName"
+                    :placeholder="typeValue === 'detail' ? '' : '请输入申请名称'"
+                    clearable
+                    :disabled="typeValue === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="申请单位" prop="applyUnit">
+                  <dept-select
+                    v-model="form.applyUnit"
+                    placeholder="请选择申请单位"
+                    :data="useDeptList"
+                    :disabled="typeValue === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="申请人" prop="applyPerson">
+                  <el-select
+                    v-model="form.applyPerson"
+                    :disabled="typeValue === 'detail'"
+                    placeholder="请选择申请人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="领用时间" prop="time">
+                  <el-date-picker
+                    v-model="form.time"
+                    type="datetime"
+                    placeholder="请选择领用时间"
+                    format="YYYY-MM-DD hh:mm"
+                    value-format="YYYY-MM-DD hh:mm"
+                    :disabled="typeValue === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="申请说明" prop="applyDesc">
+                  <el-input v-model="form.applyDesc" type="textarea" autosize clearable :disabled="typeValue === 'detail'" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </div>
+      </div>
+      <!-- 表格 -->
+      <detail-block title="设备领用列表">
+        <template #btns>
+          <el-button v-if="typeValue !== 'detail'" type="primary" @click="multiAdd">
+            批量添加
+          </el-button>
+          <el-button v-if="typeValue !== 'detail'" type="primary" @click="addRow">
+            增加行
+          </el-button>
+          <el-button v-if="typeValue !== 'detail'" type="info" @click="delRow">
+            删除行
+          </el-button>
+        </template>
+        <el-table
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column v-if="typeValue !== 'detail'" type="selection" width="38" />
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          >
+            <template v-if="item.value === 'equipmentNo' && (typeValue === 'add' || typeValue === 'edit')" #default="scope">
+              <el-input v-model="scope.row.equipmentNo" placeholder="请选择设备" class="input">
+                <template #append>
+                  <el-button size="small" @click="handleSelect(scope.$index, scope.row)">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+
+      <detail-block v-if="typeValue === 'detail'" title="审批流程">
+        <approval-record :process-id="form.processId" />
+      </detail-block>
+    </div>
+    <select-device-dialog
+      :dialog-select-divice-visible="dialogSelectDiviceVisible"
+      :is-multi="isMulti"
+      @closeDialog="closeDialog"
+      @updateDeviceConfirm="updateDeviceConfirm"
+    />
+
+    <!-- 同意、驳回、拒绝对话框显示 -->
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.create-check {
+  margin-top: 10px;
+
+  .top-info {
+    display: flex;
+    flex-direction: column;
+    width: 100%;
+    padding-right: 10px;
+    border-radius: 10px;
+    background-color: #fff;
+    // padding: 10px;
+
+    .title-button {
+      display: flex;
+      align-items: center;
+
+      &::before {
+        content: "";
+        flex: 1;
+      }
+
+      .button-group {
+        flex: 1;
+        display: flex;
+        justify-content: flex-end;
+      }
+    }
+
+    .form-area {
+      margin-top: 40px;
+    }
+  }
+}
+</style>
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
new file mode 100644
index 0000000..abf559c
--- /dev/null
+++ b/src/views/device/receive/apply/applyList.vue
@@ -0,0 +1,542 @@
+<script lang="ts" setup name="ApplyList">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+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 ButtonBox from '@/components/buttonBox/buttonBox.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { exportFile } from '@/utils/exportUtils'
+import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import {
+  delReceiveApplyList,
+  exportReceiveApplyList,
+  getReceiveApplyList,
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import { submitApproval } from '@/api/approval'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import type { userType } from '@/views/system/user/user-interface'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { getUserList } from '@/api/system/user'
+
+const loadingTable = ref(false) // 表格loading
+const active = ref('') // 选中的按钮
+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 listQuery: Ref<IlistQuery> = ref({
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  approvalStatus: active.value, // 	审批状态
+  processResult: '', // 	处置结果
+  applyType: '1', // 申请类型 领用1
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+  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 columns = ref<TableColumn[]>([
+  { text: '申请编号', value: 'applyNo', align: 'center' },
+  { text: '申请名称', value: 'applyName', align: 'center' },
+  { text: '申请部门', value: 'applyUnitName', align: 'center' },
+  { text: '申请人', value: 'applyPersonName', align: 'center' },
+  { text: '领用时间', value: 'time', align: 'center' },
+  { text: '申请说明', value: 'applyDesc', align: 'center' },
+  { text: '审批状态', value: 'approvalStatus', align: 'center' },
+])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 筛选时间段数据
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.startTime = timeRange.value[0] as string || ''
+  listQuery.value.endTime = timeRange.value[1] as string || ''
+  listQuery.value.approvalStatus = active.value
+  getReceiveApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IlistType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap[item.approvalStatus],
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: active.value, // 	审批状态
+    processResult: '', // 	处置结果
+    applyType: '1', // 申请类型 领用1
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', '']
+  fetchData(true)
+}
+
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+const $router = useRouter()
+
+// 新建
+const add = () => {
+  $router.push({ path: '/receive/add', query: { typeValue: 'add' } })
+}
+
+// 导出
+const exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    const params = {
+      applyNo: listQuery.value.applyNo, // 申请编号
+      applyName: listQuery.value.applyName, // 申请名称
+      applyUnit: listQuery.value.applyUnit, // 申请部门
+      applyPerson: listQuery.value.applyPerson, // 申请人
+      startTime: listQuery.value.startTime, // 申请开始日期
+      endTime: listQuery.value.endTime, // 申请结束日期
+      approvalStatus: listQuery.value.approvalStatus, // 	审批状态
+      processResult: listQuery.value.processResult, // 	处置结果
+      applyType: listQuery.value.applyType, // 申请类型 领用0
+      createUser: listQuery.value.createUser, // 创建人
+      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+      offset: 1,
+      limit: 20,
+      ids: checkoutList.value,
+    }
+    // 调导出接口
+    exportReceiveApplyList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备领用申请列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备领用申请列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: IlistType) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备领用申请列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 操作
+const handleEdit = (row: IlistType, val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      taskId: row.taskId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        submitApproval('revoke', params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+        })
+        fetchData(true)
+      })
+  }
+  else if (val === '删除') {
+    ElMessageBox.confirm(
+      '确认删除该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        delReceiveApplyList({ id: row.id, taskId: row.taskId }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '提交') {
+    ElMessageBox.confirm(
+      '确认提交该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        submitReceiveApplyList({ id: row.id, formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已提交',
+          })
+        })
+        fetchData(true)
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', row.taskId)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', row.taskId)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', row.taskId)
+  }
+  else if (val === '查看' || val === '编辑') {
+    $router.push({
+      path: `/receive/${title}`,
+      query: {
+        typeValue: title,
+        approvalStatus: approvalStatusReserveMap[row.approvalStatus],
+        id: row.id,
+        taskId: row.taskId,
+        processId: row.processId, // 查询审批记录使用
+      },
+    })
+  }
+}
+// 按钮切换
+const changeCurrentButton = (val: string) => {
+  active.value = val
+  window.sessionStorage.setItem('buttonBoxActive', val)
+  clearList()
+}
+
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 获取用户列表(增加模糊查询)
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 获取使用部门
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res: any) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+onMounted(() => {
+  if (window.sessionStorage.getItem('buttonBoxActive')) {
+    active.value = window.sessionStorage.getItem('buttonBoxActive')!
+  }
+  else {
+    active.value = '0' // 全部
+  }
+  nextTick(() => {
+    fetchData(true) // 获取表格数据
+    // 获取使用部门
+    fetchDeptTreeList() // 获取使用部门
+    fetchUserList() // 获取人员列表
+  })
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyNo"
+          placeholder="申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyName"
+          placeholder="申请名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.applyPerson"
+          placeholder="请选择申请人"
+          style="width: 100%;"
+          filterable
+          remote
+          remote-show-suffix
+          :remote-method="remoteMethod"
+          :loading="applyPersonLoading"
+        >
+          <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY-MM-DD hh:mm"
+          value-format="YYYY-MM-DD hh:mm"
+          start-placeholder="领用开始时间"
+          end-placeholder="领用结束时间"
+        />
+      </search-item>
+    </search-area>
+
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @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="220" fixed="right">
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="handleEdit(row, '查看', 'detail')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (active === '0' || active === '2')"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (active === '0' || active === '2')"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (active === '0' || active === '2')"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '编辑', 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (active === '0' || active === '3')"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (active !== '4' && active !== '5')"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatus === '未通过' || row.approvalStatus === '已通过'"
+                @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+    <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
+
diff --git a/src/views/device/receive/applyList.vue b/src/views/device/receive/applyList.vue
deleted file mode 100644
index 63e1ee8..0000000
--- a/src/views/device/receive/applyList.vue
+++ /dev/null
@@ -1,523 +0,0 @@
-<script lang="ts" setup name="ApplyList">
-import { ref } from 'vue'
-import type { Ref } from 'vue'
-import type { DateModelType } from 'element-plus'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { useRouter } from 'vue-router'
-import type { IlistQuery, IlistType } from '@/views/device/receive/receive'
-import ButtonBox from '@/views/device/receive/buttonBox.vue'
-import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-import { exportFile } from '@/utils/exportUtils'
-import { printJSON } from '@/utils/printUtils'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
-import {
-  delReceiveApplyList,
-  exportReceiveApplyList,
-  getReceiveApplyList,
-  submitReceiveApplyList,
-} from '@/api/device/receive'
-import { submitApproval } from '@/api/approval'
-import { getDeptTreeList } from '@/api/system/dept'
-import { toTreeList } from '@/utils/structure'
-import type { userType } from '@/views/system/user/user-interface'
-import type { deptType } from '@/views/device/standingBook/standingBook-interface'
-import { getUserList } from '@/api/system/user'
-
-const loadingTable = ref(false) // 表格loading
-const active = ref('0') // 选中的按钮
-const approvalDialog = ref() // 审批对话框显隐
-const useDeptList = ref<deptType[]>([]) // 部门列表
-const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
-const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
-const applyPersonLoading = ref(false) // 申请人模糊搜索框loading
-
-// 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  applyNo: '', // 申请编号
-  applyName: '', // 申请名称
-  applyUnit: '', // 申请部门id
-  applyUnitName: '', // 申请部门名称
-  applyPerson: '', // 申请人id
-  applyPersonName: '', // 申请人姓名
-  startTime: '', // 领用开始日期
-  endTime: '', // 领用结束日期
-  approvalStatus: '', // 	审批状态
-  processResult: '', // 	处置结果
-  applyType: '1', // 申请类型 领用1
-  createUser: '', // 创建人
-  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
-  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 columns = ref<TableColumn[]>([
-  { text: '申请编号', value: 'applyNo', align: 'center' },
-  { text: '申请名称', value: 'applyName', align: 'center' },
-  { text: '申请部门', value: 'applyUnitName', align: 'center' },
-  { text: '申请人', value: 'applyPersonName', align: 'center' },
-  { text: '领用时间', value: 'time', align: 'center' },
-  { text: '申请说明', value: 'applyDesc', align: 'center' },
-  { text: '审批状态', value: 'approvalStatus', align: 'center' },
-])
-// 选中的内容
-const checkoutList = ref<string[]>([])
-// 筛选时间段数据
-const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-
-// 数据查询
-function fetchData(isNowPage = false) {
-  loadingTable.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.value.offset = 1
-  }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
-  listQuery.value.approvalStatus = active.value
-  getReceiveApplyList(listQuery.value).then((response) => {
-    list.value = response.data.rows.map((item: IlistType) => {
-      return {
-        ...item,
-        approvalStatus: approvalStatusMap[item.approvalStatus],
-      }
-    })
-    total.value = parseInt(response.data.total)
-    loadingTable.value = false
-  })
-}
-
-// 重置
-const clearList = () => {
-  listQuery.value = {
-    applyNo: '', // 申请编号
-    applyName: '', // 申请名称
-    applyUnit: '', // 申请部门
-    applyPerson: '', // 申请人
-    startTime: '', // 申请开始日期
-    endTime: '', // 申请结束日期
-    approvalStatus: '', // 	审批状态
-    processResult: '', // 	处置结果
-    applyType: '1', // 申请类型 领用1
-    createUser: '', // 创建人
-    formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
-    offset: 1,
-    limit: 20,
-  }
-  timeRange.value = ['', '']
-  fetchData(true)
-}
-
-// 搜索
-const searchList = () => {
-  fetchData(true)
-}
-
-// 多选发生改变时
-const handleSelectionChange = (e: any) => {
-  checkoutList.value = e.map((item: { id: string }) => item.id)
-}
-const $router = useRouter()
-
-// 新建
-const add = () => {
-  $router.push({ path: '/receive/add', query: { typeValue: 'add' } })
-}
-
-// 导出
-const exportAll = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: '下载中请稍后',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (list.value.length > 0) {
-    const params = {
-      applyNo: listQuery.value.applyNo, // 申请编号
-      applyName: listQuery.value.applyName, // 申请名称
-      applyUnit: listQuery.value.applyUnit, // 申请部门
-      applyPerson: listQuery.value.applyPerson, // 申请人
-      startTime: listQuery.value.startTime, // 申请开始日期
-      endTime: listQuery.value.endTime, // 申请结束日期
-      approvalStatus: listQuery.value.approvalStatus, // 	审批状态
-      processResult: listQuery.value.processResult, // 	处置结果
-      applyType: listQuery.value.applyType, // 申请类型 领用0
-      createUser: listQuery.value.createUser, // 创建人
-      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
-      offset: 1,
-      limit: 20,
-      ids: checkoutList.value,
-    }
-    // 调导出接口
-    exportReceiveApplyList(params).then((res) => {
-      const blob = new Blob([res.data])
-      exportFile(blob, '设备领用申请列表.xlsx')
-    })
-  }
-  else {
-    ElMessage.warning('无数据可导出数据')
-  }
-  loading.close()
-}
-
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  fetchData(true)
-}
-
-// 打印列表
-function printList() {
-  // 打印列
-  const properties = columns.value.map((item) => {
-    return {
-      field: item.value,
-      displayName: item.text,
-    }
-  })
-  if (checkoutList.value.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '设备领用申请列表')
-  }
-  else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: IlistType) => checkoutList.value.includes(item.id))
-    printJSON(printList, properties, '设备领用申请列表')
-  }
-  else {
-    ElMessage.warning('无可打印内容')
-  }
-}
-
-// 操作
-const handleEdit = (row: IlistType, val: string, title = '') => {
-  if (val === '取消') {
-    const params = {
-      taskId: row.taskId!,
-      comments: '',
-    }
-    ElMessageBox.confirm(
-      '确认取消该审批吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        submitApproval('revoke', params).then((res) => {
-          ElMessage({
-            type: 'success',
-            message: '取消成功',
-          })
-        })
-        fetchData(true)
-      })
-  }
-  else if (val === '删除') {
-    ElMessageBox.confirm(
-      '确认删除该审批吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        delReceiveApplyList({ id: row.id, taskId: row.taskId }).then((res) => {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          fetchData(true)
-        })
-      })
-  }
-  else if (val === '提交') {
-    ElMessageBox.confirm(
-      '确认提交该审批吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        submitReceiveApplyList({ id: row.id, formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL }).then((res) => {
-          ElMessage({
-            type: 'success',
-            message: '已提交',
-          })
-        })
-        fetchData(true)
-      })
-  }
-  else if (val === '同意') {
-    approvalDialog.value.initDialog('agree', row.taskId)
-  }
-  else if (val === '驳回') {
-    approvalDialog.value.initDialog('reject', row.taskId)
-  }
-  else if (val === '拒绝') {
-    approvalDialog.value.initDialog('refuse', row.taskId)
-  }
-  else if (val === '查看' || val === '编辑') {
-    $router.push({
-      path: `/receive/${title}`,
-      query: {
-        typeValue: title,
-        approvalStatus: approvalStatusReserveMap[row.approvalStatus],
-        id: row.id,
-        taskId: row.taskId,
-        processId: row.processId, // 查询审批记录使用
-      },
-    })
-  }
-}
-// 按钮切换
-const changeCurrentButton = (val: string) => {
-  active.value = val
-  clearList()
-}
-
-// 审批结束回调
-const approvalSuccess = () => {
-  fetchData(true)
-}
-
-// 选择器模糊查询
-const remoteMethod = (query: string) => {
-  if (query) {
-    applyPersonLoading.value = true
-    setTimeout(() => {
-      applyPersonLoading.value = false
-      usePersonOptions.value = usePersonList.value.filter((item) => {
-        return item.name.toLowerCase().includes(query.toLowerCase())
-      })
-    }, 200)
-  }
-  else {
-    usePersonOptions.value = usePersonList.value
-  }
-}
-
-// 获取用户列表(增加模糊查询)
-const fetchUserList = () => {
-  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
-    usePersonList.value = res.data.rows
-    usePersonOptions.value = res.data.rows
-  })
-}
-
-// 获取使用部门
-const fetchDeptTreeList = () => {
-  getDeptTreeList().then((res: any) => {
-    if (res.data) { // 将列表转树结构
-      useDeptList.value = toTreeList(res.data, '0', true)
-    }
-  })
-}
-
-onMounted(() => {
-  fetchData(true)
-  // 获取使用部门
-  fetchDeptTreeList()
-  fetchUserList()
-})
-</script>
-
-<template>
-  <app-container>
-    <search-area
-      :need-clear="true"
-      @search="searchList" @clear="clearList"
-    >
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.applyNo"
-          placeholder="申请编号"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.applyName"
-          placeholder="申请名称"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
-      </search-item>
-      <search-item>
-        <el-select
-          v-model="listQuery.applyPerson"
-          placeholder="请选择申请人"
-          style="width: 100%;"
-          filterable
-          remote
-          remote-show-suffix
-          :remote-method="remoteMethod"
-          :loading="applyPersonLoading"
-        >
-          <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="timeRange"
-          type="daterange"
-          range-separator="到"
-          format="YYYY-MM-DD"
-          value-format="YYYY-MM-DD"
-          start-placeholder="领用开始日期"
-          end-placeholder="领用结束日期"
-        />
-      </search-item>
-    </search-area>
-
-    <table-container>
-      <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
-      </template>
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @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="220" fixed="right">
-            <template #default="{ row }">
-              <el-button
-                size="small"
-                type="primary"
-                link
-                @click="handleEdit(row, '查看', 'detail')"
-              >
-                查看
-              </el-button>
-              <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (active === '0' || active === '2')"
-                size="small"
-                link
-                type="primary"
-                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
-                @click="handleEdit(row, '同意')"
-              >
-                同意
-              </el-button>
-              <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (active === '0' || active === '2')"
-                size="small"
-                link
-                type="primary"
-                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
-                @click="handleEdit(row, '驳回')"
-              >
-                驳回
-              </el-button>
-              <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (active === '0' || active === '2')"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
-                @click="handleEdit(row, '拒绝')"
-              >
-                拒绝
-              </el-button>
-              <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
-                size="small"
-                link
-                type="primary"
-                @click="handleEdit(row, '编辑', 'edit')"
-              >
-                编辑
-              </el-button>
-              <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
-                size="small"
-                link
-                type="primary"
-                @click="handleEdit(row, '提交')"
-              >
-                提交
-              </el-button>
-              <!-- 是发起者且审批中可以取消 -->
-              <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (active === '0' || active === '3')"
-                size="small"
-                link
-                type="info"
-                :disabled="row.approvalStatus !== '审批中'"
-                @click="handleEdit(row, '取消')"
-              >
-                取消
-              </el-button>
-              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-              <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (active !== '4' && active !== '5')"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatus === '未通过' || row.approvalStatus === '已通过'"
-                @click="handleEdit(row, '删除')"
-              >
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <button-box :active="active" @changeCurrentButton="changeCurrentButton" />
-    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-  </app-container>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-</style>
-
diff --git a/src/views/device/receive/buttonBox.vue b/src/views/device/receive/buttonBox.vue
deleted file mode 100644
index 4205fa8..0000000
--- a/src/views/device/receive/buttonBox.vue
+++ /dev/null
@@ -1,46 +0,0 @@
-<script lang="ts" setup name="ButtonBox">
-import { ref } from 'vue'
-const emits = defineEmits(['changeCurrentButton'])
-const menu = [
-  { name: '全部', id: '0' },
-  { name: '草稿箱', id: '1' },
-  { name: '待审批', id: '2' },
-  { name: '审批中', id: '3' },
-  { name: '已通过', id: '4' },
-  { name: '未通过', id: '5' },
-  { name: '已取消', id: '6' },
-]
-const current = ref('0')
-watch(current, (newValue) => {
-  emits('changeCurrentButton', newValue)
-})
-</script>
-
-<template>
-  <div class="container">
-    <div class="btns">
-      <!-- 三级菜单 -->
-      <el-radio-group v-model="current">
-        <el-radio-button v-for="item in menu" :key="item.id" :label="item.id">
-          {{ item.name }}
-        </el-radio-button>
-      </el-radio-group>
-    </div>
-    <!-- 展示区域 -->
-    <!-- <component :is="currentComp" /> -->
-  </div>
-</template>
-
-<style lang="scss" scoped>
-.container {
-  position: relative;
-
-  .btns {
-    position: fixed;
-    top: 69px;
-    right: 15px;
-    z-index: 999;
-  }
-}
-</style>
-
diff --git a/src/views/device/receive/createOrCheck.vue b/src/views/device/receive/createOrCheck.vue
deleted file mode 100644
index 9cbc3bc..0000000
--- a/src/views/device/receive/createOrCheck.vue
+++ /dev/null
@@ -1,552 +0,0 @@
-<script lang="ts" setup name="CreateOrCheck">
-import { onMounted, reactive, ref } from 'vue'
-import type { Ref } from 'vue'
-import dayjs from 'dayjs'
-import type { FormInstance, FormRules } from 'element-plus'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { useRoute, useRouter } from 'vue-router'
-import type { IdeviceList, IdeviceListQuery } from './receive'
-import SelectDeviceDialog from './selectDeviceDialog.vue'
-import { toTreeList } from '@/utils/structure'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
-import {
-  getReceiveApplyListDetail,
-  saveAddReceiveApplyList,
-  saveEditReceiveApplyList,
-  submitReceiveApplyList,
-} from '@/api/device/receive'
-import type { userType } from '@/views/system/user/user-interface'
-import type { deptType } from '@/views/device/standingBook/standingBook-interface'
-import { getDeptTreeList } from '@/api/system/dept'
-import { getUserList } from '@/api/system/user'
-import { submitApproval } from '@/api/approval'
-import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
-
-const $route = useRoute()
-const approvalDialog = ref() // 审批对话框显隐
-const typeValue = ref() // add、edit、detail
-const approvalStatus = ref() // 审批类型
-const useDeptList = ref<deptType[]>([]) // 部门列表
-const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
-const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
-const applyPersonLoading = ref(false)
-const isMulti = ref(false) // 是否批量添加(允许多选)
-const selectIndex = ref() // 点击选择的index--点击第几行
-const dialogSelectDiviceVisible = ref(false) // 控制选择设备对话框显隐
-const textMap: { [key: string]: string } = {
-  edit: '编辑',
-  add: '新建',
-  detail: '详情',
-}// 字典
-// 选中的内容
-const checkoutList = ref([])
-// 表单数据
-const form = ref({
-  taskId: '', // 任务id（审批用）
-  id: '',
-  processId: '', // 流程id--查询审批记录使用
-  applyName: '', // 申请名称
-  applyUnit: '', // 申请单位
-  applyPerson: '', // 申请人
-  time: '', // 领用时间
-  applyDesc: '', // 申请说明
-})
-const ruleFormRef = ref<FormInstance>() as any
-const list = ref<IdeviceList[]>([])// 表格数据
-
-// 查询条件
-const listQuery: Ref<IdeviceListQuery> = ref({
-  equipmentName: '', // 仪器名称
-  equipmentNo: '', // 设备编号
-  modelNo: '', // 型号
-  mesureRange: '', // 测量范围
-  useDeptName: '', // 使用部门
-  usePersonName: '', // 使用人
-  managerStateName: '', // 管理状态
-  validDate: '', // 有效日期
-  offset: 1,
-  limit: 20,
-})
-// 表头
-const columns = ref<TableColumn[]>([
-  { text: '设备编号', value: 'equipmentNo', align: 'center', width: '230' },
-  { text: '设备名称', value: 'equipmentName', align: 'center' },
-  { text: '型号', value: 'modelNo', align: 'center' },
-  { text: '测量范围', value: 'mesureRange', align: 'center' },
-  { text: '使用部门', value: 'useDeptName', align: 'center' },
-  { text: '使用人', value: 'usePersonName', align: 'center' },
-  { text: '管理状态', value: 'managerStateName', align: 'center' },
-  { text: '有效日期', value: 'validDate', align: 'center' },
-])
-// 表单校验规则
-const rules = reactive<FormRules>({
-  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
-  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'change' }],
-  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
-  time: [{ type: 'date', required: true, message: '领用时间不能为空', trigger: 'change' }],
-  applyDesc: [{ required: true, message: '申请说明不能为空', trigger: 'blur' }],
-})
-
-const $router = useRouter()
-// 点击关闭
-const close = () => {
-  $router.back()
-}
-
-const handleClick = (val: string) => {
-  if (val === 'agree') { // 同意
-    approvalDialog.value.initDialog('agree', form.value.taskId)
-  }
-  else if (val === 'reject') { // 驳回
-    approvalDialog.value.initDialog('reject', form.value.taskId)
-  }
-  else if (val === 'refuse') { // 拒绝
-    approvalDialog.value.initDialog('refuse', form.value.taskId)
-  }
-  else if (val === 'revoke') {
-    const params = {
-      taskId: form.value.taskId!,
-      comments: '',
-    }
-    ElMessageBox.confirm(
-      '确认撤回该审批吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        submitApproval('revoke', params).then((res) => {
-          ElMessage({
-            type: 'success',
-            message: '已撤回',
-          })
-        })
-        close()
-      })
-  }
-}
-
-// 多选发生改变时
-const handleSelectionChange = (e: any) => {
-  checkoutList.value = e
-}
-
-// 删除行
-const delRow = () => {
-  if (checkoutList.value.length <= 0) {
-    ElMessage({
-      message: '请选中要删除的行',
-      type: 'warning',
-    })
-  }
-  else {
-    checkoutList.value.forEach((item: IdeviceListQuery) => {
-      list.value.forEach((element, index) => {
-        if (element.equipmentNo === item.equipmentNo) {
-          list.value.splice(index, 1)
-        }
-      })
-    })
-  }
-}
-
-// 增加行
-const addRow = () => {
-  const index = list.value.findIndex(item => !item.equipmentNo)
-  if (index !== -1) {
-    ElMessage.warning('请完善上一条设备信息')
-    return
-  }
-  list.value.push({
-    equipmentName: '', // 设备名称
-    equipmentNo: '', // 设备编号
-    modelNo: '', // 型号
-    mesureRange: '', // 测量范围
-    useDeptName: '', // 使用部门
-    usePersonName: '', // 使用人
-    managerStateName: '', // 管理状态
-    validDate: '', // 有效日期
-    equipmentId: '', // 设备ID
-  })
-}
-
-// 点击选择
-const handleSelect = (index: number, row: IdeviceList) => {
-  dialogSelectDiviceVisible.value = true // 选择设备对话框显隐
-  isMulti.value = false // 是否单选, false单选、true表格多选
-  selectIndex.value = index
-}
-
-// 点击批量添加
-const multiAdd = () => {
-  dialogSelectDiviceVisible.value = true
-  isMulti.value = true
-}
-
-// 选择设备对话框关闭
-const closeDialog = () => {
-  dialogSelectDiviceVisible.value = false
-}
-
-// 选择好设备了, 添加选好的设备到表格中
-const updateDeviceConfirm = (val: Array<IdeviceList>) => {
-  if (isMulti.value) { // 批量增加时push
-    val.forEach((item: IdeviceList) => {
-    // 只添加列表里不存在的
-      const index = list.value.findIndex((i: IdeviceList) => item.equipmentNo === i.equipmentNo)
-      if (index === -1) {
-        list.value.push(item)
-      }
-    })
-  }
-  else { // 单选替换
-    const index = list.value.findIndex((i: IdeviceList) => val[0].equipmentNo === i.equipmentNo)
-    if (index !== -1) {
-      ElMessage.warning('此设备已添加过')
-      return
-    }
-    list.value.splice(selectIndex.value, 1, val[0])
-  }
-}
-
-// 保存
-const save = () => {
-  ruleFormRef.value.validate((valid: boolean) => {
-    if (valid) {
-      const loading = ElLoading.service({
-        lock: true,
-        background: 'rgba(255, 255, 255, 0.8)',
-      })
-      // 保存之前清除空行、避免传给后端无用空对象
-      const index = list.value.findIndex((item: IdeviceList) => !item.equipmentNo)
-      if (index !== -1) {
-        list.value.splice(index, 1)
-      }
-      const params = {
-        applyName: form.value.applyName, // 申请名称
-        applyUnit: form.value.applyUnit, // 申请单位
-        applyPerson: form.value.applyPerson, // 申请人
-        time: form.value.time, // 领用时间
-        applyDesc: form.value.applyDesc, // 申请说明
-        applyType: '1', // 申请类型 领用1
-        id: form.value.id,
-        equipmentList: list.value.map((item) => {
-          return {
-            equipmentId: item.id!,
-          }
-        }),
-      }
-      // 新建
-      if (typeValue.value === 'add') {
-        saveAddReceiveApplyList(params).then((res) => {
-          form.value.id = res.data
-          ElMessage.success('保存成功')
-          loading.close()
-        })
-      }
-      // 保存
-      else if (typeValue.value === 'edit') {
-        saveEditReceiveApplyList(params).then((res) => {
-          form.value.id = res.data
-          ElMessage.success('保存成功')
-          loading.close()
-        })
-      }
-    }
-    else {
-      console.log('表单校验不通过')
-    }
-  })
-}
-
-// 提交表单
-const submit = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (form.value.id) {
-    const params = {
-      id: form.value.id,
-      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL, // 表单id
-    }
-    submitReceiveApplyList(params).then(() => {
-      ElMessage.success('提交成功')
-      loading.close()
-      close()
-    })
-  }
-  else {
-    ElMessage.info('请先保存再提交！')
-  }
-}
-
-// 获取用户列表--（是否有不分页接口？）
-const fetchUserList = () => {
-  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
-    usePersonList.value = res.data.rows
-    usePersonOptions.value = res.data.rows
-  })
-}
-
-// 获取使用部门
-const fetchDeptTreeList = () => {
-  getDeptTreeList().then((res: any) => {
-    if (res.data) { // 将列表转树结构
-      useDeptList.value = toTreeList(res.data, '0', true)
-    }
-  })
-}
-
-// 审批结束回调
-const approvalSuccess = () => {
-  close()
-}
-
-// 编辑、详情--获取详细信息
-const fetchReceiveApplyListDetail = () => {
-  getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
-    form.value.applyUnit = res.data.applyUnit // 部门
-    form.value.applyName = res.data.applyName // 申请名称
-    form.value.applyPerson = res.data.applyPerson// 申请人
-    form.value.time = res.data.time // 领用时间
-    form.value.applyDesc = res.data.applyDesc // 申请说明
-    list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
-      return {
-        ...item,
-        validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
-      }
-    })
-  })
-}
-
-// 选择器模糊查询
-const remoteMethod = (query: string) => {
-  if (query) {
-    applyPersonLoading.value = true
-    setTimeout(() => {
-      applyPersonLoading.value = false
-      usePersonOptions.value = usePersonList.value.filter((item) => {
-        return item.name.toLowerCase().includes(query.toLowerCase())
-      })
-    }, 200)
-  }
-  else {
-    usePersonOptions.value = usePersonList.value
-  }
-}
-
-onMounted(() => {
-  typeValue.value = $route.query.typeValue // 类型add、edit、detail
-  form.value.id = $route.query.id as string // id
-  form.value.taskId = $route.query.taskId as string // 任务id
-  form.value.processId = $route.query.processId as string // 任务id
-  approvalStatus.value = $route.query.approvalStatus // 审批类型
-  // 编辑、详情获取详情页信息
-  if (typeValue.value === 'edit' || typeValue.value === 'detail') {
-    fetchReceiveApplyListDetail() // 获取详细信息
-  }
-
-  // 获取部门信息
-  fetchDeptTreeList()
-  // 获取人员列表--申请人使用
-  fetchUserList()
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="`设备领用申请-${textMap[typeValue]}`">
-      <template #btns>
-        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('agree')">
-          同意
-        </el-button>
-        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('reject')">
-          驳回
-        </el-button>
-        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('refuse')">
-          拒绝
-        </el-button>
-        <el-button v-if="typeValue === 'add' || typeValue === 'edit'" type="primary" @click="save">
-          保存
-        </el-button>
-        <el-button v-if="typeValue === 'add'" type="primary" @click="submit">
-          提交
-        </el-button>
-        <el-button v-if="typeValue === 'edit' && approvalStatus === '3'" type="primary" @click="handleClick('revoke')">
-          撤回
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-    <div class="create-check">
-      <div class="top-info">
-        <!-- 表单 -->
-        <div class="form-area">
-          <el-form
-            ref="ruleFormRef"
-            :model="form"
-            label-width="120px"
-            :rules="rules"
-          >
-            <el-row :gutter="24">
-              <el-col :span="6">
-                <el-form-item label="申请名称" prop="applyName">
-                  <el-input
-                    v-model="form.applyName"
-                    :placeholder="typeValue === 'detail' ? '' : '请输入申请名称'"
-                    clearable
-                    :disabled="typeValue === 'detail'"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="申请单位" prop="applyUnit">
-                  <dept-select
-                    v-model="form.applyUnit"
-                    placeholder="请选择申请单位"
-                    :data="useDeptList"
-                    :disabled="typeValue === 'detail'"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="申请人" prop="applyPerson">
-                  <el-select
-                    v-model="form.applyPerson"
-                    :disabled="typeValue === 'detail'"
-                    placeholder="请选择申请人"
-                    style="width: 100%;"
-                    filterable
-                    remote
-                    remote-show-suffix
-                    :remote-method="remoteMethod"
-                    :loading="applyPersonLoading"
-                  >
-                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="领用时间" prop="time">
-                  <el-date-picker
-                    v-model="form.time"
-                    type="datetime"
-                    placeholder="请选择领用时间"
-                    format="YYYY-MM-DD hh:mm"
-                    value-format="YYYY-MM-DD hh:mm"
-                    :disabled="typeValue === 'detail'"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="申请说明" prop="applyDesc">
-                  <el-input v-model="form.applyDesc" type="textarea" autosize clearable :disabled="typeValue === 'detail'" />
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </el-form>
-        </div>
-      </div>
-      <!-- 表格 -->
-      <detail-block title="设备领用列表">
-        <template #btns>
-          <el-button v-if="typeValue !== 'detail'" type="primary" @click="multiAdd">
-            批量添加
-          </el-button>
-          <el-button v-if="typeValue !== 'detail'" type="primary" @click="addRow">
-            增加行
-          </el-button>
-          <el-button v-if="typeValue !== 'detail'" type="info" @click="delRow">
-            删除行
-          </el-button>
-        </template>
-        <el-table
-          :data="list"
-          border
-          style="width: 100%;"
-          max-height="600"
-          @selection-change="handleSelectionChange"
-        >
-          <el-table-column type="selection" width="38" />
-          <el-table-column align="center" label="序号" width="80" type="index" />
-          <el-table-column
-            v-for="item in columns"
-            :key="item.value"
-            :prop="item.value"
-            :label="item.text"
-            :width="item.width"
-            show-overflow-tooltip
-            align="center"
-          >
-            <template v-if="item.value === 'equipmentNo' && (typeValue === 'add' || typeValue === 'edit')" #default="scope">
-              <el-input v-model="scope.row.equipmentNo" placeholder="请选择设备" class="input">
-                <template #append>
-                  <el-button size="small" @click="handleSelect(scope.$index, scope.row)">
-                    选择
-                  </el-button>
-                </template>
-              </el-input>
-            </template>
-          </el-table-column>
-        </el-table>
-      </detail-block>
-
-      <detail-block v-if="typeValue === 'detail'" title="审批流程">
-        <approval-record :process-id="form.processId" />
-      </detail-block>
-    </div>
-    <select-device-dialog
-      :dialog-select-divice-visible="dialogSelectDiviceVisible"
-      :is-multi="isMulti"
-      @closeDialog="closeDialog"
-      @updateDeviceConfirm="updateDeviceConfirm"
-    />
-
-    <!-- 同意、驳回、拒绝对话框显示 -->
-    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-  </app-container>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-.create-check {
-  margin-top: 10px;
-
-  .top-info {
-    display: flex;
-    flex-direction: column;
-    width: 100%;
-    padding-right: 10px;
-    border-radius: 10px;
-    background-color: #fff;
-    // padding: 10px;
-
-    .title-button {
-      display: flex;
-      align-items: center;
-
-      &::before {
-        content: "";
-        flex: 1;
-      }
-
-      .button-group {
-        flex: 1;
-        display: flex;
-        justify-content: flex-end;
-      }
-    }
-
-    .form-area {
-      margin-top: 40px;
-    }
-  }
-}
-</style>
diff --git a/src/views/device/receive/receive.ts b/src/views/device/receive/receive.ts
index 2754aee..056fe60 100644
--- a/src/views/device/receive/receive.ts
+++ b/src/views/device/receive/receive.ts
@@ -82,3 +82,8 @@
   managerStateName: string // 管理状态
   validDate: string // 有效日期
 }
+
+export interface IMenu {
+  name: string // 名字
+  id: string
+}
diff --git a/src/views/device/receive/solve/solveDetail.vue b/src/views/device/receive/solve/solveDetail.vue
new file mode 100644
index 0000000..8076684
--- /dev/null
+++ b/src/views/device/receive/solve/solveDetail.vue
@@ -0,0 +1,257 @@
+<script lang="ts" setup name="Detail">
+import { onMounted, ref } from 'vue'
+import { useRoute, useRouter } from 'vue-router'
+import { ElLoading } from 'element-plus'
+import type { Ref } from 'vue'
+import dayjs from 'dayjs'
+import type { IdeviceList, IdeviceListQuery } from '../receive'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getReceiveApplyListDetail } from '@/api/device/receive'
+import type { userType } from '@/views/system/user/user-interface'
+import { getUserList } from '@/api/system/user'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+
+const $route = useRoute()
+const { proxy } = getCurrentInstance() as any
+const useDeptList = ref<deptType[]>([]) // 部门列表
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const total = ref(20)// 总数
+// 表单数据
+const form = ref({
+  id: '',
+  processId: '', // 流程id--查询审批记录使用
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 领用时间
+  applyDesc: '', // 申请说明
+})
+const list = ref<IdeviceList[]>([])// 表格数据
+// 查询条件
+const listQuery: Ref<IdeviceListQuery> = ref({
+  equipmentName: '', // 仪器名称
+  equipmentNo: '', // 设备编号
+  modelNo: '', // 型号
+  mesureRange: '', // 测量范围
+  useDeptName: '', // 使用部门
+  usePersonName: '', // 使用人
+  managerStateName: '', // 管理状态
+  validDate: '', // 有效日期
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '设备编号', value: 'equipmentNo', align: 'center', width: '230' },
+  { text: '设备名称', value: 'equipmentName', align: 'center' },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: '测量范围', value: 'mesureRange', align: 'center' },
+  { text: '使用部门', value: 'useDeptName', align: 'center' },
+  { text: '使用人', value: 'usePersonName', align: 'center' },
+  { text: '管理状态', value: 'managerStateName', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center' },
+])
+
+// 编辑、详情--获取详细信息
+const fetchReceiveApplyListDetail = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
+    form.value.applyUnit = res.data.applyUnit // 部门
+    form.value.applyName = res.data.applyName// 申请名称
+    form.value.applyPerson = res.data.applyPerson// 申请人
+    form.value.time = res.data.time // 领用时间
+    form.value.applyDesc = res.data.applyDesc // 申请说明
+    list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
+      return {
+        ...item,
+        validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+      }
+    })
+    loading.close()
+  })
+}
+
+// 点击关闭
+const $router = useRouter()
+const close = () => {
+  $router.back()
+}
+
+// 打印
+const printObj = ref({
+  id: 'lysq', // 需要打印元素的id
+  popTitle: '设备领用详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备领用详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+  })
+}
+
+// 获取使用部门
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res: any) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+onMounted(async () => {
+  form.value.id = $route.query.id as string // id
+  form.value.processId = $route.query.processId as string // 任务id
+
+  // 获取部门信息
+  await fetchDeptTreeList()
+  // 获取人员列表
+  await fetchUserList()
+  // 编辑、详情获取详情页信息
+  fetchReceiveApplyListDetail() // 获取详细信息
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="设备领用处理-详情">
+      <template #btns>
+        <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div id="lysq" class="lysq-create-check">
+      <div class="top-info">
+        <detail-block title="领用申请">
+          <div class="form-area">
+            <el-form
+              ref="ruleFormRef"
+              :model="form"
+              label-width="120px"
+            >
+              <el-row :gutter="24">
+                <el-col :span="6">
+                  <el-form-item label="申请名称" prop="applyName">
+                    <el-input v-model="form.applyName" disabled />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="申请单位" prop="applyUnit">
+                    <dept-select
+                      v-model="form.applyUnit"
+                      :data="useDeptList"
+                      disabled
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="申请人" prop="applyPerson">
+                    <el-select v-model="form.applyPerson" disabled style="width: 100%;">
+                      <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="领用时间" prop="time">
+                    <el-date-picker
+                      v-model="form.time"
+                      type="datetime"
+                      format="YYYY-MM-DD hh:mm"
+                      value-format="YYYY-MM-DD hh:mm"
+                      disabled
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="申请说明" prop="applyDesc">
+                    <el-input v-model="form.applyDesc" type="textarea" disabled autosize />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
+          </div>
+        </detail-block>
+      </div>
+      <detail-block title="设备领用列表">
+        <el-table
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          />
+        </el-table>
+      </detail-block>
+      <detail-block title="审批流程">
+        <approval-record :process-id="form.processId" />
+      </detail-block>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.lysq-create-check {
+  margin-top: 10px;
+
+  .top-info {
+    display: flex;
+    flex-direction: column;
+    width: 100%;
+    padding-right: 10px;
+    border-radius: 10px;
+    background-color: #fff;
+    // padding: 10px;
+
+    .title-button {
+      display: flex;
+      align-items: center;
+
+      &::before {
+        content: "";
+        flex: 1;
+      }
+
+      .button-group {
+        flex: 1;
+        display: flex;
+        justify-content: flex-end;
+      }
+    }
+
+    .form-area {
+      margin-top: 40px;
+    }
+  }
+}
+</style>
+
+<style lang="scss">
+.lysq-create-check {
+  .el-form-item--default .el-form-item__label {
+    color: #000;
+  }
+}
+</style>
diff --git a/src/views/device/receive/solve/solveList.vue b/src/views/device/receive/solve/solveList.vue
new file mode 100644
index 0000000..b541f35
--- /dev/null
+++ b/src/views/device/receive/solve/solveList.vue
@@ -0,0 +1,436 @@
+<script lang="ts" setup name="SolveList">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
+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 { exportFile } from '@/utils/exportUtils'
+import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+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 {
+  delReceiveApplyList,
+  exportReceiveApplyList,
+  getReceiveApplyList,
+  updateProcessResult,
+} from '@/api/device/receive'
+
+const useDeptList = ref<deptType[]>([]) // 部门列表
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+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 listQuery: Ref<IlistQuery> = ref({
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  equipmentApplyProcessResult: active.value, // 设备申请处理结果--4待领用、5已领用
+  approvalStatus: '4', // 审批状态--已通过
+  processResult: active.value, // 	处置结果--4待领用、5已领用
+  applyType: '1', // 申请类型 领用1
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+  offset: 1,
+  limit: 20,
+})
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+
+// 表格数据
+const list = ref<IsolveListType[]>([])
+const { proxy } = getCurrentInstance() as any
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '申请编号', value: 'applyNo', align: 'center' },
+  { text: '申请名称', value: 'applyName', align: 'center' },
+  { text: '申请部门', value: 'applyUnitName', align: 'center' },
+  { text: '申请人', value: 'applyPersonName', align: 'center' },
+  { text: '领用时间', value: 'time', align: 'center' },
+  { text: '申请说明', value: 'applyDesc', align: 'center' },
+  { text: '审批状态', value: 'approvalStatus', align: 'center' },
+])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: '4', // 	审批状态--已通过
+    processResult: active.value, // 	处置结果
+    applyType: '1', // 申请类型 领用1
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+    equipmentApplyProcessResult: active.value, // 设备申请处理结果
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', ''] // 把时间选择框置空
+  fetchData(true)
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.startTime = timeRange.value[0] as string || ''
+  listQuery.value.endTime = timeRange.value[1] as string || ''
+  getReceiveApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IsolveListType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap[item.approvalStatus],
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 导出
+const exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    const params = {
+      applyNo: listQuery.value.applyNo, // 申请编号
+      applyName: listQuery.value.applyName, // 申请名称
+      applyUnit: listQuery.value.applyUnit, // 申请部门
+      applyPerson: listQuery.value.applyPerson, // 申请人
+      startTime: listQuery.value.startTime, // 申请开始日期
+      endTime: listQuery.value.endTime, // 申请结束日期
+      equipmentApplyProcessResult: listQuery.value.equipmentApplyProcessResult, // 设备申请处理结果--4待领用、5已领用
+      approvalStatus: listQuery.value.approvalStatus, // 	审批状态
+      processResult: listQuery.value.processResult, // 	处置结果
+      applyType: listQuery.value.applyType, // 申请类型 领用1
+      createUser: listQuery.value.createUser, // 创建人
+      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+      offset: 1,
+      limit: 20,
+      ids: checkoutList.value,
+    }
+    // 调导出接口
+    exportReceiveApplyList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备领用处理列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备领用处理列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: IsolveListType) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备领用处理列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 操作
+const $router = useRouter()
+const handleEdit = (row: IsolveListType, val: string) => {
+  if (val === '查看') {
+    $router.push({
+      path: '/receive/solveDetail',
+      query: {
+        id: row.id,
+        processId: row.processId, // 查询审批记录使用
+      },
+    })
+  }
+  else {
+    ElMessageBox.confirm(
+    `确认${val}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+    )
+      .then(() => {
+        if (val === '领用' || val === '退领') {
+          const processResult = val === '领用' ? '5' : '4'
+          updateProcessResult({ id: row.id, processResult }).then(() => {
+            ElMessage.success(`已${val}`)
+            fetchData(true)
+          })
+        }
+        if (val === '删除') {
+          delReceiveApplyList({ id: row.id, taskId: row.taskId }).then(() => {
+            ElMessage.success(`已${val}`)
+            fetchData(true)
+          })
+        }
+      })
+  }
+}
+
+// 右上角按钮切换
+const changeCurrentButton = (val: string) => {
+  active.value = val
+  window.sessionStorage.setItem('solveButtonBoxActive', val)
+  clearList()
+}
+
+// 标签识别
+const execTag = () => {}
+
+// 获取用户列表
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 获取使用部门
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res: any) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+onMounted(() => {
+  if (window.sessionStorage.getItem('solveButtonBoxActive')) {
+    active.value = window.sessionStorage.getItem('solveButtonBoxActive')!
+  }
+  else {
+    active.value = '4' // 未领用
+  }
+  nextTick(() => {
+    // 获取表格数据
+    fetchData(true)
+    // 获取使用部门
+    fetchDeptTreeList()
+    // 获取人员列表
+    fetchUserList()
+  })
+})
+onUnmounted(() => {
+  window.sessionStorage.setItem('solveButtonBoxActive', '')
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyNo"
+          placeholder="申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyName"
+          placeholder="申请名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
+      </search-item>
+      <search-item>
+        <el-form-item prop="applyPerson">
+          <el-select
+            v-model="listQuery.applyPerson"
+            placeholder="请选择申请人"
+            style="width: 100%;"
+            filterable
+            remote
+            remote-show-suffix
+            :remote-method="remoteMethod"
+            :loading="applyPersonLoading"
+          >
+            <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+          </el-select>
+        </el-form-item>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY-MM-DD hh:mm"
+          value-format="YYYY-MM-DD hh:mm"
+          start-placeholder="领用开始时间"
+          end-placeholder="领用结束时间"
+        />
+      </search-item>
+    </search-area>
+
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-device" title="标签识别" @click="execTag" />
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @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="scope">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="handleEdit(scope.row, '查看')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if="active === '4'"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(scope.row, '领用')"
+              >
+                领用
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="active === '4'"
+                size="small"
+                link
+                type="danger"
+                @click="handleEdit(scope.row, '删除')"
+              >
+                删除
+              </el-button>
+              <el-button
+                v-if="active === '5'"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(scope.row, '退领')"
+              >
+                退领
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+    <button-box
+      :active="active"
+      :menu="menu"
+      @changeCurrentButton="changeCurrentButton"
+    />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
+
diff --git a/src/views/device/receive/solveComponent/buttonBox.vue b/src/views/device/receive/solveComponent/buttonBox.vue
deleted file mode 100644
index 4a4de71..0000000
--- a/src/views/device/receive/solveComponent/buttonBox.vue
+++ /dev/null
@@ -1,41 +0,0 @@
-<script lang="ts" setup name="ButtonBox">
-import { ref } from 'vue'
-const emits = defineEmits(['changeCurrentButton'])
-const menu = [
-  { name: '未领用', id: '4' },
-  { name: '已领用', id: '5' },
-]
-const current = ref('4')
-watch(current, (newValue) => {
-  console.log(newValue)
-  emits('changeCurrentButton', newValue)
-})
-</script>
-
-<template>
-  <div class="container">
-    <div class="btns">
-      <!-- 三级菜单 -->
-      <el-radio-group v-model="current">
-        <el-radio-button v-for="item in menu" :key="item.id" :label="item.id">
-          {{ item.name }}
-        </el-radio-button>
-      </el-radio-group>
-    </div>
-    <!-- 展示区域 -->
-  </div>
-</template>
-
-<style lang="scss" scoped>
-.container {
-  position: relative;
-
-  .btns {
-    position: fixed;
-    top: 76px;
-    right: 15px;
-    z-index: 999;
-  }
-}
-</style>
-
diff --git a/src/views/device/receive/solveComponent/detail.vue b/src/views/device/receive/solveComponent/detail.vue
deleted file mode 100644
index 8076684..0000000
--- a/src/views/device/receive/solveComponent/detail.vue
+++ /dev/null
@@ -1,257 +0,0 @@
-<script lang="ts" setup name="Detail">
-import { onMounted, ref } from 'vue'
-import { useRoute, useRouter } from 'vue-router'
-import { ElLoading } from 'element-plus'
-import type { Ref } from 'vue'
-import dayjs from 'dayjs'
-import type { IdeviceList, IdeviceListQuery } from '../receive'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getReceiveApplyListDetail } from '@/api/device/receive'
-import type { userType } from '@/views/system/user/user-interface'
-import { getUserList } from '@/api/system/user'
-import type { deptType } from '@/views/device/standingBook/standingBook-interface'
-import { getDeptTreeList } from '@/api/system/dept'
-import { toTreeList } from '@/utils/structure'
-
-const $route = useRoute()
-const { proxy } = getCurrentInstance() as any
-const useDeptList = ref<deptType[]>([]) // 部门列表
-const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
-const total = ref(20)// 总数
-// 表单数据
-const form = ref({
-  id: '',
-  processId: '', // 流程id--查询审批记录使用
-  applyName: '', // 申请名称
-  applyUnit: '', // 申请单位
-  applyPerson: '', // 申请人
-  time: '', // 领用时间
-  applyDesc: '', // 申请说明
-})
-const list = ref<IdeviceList[]>([])// 表格数据
-// 查询条件
-const listQuery: Ref<IdeviceListQuery> = ref({
-  equipmentName: '', // 仪器名称
-  equipmentNo: '', // 设备编号
-  modelNo: '', // 型号
-  mesureRange: '', // 测量范围
-  useDeptName: '', // 使用部门
-  usePersonName: '', // 使用人
-  managerStateName: '', // 管理状态
-  validDate: '', // 有效日期
-  offset: 1,
-  limit: 20,
-})
-// 表头
-const columns = ref<TableColumn[]>([
-  { text: '设备编号', value: 'equipmentNo', align: 'center', width: '230' },
-  { text: '设备名称', value: 'equipmentName', align: 'center' },
-  { text: '型号', value: 'modelNo', align: 'center' },
-  { text: '测量范围', value: 'mesureRange', align: 'center' },
-  { text: '使用部门', value: 'useDeptName', align: 'center' },
-  { text: '使用人', value: 'usePersonName', align: 'center' },
-  { text: '管理状态', value: 'managerStateName', align: 'center' },
-  { text: '有效日期', value: 'validDate', align: 'center' },
-])
-
-// 编辑、详情--获取详细信息
-const fetchReceiveApplyListDetail = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
-    form.value.applyUnit = res.data.applyUnit // 部门
-    form.value.applyName = res.data.applyName// 申请名称
-    form.value.applyPerson = res.data.applyPerson// 申请人
-    form.value.time = res.data.time // 领用时间
-    form.value.applyDesc = res.data.applyDesc // 申请说明
-    list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
-      return {
-        ...item,
-        validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
-      }
-    })
-    loading.close()
-  })
-}
-
-// 点击关闭
-const $router = useRouter()
-const close = () => {
-  $router.back()
-}
-
-// 打印
-const printObj = ref({
-  id: 'lysq', // 需要打印元素的id
-  popTitle: '设备领用详情', // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备领用详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
-
-// 获取用户列表--（是否有不分页接口？）
-const fetchUserList = () => {
-  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
-    usePersonList.value = res.data.rows
-  })
-}
-
-// 获取使用部门
-const fetchDeptTreeList = () => {
-  getDeptTreeList().then((res: any) => {
-    if (res.data) { // 将列表转树结构
-      useDeptList.value = toTreeList(res.data, '0', true)
-    }
-  })
-}
-
-onMounted(async () => {
-  form.value.id = $route.query.id as string // id
-  form.value.processId = $route.query.processId as string // 任务id
-
-  // 获取部门信息
-  await fetchDeptTreeList()
-  // 获取人员列表
-  await fetchUserList()
-  // 编辑、详情获取详情页信息
-  fetchReceiveApplyListDetail() // 获取详细信息
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page title="设备领用处理-详情">
-      <template #btns>
-        <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
-          打印
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-    <div id="lysq" class="lysq-create-check">
-      <div class="top-info">
-        <detail-block title="领用申请">
-          <div class="form-area">
-            <el-form
-              ref="ruleFormRef"
-              :model="form"
-              label-width="120px"
-            >
-              <el-row :gutter="24">
-                <el-col :span="6">
-                  <el-form-item label="申请名称" prop="applyName">
-                    <el-input v-model="form.applyName" disabled />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                  <el-form-item label="申请单位" prop="applyUnit">
-                    <dept-select
-                      v-model="form.applyUnit"
-                      :data="useDeptList"
-                      disabled
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                  <el-form-item label="申请人" prop="applyPerson">
-                    <el-select v-model="form.applyPerson" disabled style="width: 100%;">
-                      <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                  <el-form-item label="领用时间" prop="time">
-                    <el-date-picker
-                      v-model="form.time"
-                      type="datetime"
-                      format="YYYY-MM-DD hh:mm"
-                      value-format="YYYY-MM-DD hh:mm"
-                      disabled
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="申请说明" prop="applyDesc">
-                    <el-input v-model="form.applyDesc" type="textarea" disabled autosize />
-                  </el-form-item>
-                </el-col>
-              </el-row>
-            </el-form>
-          </div>
-        </detail-block>
-      </div>
-      <detail-block title="设备领用列表">
-        <el-table
-          :data="list"
-          border
-          style="width: 100%;"
-          max-height="600"
-        >
-          <el-table-column align="center" label="序号" width="80" type="index" />
-          <el-table-column
-            v-for="item in columns"
-            :key="item.value"
-            :prop="item.value"
-            :label="item.text"
-            :width="item.width"
-            show-overflow-tooltip
-            align="center"
-          />
-        </el-table>
-      </detail-block>
-      <detail-block title="审批流程">
-        <approval-record :process-id="form.processId" />
-      </detail-block>
-    </div>
-  </app-container>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-.lysq-create-check {
-  margin-top: 10px;
-
-  .top-info {
-    display: flex;
-    flex-direction: column;
-    width: 100%;
-    padding-right: 10px;
-    border-radius: 10px;
-    background-color: #fff;
-    // padding: 10px;
-
-    .title-button {
-      display: flex;
-      align-items: center;
-
-      &::before {
-        content: "";
-        flex: 1;
-      }
-
-      .button-group {
-        flex: 1;
-        display: flex;
-        justify-content: flex-end;
-      }
-    }
-
-    .form-area {
-      margin-top: 40px;
-    }
-  }
-}
-</style>
-
-<style lang="scss">
-.lysq-create-check {
-  .el-form-item--default .el-form-item__label {
-    color: #000;
-  }
-}
-</style>
diff --git a/src/views/device/receive/solveList.vue b/src/views/device/receive/solveList.vue
deleted file mode 100644
index b654c2e..0000000
--- a/src/views/device/receive/solveList.vue
+++ /dev/null
@@ -1,426 +0,0 @@
-<script lang="ts" setup name="SolveList">
-import { ref } from 'vue'
-import type { Ref } from 'vue'
-import type { DateModelType } from 'element-plus'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { useRouter } from 'vue-router'
-import type { IlistQuery, IsolveListType } from '@/views/device/receive/receive'
-import ButtonBox from '@/views/device/receive/solveComponent/buttonBox.vue'
-import { exportFile } from '@/utils/exportUtils'
-import { printJSON } from '@/utils/printUtils'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getDeptTreeList } from '@/api/system/dept'
-import { toTreeList } from '@/utils/structure'
-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 {
-  delReceiveApplyList,
-  exportReceiveApplyList,
-  getReceiveApplyList,
-  updateProcessResult,
-} from '@/api/device/receive'
-
-const useDeptList = ref<deptType[]>([]) // 部门列表
-const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
-const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
-const applyPersonLoading = ref(false) // 申请人模糊搜索框loading
-const loadingTable = ref(false) // 表格loading
-const active = ref('4') // 选中的按钮
-
-// 审批状态字典
-const approvalStatusMap: { [key: string]: string } = {
-  1: '草稿箱',
-  2: '待审批',
-  3: '审批中',
-  4: '已通过',
-  5: '未通过',
-  6: '已取消',
-  7: '非草稿',
-  8: '未通过-驳回',
-}
-
-// 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  applyNo: '', // 申请编号
-  applyName: '', // 申请名称
-  applyUnit: '', // 申请部门id
-  applyUnitName: '', // 申请部门名称
-  applyPerson: '', // 申请人id
-  applyPersonName: '', // 申请人姓名
-  startTime: '', // 领用开始日期
-  endTime: '', // 领用结束日期
-  equipmentApplyProcessResult: '4', // 设备申请处理结果--4待领用、5已领用
-  approvalStatus: '4', // 审批状态--已通过
-  processResult: '4', // 	处置结果--4待领用、5已领用
-  applyType: '1', // 申请类型 领用1
-  createUser: '', // 创建人
-  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
-  offset: 1,
-  limit: 20,
-})
-const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-
-// 表格数据
-const list = ref<IsolveListType[]>([])
-const { proxy } = getCurrentInstance() as any
-// 总数
-const total = ref(20)
-// 表头
-const columns = ref<TableColumn[]>([
-  { text: '申请编号', value: 'applyNo', align: 'center' },
-  { text: '申请名称', value: 'applyName', align: 'center' },
-  { text: '申请部门', value: 'applyUnitName', align: 'center' },
-  { text: '申请人', value: 'applyPersonName', align: 'center' },
-  { text: '领用时间', value: 'time', align: 'center' },
-  { text: '申请说明', value: 'applyDesc', align: 'center' },
-  { text: '审批状态', value: 'approvalStatus', align: 'center' },
-])
-// 选中的内容
-const checkoutList = ref<string[]>([])
-
-// 重置
-const clearList = () => {
-  listQuery.value = {
-    applyNo: '', // 申请编号
-    applyName: '', // 申请名称
-    applyUnit: '', // 申请部门
-    applyPerson: '', // 申请人
-    startTime: '', // 申请开始日期
-    endTime: '', // 申请结束日期
-    approvalStatus: '4', // 	审批状态--已通过
-    processResult: active.value, // 	处置结果
-    applyType: '1', // 申请类型 领用1
-    createUser: '', // 创建人
-    formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
-    equipmentApplyProcessResult: active.value, // 设备申请处理结果
-    offset: 1,
-    limit: 20,
-  }
-  timeRange.value = ['', ''] // 把时间选择框置空
-  fetchData(true)
-}
-
-// 数据查询
-function fetchData(isNowPage = false) {
-  loadingTable.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.value.offset = 1
-  }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
-  listQuery.value.equipmentApplyProcessResult = active.value // 设备申请处理结果4待领用5已领用
-
-  getReceiveApplyList(listQuery.value).then((response) => {
-    list.value = response.data.rows.map((item: IsolveListType) => {
-      return {
-        ...item,
-        approvalStatus: approvalStatusMap[item.approvalStatus],
-      }
-    })
-    total.value = parseInt(response.data.total)
-    loadingTable.value = false
-  })
-}
-
-// 搜索
-const searchList = () => {
-  fetchData(true)
-}
-
-// 多选发生改变时
-const handleSelectionChange = (e: any) => {
-  checkoutList.value = e.map((item: { id: string }) => item.id)
-}
-
-// 导出
-const exportAll = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: '下载中请稍后',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (list.value.length > 0) {
-    const params = {
-      applyNo: listQuery.value.applyNo, // 申请编号
-      applyName: listQuery.value.applyName, // 申请名称
-      applyUnit: listQuery.value.applyUnit, // 申请部门
-      applyPerson: listQuery.value.applyPerson, // 申请人
-      startTime: listQuery.value.startTime, // 申请开始日期
-      endTime: listQuery.value.endTime, // 申请结束日期
-      equipmentApplyProcessResult: listQuery.value.equipmentApplyProcessResult, // 设备申请处理结果--4待领用、5已领用
-      approvalStatus: listQuery.value.approvalStatus, // 	审批状态
-      processResult: listQuery.value.processResult, // 	处置结果
-      applyType: listQuery.value.applyType, // 申请类型 领用1
-      createUser: listQuery.value.createUser, // 创建人
-      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
-      offset: 1,
-      limit: 20,
-      ids: checkoutList.value,
-    }
-    // 调导出接口
-    exportReceiveApplyList(params).then((res) => {
-      const blob = new Blob([res.data])
-      exportFile(blob, '设备领用处理列表.xlsx')
-    })
-  }
-  else {
-    ElMessage.warning('无数据可导出数据')
-  }
-  loading.close()
-}
-
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  fetchData(true)
-}
-
-// 打印列表
-function printList() {
-  // 打印列
-  const properties = columns.value.map((item) => {
-    return {
-      field: item.value,
-      displayName: item.text,
-    }
-  })
-  if (checkoutList.value.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '设备领用处理列表')
-  }
-  else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: IsolveListType) => checkoutList.value.includes(item.id))
-    printJSON(printList, properties, '设备领用处理列表')
-  }
-  else {
-    ElMessage.warning('无可打印内容')
-  }
-}
-
-// 操作
-const $router = useRouter()
-const handleEdit = (row: IsolveListType, val: string) => {
-  if (val === '查看') {
-    $router.push({
-      path: '/receive/solveDetail',
-      query: {
-        id: row.id,
-        processId: row.processId, // 查询审批记录使用
-      },
-    })
-  }
-  else {
-    ElMessageBox.confirm(
-    `确认${val}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-    )
-      .then(() => {
-        if (val === '领用' || val === '退领') {
-          const processResult = val === '领用' ? '5' : '4'
-          updateProcessResult({ id: row.id, processResult }).then(() => {
-            ElMessage.success(`已${val}`)
-            fetchData(true)
-          })
-        }
-        if (val === '删除') {
-          delReceiveApplyList({ id: row.id, taskId: row.taskId }).then(() => {
-            ElMessage.success(`已${val}`)
-            fetchData(true)
-          })
-        }
-      })
-  }
-}
-
-// 右上角按钮切换
-const changeCurrentButton = (val: string) => {
-  active.value = val
-  listQuery.value.equipmentApplyProcessResult = val // 处理结果--4待领用、5已领用
-  listQuery.value.processResult = val // 处理结果--4待领用、5已领用
-  clearList()
-}
-
-// 标签识别
-const execTag = () => {
-
-}
-
-// 获取用户列表
-const fetchUserList = () => {
-  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
-    usePersonList.value = res.data.rows
-    usePersonOptions.value = res.data.rows
-  })
-}
-
-// 获取使用部门
-const fetchDeptTreeList = () => {
-  getDeptTreeList().then((res: any) => {
-    if (res.data) { // 将列表转树结构
-      useDeptList.value = toTreeList(res.data, '0', true)
-    }
-  })
-}
-
-// 选择器模糊查询
-const remoteMethod = (query: string) => {
-  if (query) {
-    applyPersonLoading.value = true
-    setTimeout(() => {
-      applyPersonLoading.value = false
-      usePersonOptions.value = usePersonList.value.filter((item) => {
-        return item.name.toLowerCase().includes(query.toLowerCase())
-      })
-    }, 200)
-  }
-  else {
-    usePersonOptions.value = usePersonList.value
-  }
-}
-
-onMounted(() => {
-  // 获取表格数据
-  fetchData(true)
-  // 获取使用部门
-  fetchDeptTreeList()
-  // 获取人员列表
-  fetchUserList()
-})
-</script>
-
-<template>
-  <app-container>
-    <search-area
-      :need-clear="true"
-      @search="searchList" @clear="clearList"
-    >
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.applyNo"
-          placeholder="申请编号"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.applyName"
-          placeholder="申请名称"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
-      </search-item>
-      <search-item>
-        <el-form-item prop="applyPerson">
-          <el-select
-            v-model="listQuery.applyPerson"
-            placeholder="请选择申请人"
-            style="width: 100%;"
-            filterable
-            remote
-            remote-show-suffix
-            :remote-method="remoteMethod"
-            :loading="applyPersonLoading"
-          >
-            <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
-          </el-select>
-        </el-form-item>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="timeRange"
-          type="daterange"
-          range-separator="到"
-          format="YYYY-MM-DD"
-          value-format="YYYY-MM-DD"
-          start-placeholder="领用开始日期"
-          end-placeholder="领用结束日期"
-        />
-      </search-item>
-    </search-area>
-
-    <table-container>
-      <template #btns-right>
-        <icon-button icon="icon-device" title="标签识别" @click="execTag" />
-        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
-      </template>
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @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="scope">
-              <el-button
-                size="small"
-                type="primary"
-                link
-                @click="handleEdit(scope.row, '查看')"
-              >
-                查看
-              </el-button>
-              <el-button
-                v-if="active === '4'"
-                size="small"
-                link
-                type="primary"
-                @click="handleEdit(scope.row, '领用')"
-              >
-                领用
-              </el-button>
-              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-              <el-button
-                v-if="active === '4'"
-                size="small"
-                link
-                type="danger"
-                @click="handleEdit(scope.row, '删除')"
-              >
-                删除
-              </el-button>
-              <el-button
-                v-if="active === '5'"
-                size="small"
-                link
-                type="primary"
-                @click="handleEdit(scope.row, '退领')"
-              >
-                退领
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <button-box
-      :active="active"
-      @changeCurrentButton="changeCurrentButton"
-    />
-  </app-container>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-</style>
-