diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 23ac34d..31f65c9 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -325,7 +325,7 @@
         },
       },
       {
-        path: 'solveCheck',
+        path: 'solveDetail',
         name: 'SolveListDetail',
         component: () => import('@/views/device/receive/solveComponent/detail.vue'),
         meta: {

diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 23ac34d..31f65c9 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -325,7 +325,7 @@
         },
       },
       {
-        path: 'solveCheck',
+        path: 'solveDetail',
         name: 'SolveListDetail',
         component: () => import('@/views/device/receive/solveComponent/detail.vue'),
         meta: {
diff --git a/src/views/device/receive/applyList.vue b/src/views/device/receive/applyList.vue
index a119e48..4674763 100644
--- a/src/views/device/receive/applyList.vue
+++ b/src/views/device/receive/applyList.vue
@@ -225,7 +225,7 @@
     approveOpinion.value = '0'
   }
   else if (val === '查看') {
-    $router.push({ path: '/receive/check', query: { typeValue: 'check' } })
+    $router.push({ path: '/receive/detail', query: { typeValue: 'detail', deviceName: row.name } })
   }
 }
 // 按钮切换
@@ -315,7 +315,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
       >
         <template #preColumns>
-          <el-table-column label="#" width="55" align="center">
+          <el-table-column label="序号" width="55" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>

diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 23ac34d..31f65c9 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -325,7 +325,7 @@
         },
       },
       {
-        path: 'solveCheck',
+        path: 'solveDetail',
         name: 'SolveListDetail',
         component: () => import('@/views/device/receive/solveComponent/detail.vue'),
         meta: {
diff --git a/src/views/device/receive/applyList.vue b/src/views/device/receive/applyList.vue
index a119e48..4674763 100644
--- a/src/views/device/receive/applyList.vue
+++ b/src/views/device/receive/applyList.vue
@@ -225,7 +225,7 @@
     approveOpinion.value = '0'
   }
   else if (val === '查看') {
-    $router.push({ path: '/receive/check', query: { typeValue: 'check' } })
+    $router.push({ path: '/receive/detail', query: { typeValue: 'detail', deviceName: row.name } })
   }
 }
 // 按钮切换
@@ -315,7 +315,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
       >
         <template #preColumns>
-          <el-table-column label="#" width="55" align="center">
+          <el-table-column label="序号" width="55" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/device/receive/createOrCheck.vue b/src/views/device/receive/createOrCheck.vue
index 660cd22..3151335 100644
--- a/src/views/device/receive/createOrCheck.vue
+++ b/src/views/device/receive/createOrCheck.vue
@@ -9,6 +9,7 @@
 import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
 const $route = useRoute()
 const typeValue = ref()
+const deviceName = ref()
 const isMulti = ref(false) // 是否批量添加(允许多选)
 const selectIndex = ref()
 const { proxy } = getCurrentInstance() as any
@@ -20,7 +21,6 @@
   edit: '编辑',
   add: '新建',
   detail: '详情',
-  check: '查看',
 }// 字典
 const haveApproveLimits = ref(true)// 是否有审批权限
 const isStart = ref(false)// 是否是发起人
@@ -34,25 +34,7 @@
   state: '', // 申请说明
 })
 const ruleFormRef = ref<FormInstance>() as any
-const list = ref([{
-  name: '测试1', // 仪器名称
-  number: '测试1', // 设备编号
-  version: '测试1', // 型号
-  scope: '测试1', // 测量范围
-  dep: '测试1', // 使用部门
-  person: '测试1', // 使用人
-  status: '测试1', // 管理状态
-  date: '测试1', // 有效日期
-}, {
-  name: '测试2', // 仪器名称
-  number: '测试2', // 设备编号
-  version: '测试2', // 型号
-  scope: '测试2', // 测量范围
-  dep: '测试2', // 使用部门
-  person: '测试2', // 使用人
-  status: '测试2', // 管理状态
-  date: '测试2', // 有效日期
-}])// 表格数据
+const list = ref([])// 表格数据
 // 查询条件
 const listQuery: Ref<IdeviceListQuery> = ref({
   name: '', // 仪器名称
@@ -230,12 +212,13 @@
 
 onMounted(() => {
   typeValue.value = $route.query.typeValue
+  deviceName.value = $route.query.deviceName
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page :title="`设备领用申请-${textMap[typeValue]}`">
+    <detail-page :title="typeValue === 'detail' && deviceName ? `${deviceName}-详情` : `设备领用申请-${textMap[typeValue]}`">
       <template #btns>
         <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('1')">
           同意
@@ -269,10 +252,10 @@
             <el-row :gutter="20">
               <el-col :span="12">
                 <el-form-item label="申请单位" prop="company">
-                  <el-input v-model="form.company" clearable :disabled="typeValue === 'check'" />
+                  <el-input v-model="form.company" clearable :disabled="typeValue === 'detail'" />
                 </el-form-item>
                 <el-form-item label="申请人" prop="person">
-                  <el-input v-model="form.person" clearable :disabled="typeValue === 'check'" />
+                  <el-input v-model="form.person" clearable :disabled="typeValue === 'detail'" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
@@ -281,42 +264,42 @@
                     v-model="form.time"
                     type="datetime"
                     placeholder="请选择领用时间"
-                    :disabled="typeValue === 'check'"
+                    :disabled="typeValue === 'detail'"
                   />
                 </el-form-item>
                 <el-form-item label="申请说明">
-                  <el-input v-model="form.state" type="textarea" clearable :disabled="typeValue === 'check'" />
+                  <el-input v-model="form.state" type="textarea" clearable :disabled="typeValue === 'detail'" />
                 </el-form-item>
               </el-col>
             </el-row>
           </el-form>
         </div>
       </div>
-      <table-container title="设备领用列表">
-        <template #btns-right>
-          <el-button v-if="typeValue !== 'check'" type="primary" @click="multiAdd">
+      <detail-block title="设备领用列表">
+        <template #btns>
+          <el-button v-if="typeValue !== 'detail'" type="primary" @click="multiAdd">
             批量添加
           </el-button>
-          <el-button v-if="typeValue !== 'check'" type="primary" @click="addRow">
+          <el-button v-if="typeValue !== 'detail'" type="primary" @click="addRow">
             增加行
           </el-button>
-          <el-button v-if="typeValue !== 'check'" type="primary" @click="delRow">
+          <el-button v-if="typeValue !== 'detail'" type="info" @click="delRow">
             删除行
           </el-button>
         </template>
         <normal-table
           :data="list" :total="total" :columns="columns" :query="listQuery"
-          :is-showmulti-select="typeValue === 'check' ? false : true" @change="changePage" @multiSelect="handleSelectionChange"
+          :is-showmulti-select="typeValue === 'detail' ? false : true" @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #preColumns>
-            <el-table-column label="#" width="55" align="center">
+            <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 v-if="typeValue !== 'check'" label="操作" align="center" width="60" fixed="right">
+            <el-table-column v-if="typeValue !== 'detail'" label="操作" align="center" width="60" fixed="right">
               <template #default="scope">
                 <el-button
                   size="small"
@@ -330,36 +313,30 @@
             </el-table-column>
           </template>
         </normal-table>
-      </table-container>
+      </detail-block>
 
-      <table-container title="审批流程">
-      <!-- <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          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="120">
-              <template #default="{ row }">
-                <el-button
-                  size="small"
-                  type="primary"
-                  link
-                  @click="handleSelect(row.$index, row)"
-                >
-                  选择
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table> -->
-      </table-container>
+      <detail-block title="审批流程">
+        <el-timeline>
+          <el-timeline-item timestamp="2018/4/12" placement="top">
+            <el-card>
+              <h4>Update Github template</h4>
+              <p>Tom committed 2018/4/12 20:46</p>
+            </el-card>
+          </el-timeline-item>
+          <el-timeline-item timestamp="2018/4/3" placement="top">
+            <el-card>
+              <h4>Update Github template</h4>
+              <p>Tom committed 2018/4/3 20:46</p>
+            </el-card>
+          </el-timeline-item>
+          <el-timeline-item timestamp="2018/4/2" placement="top">
+            <el-card>
+              <h4>Update Github template</h4>
+              <p>Tom committed 2018/4/2 20:46</p>
+            </el-card>
+          </el-timeline-item>
+        </el-timeline>
+      </detail-block>
     </div>
     <select-device-dialog
       :dialog-select-divice-visible="dialogSelectDiviceVisible"

diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 23ac34d..31f65c9 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -325,7 +325,7 @@
         },
       },
       {
-        path: 'solveCheck',
+        path: 'solveDetail',
         name: 'SolveListDetail',
         component: () => import('@/views/device/receive/solveComponent/detail.vue'),
         meta: {
diff --git a/src/views/device/receive/applyList.vue b/src/views/device/receive/applyList.vue
index a119e48..4674763 100644
--- a/src/views/device/receive/applyList.vue
+++ b/src/views/device/receive/applyList.vue
@@ -225,7 +225,7 @@
     approveOpinion.value = '0'
   }
   else if (val === '查看') {
-    $router.push({ path: '/receive/check', query: { typeValue: 'check' } })
+    $router.push({ path: '/receive/detail', query: { typeValue: 'detail', deviceName: row.name } })
   }
 }
 // 按钮切换
@@ -315,7 +315,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
       >
         <template #preColumns>
-          <el-table-column label="#" width="55" align="center">
+          <el-table-column label="序号" width="55" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/device/receive/createOrCheck.vue b/src/views/device/receive/createOrCheck.vue
index 660cd22..3151335 100644
--- a/src/views/device/receive/createOrCheck.vue
+++ b/src/views/device/receive/createOrCheck.vue
@@ -9,6 +9,7 @@
 import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
 const $route = useRoute()
 const typeValue = ref()
+const deviceName = ref()
 const isMulti = ref(false) // 是否批量添加(允许多选)
 const selectIndex = ref()
 const { proxy } = getCurrentInstance() as any
@@ -20,7 +21,6 @@
   edit: '编辑',
   add: '新建',
   detail: '详情',
-  check: '查看',
 }// 字典
 const haveApproveLimits = ref(true)// 是否有审批权限
 const isStart = ref(false)// 是否是发起人
@@ -34,25 +34,7 @@
   state: '', // 申请说明
 })
 const ruleFormRef = ref<FormInstance>() as any
-const list = ref([{
-  name: '测试1', // 仪器名称
-  number: '测试1', // 设备编号
-  version: '测试1', // 型号
-  scope: '测试1', // 测量范围
-  dep: '测试1', // 使用部门
-  person: '测试1', // 使用人
-  status: '测试1', // 管理状态
-  date: '测试1', // 有效日期
-}, {
-  name: '测试2', // 仪器名称
-  number: '测试2', // 设备编号
-  version: '测试2', // 型号
-  scope: '测试2', // 测量范围
-  dep: '测试2', // 使用部门
-  person: '测试2', // 使用人
-  status: '测试2', // 管理状态
-  date: '测试2', // 有效日期
-}])// 表格数据
+const list = ref([])// 表格数据
 // 查询条件
 const listQuery: Ref<IdeviceListQuery> = ref({
   name: '', // 仪器名称
@@ -230,12 +212,13 @@
 
 onMounted(() => {
   typeValue.value = $route.query.typeValue
+  deviceName.value = $route.query.deviceName
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page :title="`设备领用申请-${textMap[typeValue]}`">
+    <detail-page :title="typeValue === 'detail' && deviceName ? `${deviceName}-详情` : `设备领用申请-${textMap[typeValue]}`">
       <template #btns>
         <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('1')">
           同意
@@ -269,10 +252,10 @@
             <el-row :gutter="20">
               <el-col :span="12">
                 <el-form-item label="申请单位" prop="company">
-                  <el-input v-model="form.company" clearable :disabled="typeValue === 'check'" />
+                  <el-input v-model="form.company" clearable :disabled="typeValue === 'detail'" />
                 </el-form-item>
                 <el-form-item label="申请人" prop="person">
-                  <el-input v-model="form.person" clearable :disabled="typeValue === 'check'" />
+                  <el-input v-model="form.person" clearable :disabled="typeValue === 'detail'" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
@@ -281,42 +264,42 @@
                     v-model="form.time"
                     type="datetime"
                     placeholder="请选择领用时间"
-                    :disabled="typeValue === 'check'"
+                    :disabled="typeValue === 'detail'"
                   />
                 </el-form-item>
                 <el-form-item label="申请说明">
-                  <el-input v-model="form.state" type="textarea" clearable :disabled="typeValue === 'check'" />
+                  <el-input v-model="form.state" type="textarea" clearable :disabled="typeValue === 'detail'" />
                 </el-form-item>
               </el-col>
             </el-row>
           </el-form>
         </div>
       </div>
-      <table-container title="设备领用列表">
-        <template #btns-right>
-          <el-button v-if="typeValue !== 'check'" type="primary" @click="multiAdd">
+      <detail-block title="设备领用列表">
+        <template #btns>
+          <el-button v-if="typeValue !== 'detail'" type="primary" @click="multiAdd">
             批量添加
           </el-button>
-          <el-button v-if="typeValue !== 'check'" type="primary" @click="addRow">
+          <el-button v-if="typeValue !== 'detail'" type="primary" @click="addRow">
             增加行
           </el-button>
-          <el-button v-if="typeValue !== 'check'" type="primary" @click="delRow">
+          <el-button v-if="typeValue !== 'detail'" type="info" @click="delRow">
             删除行
           </el-button>
         </template>
         <normal-table
           :data="list" :total="total" :columns="columns" :query="listQuery"
-          :is-showmulti-select="typeValue === 'check' ? false : true" @change="changePage" @multiSelect="handleSelectionChange"
+          :is-showmulti-select="typeValue === 'detail' ? false : true" @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #preColumns>
-            <el-table-column label="#" width="55" align="center">
+            <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 v-if="typeValue !== 'check'" label="操作" align="center" width="60" fixed="right">
+            <el-table-column v-if="typeValue !== 'detail'" label="操作" align="center" width="60" fixed="right">
               <template #default="scope">
                 <el-button
                   size="small"
@@ -330,36 +313,30 @@
             </el-table-column>
           </template>
         </normal-table>
-      </table-container>
+      </detail-block>
 
-      <table-container title="审批流程">
-      <!-- <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          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="120">
-              <template #default="{ row }">
-                <el-button
-                  size="small"
-                  type="primary"
-                  link
-                  @click="handleSelect(row.$index, row)"
-                >
-                  选择
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table> -->
-      </table-container>
+      <detail-block title="审批流程">
+        <el-timeline>
+          <el-timeline-item timestamp="2018/4/12" placement="top">
+            <el-card>
+              <h4>Update Github template</h4>
+              <p>Tom committed 2018/4/12 20:46</p>
+            </el-card>
+          </el-timeline-item>
+          <el-timeline-item timestamp="2018/4/3" placement="top">
+            <el-card>
+              <h4>Update Github template</h4>
+              <p>Tom committed 2018/4/3 20:46</p>
+            </el-card>
+          </el-timeline-item>
+          <el-timeline-item timestamp="2018/4/2" placement="top">
+            <el-card>
+              <h4>Update Github template</h4>
+              <p>Tom committed 2018/4/2 20:46</p>
+            </el-card>
+          </el-timeline-item>
+        </el-timeline>
+      </detail-block>
     </div>
     <select-device-dialog
       :dialog-select-divice-visible="dialogSelectDiviceVisible"
diff --git a/src/views/device/receive/selectDeviceDialog.vue b/src/views/device/receive/selectDeviceDialog.vue
index d6f28f3..4a9793d 100644
--- a/src/views/device/receive/selectDeviceDialog.vue
+++ b/src/views/device/receive/selectDeviceDialog.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="ReceiveDialog">
 import { ref } from 'vue'
 import useUserStore from '@/store/modules/user'
+import { listPageApi } from '@/api/device/standingBook'
 const props = defineProps({
   dialogSelectDiviceVisible: {
     type: Boolean,
@@ -10,36 +11,20 @@
   isMulti: Boolean,
 })
 const emits = defineEmits(['closeDialog', 'updateDeviceConfirm'])
+const loadingTable = ref<boolean>(false)
 const userStore = useUserStore()
 // 查询条件
 const listQuery = ref({
-  deviceName: '', // 设备名称
-  deviceNumber: '', // 设备编号
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const total = ref(20)
 // 多选选中的内容
 const checkoutList = ref([])
 
-const list = ref([{
-  name: '设备01',
-  number: '设备01',
-  version: '设备01',
-  millNumber: '设备01',
-  status: '设备01',
-  person: '设备01',
-  date: '设备01',
-},
-{
-  name: '设备02',
-  number: '设备02',
-  version: '设备02',
-  millNumber: '设备02',
-  status: '设备02',
-  person: '设备02',
-  date: '设备02',
-}])// 表格数据
+const list = ref([])// 表格数据
 const columns = [
   {
     text: '设备名称',
@@ -72,8 +57,36 @@
 ]
 const table = ref()
 const dialogTableVisible = ref(false)// 控制对话框显隐
+
+// 获取数据列表
+const fetchData = () => {
+  loadingTable.value = true
+  listPageApi(listQuery.value as any).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map((item: any) => {
+        return {
+          ...item,
+          name: item.equipmentName,
+          number: item.equipmentNo,
+          version: item.modelNo,
+          millNumber: item.manufacturingNo,
+          status: item.managerStateName,
+          person: item.usePersonName,
+          date: item.validDate,
+          scope: item.mesureRange,
+          dep: item.useDeptName,
+        }
+      })
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
 watch(() => props.dialogSelectDiviceVisible, (newValue) => {
   dialogTableVisible.value = newValue
+  fetchData()
   if (!newValue) {
     table.value.clearMulti() // 清除多选选中
   }
@@ -92,12 +105,13 @@
 }
 // 重置
 const clearList = () => {
-  listQuery.value.deviceName = ''
-  listQuery.value.deviceNumber = ''
+  listQuery.value.equipmentName = ''
+  listQuery.value.equipmentNo = ''
+  fetchData()
 }
 // 搜索
 const searchList = () => {
-
+  fetchData()
 }
 // 多选选中
 const handleSelectionChange = (val: any) => {
@@ -112,26 +126,26 @@
   if (val && val.page) {
     listQuery.value.offset = val.page
   }
-  // fetchData(true)
+  fetchData()
 }
 </script>
 
 <template>
-  <el-dialog v-model="dialogTableVisible" title="选择设备" class="select-device-dialog" @close="close">
+  <el-dialog v-model="dialogTableVisible" width="60%" title="选择设备" class="select-device-dialog" @close="close">
     <search-area
       :need-clear="true"
       @search="searchList" @clear="clearList"
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.deviceName"
+          v-model.trim="listQuery.equipmentName"
           placeholder="设备名称"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.deviceNumber"
+          v-model.trim="listQuery.equipmentNo"
           placeholder="设备编号"
           clearable
         />
@@ -146,6 +160,7 @@
         :query="listQuery"
         :is-multi="isMulti"
         is-showmulti-select
+        :list-loading="loadingTable"
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >

diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 23ac34d..31f65c9 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -325,7 +325,7 @@
         },
       },
       {
-        path: 'solveCheck',
+        path: 'solveDetail',
         name: 'SolveListDetail',
         component: () => import('@/views/device/receive/solveComponent/detail.vue'),
         meta: {
diff --git a/src/views/device/receive/applyList.vue b/src/views/device/receive/applyList.vue
index a119e48..4674763 100644
--- a/src/views/device/receive/applyList.vue
+++ b/src/views/device/receive/applyList.vue
@@ -225,7 +225,7 @@
     approveOpinion.value = '0'
   }
   else if (val === '查看') {
-    $router.push({ path: '/receive/check', query: { typeValue: 'check' } })
+    $router.push({ path: '/receive/detail', query: { typeValue: 'detail', deviceName: row.name } })
   }
 }
 // 按钮切换
@@ -315,7 +315,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
       >
         <template #preColumns>
-          <el-table-column label="#" width="55" align="center">
+          <el-table-column label="序号" width="55" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/device/receive/createOrCheck.vue b/src/views/device/receive/createOrCheck.vue
index 660cd22..3151335 100644
--- a/src/views/device/receive/createOrCheck.vue
+++ b/src/views/device/receive/createOrCheck.vue
@@ -9,6 +9,7 @@
 import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
 const $route = useRoute()
 const typeValue = ref()
+const deviceName = ref()
 const isMulti = ref(false) // 是否批量添加(允许多选)
 const selectIndex = ref()
 const { proxy } = getCurrentInstance() as any
@@ -20,7 +21,6 @@
   edit: '编辑',
   add: '新建',
   detail: '详情',
-  check: '查看',
 }// 字典
 const haveApproveLimits = ref(true)// 是否有审批权限
 const isStart = ref(false)// 是否是发起人
@@ -34,25 +34,7 @@
   state: '', // 申请说明
 })
 const ruleFormRef = ref<FormInstance>() as any
-const list = ref([{
-  name: '测试1', // 仪器名称
-  number: '测试1', // 设备编号
-  version: '测试1', // 型号
-  scope: '测试1', // 测量范围
-  dep: '测试1', // 使用部门
-  person: '测试1', // 使用人
-  status: '测试1', // 管理状态
-  date: '测试1', // 有效日期
-}, {
-  name: '测试2', // 仪器名称
-  number: '测试2', // 设备编号
-  version: '测试2', // 型号
-  scope: '测试2', // 测量范围
-  dep: '测试2', // 使用部门
-  person: '测试2', // 使用人
-  status: '测试2', // 管理状态
-  date: '测试2', // 有效日期
-}])// 表格数据
+const list = ref([])// 表格数据
 // 查询条件
 const listQuery: Ref<IdeviceListQuery> = ref({
   name: '', // 仪器名称
@@ -230,12 +212,13 @@
 
 onMounted(() => {
   typeValue.value = $route.query.typeValue
+  deviceName.value = $route.query.deviceName
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page :title="`设备领用申请-${textMap[typeValue]}`">
+    <detail-page :title="typeValue === 'detail' && deviceName ? `${deviceName}-详情` : `设备领用申请-${textMap[typeValue]}`">
       <template #btns>
         <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('1')">
           同意
@@ -269,10 +252,10 @@
             <el-row :gutter="20">
               <el-col :span="12">
                 <el-form-item label="申请单位" prop="company">
-                  <el-input v-model="form.company" clearable :disabled="typeValue === 'check'" />
+                  <el-input v-model="form.company" clearable :disabled="typeValue === 'detail'" />
                 </el-form-item>
                 <el-form-item label="申请人" prop="person">
-                  <el-input v-model="form.person" clearable :disabled="typeValue === 'check'" />
+                  <el-input v-model="form.person" clearable :disabled="typeValue === 'detail'" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
@@ -281,42 +264,42 @@
                     v-model="form.time"
                     type="datetime"
                     placeholder="请选择领用时间"
-                    :disabled="typeValue === 'check'"
+                    :disabled="typeValue === 'detail'"
                   />
                 </el-form-item>
                 <el-form-item label="申请说明">
-                  <el-input v-model="form.state" type="textarea" clearable :disabled="typeValue === 'check'" />
+                  <el-input v-model="form.state" type="textarea" clearable :disabled="typeValue === 'detail'" />
                 </el-form-item>
               </el-col>
             </el-row>
           </el-form>
         </div>
       </div>
-      <table-container title="设备领用列表">
-        <template #btns-right>
-          <el-button v-if="typeValue !== 'check'" type="primary" @click="multiAdd">
+      <detail-block title="设备领用列表">
+        <template #btns>
+          <el-button v-if="typeValue !== 'detail'" type="primary" @click="multiAdd">
             批量添加
           </el-button>
-          <el-button v-if="typeValue !== 'check'" type="primary" @click="addRow">
+          <el-button v-if="typeValue !== 'detail'" type="primary" @click="addRow">
             增加行
           </el-button>
-          <el-button v-if="typeValue !== 'check'" type="primary" @click="delRow">
+          <el-button v-if="typeValue !== 'detail'" type="info" @click="delRow">
             删除行
           </el-button>
         </template>
         <normal-table
           :data="list" :total="total" :columns="columns" :query="listQuery"
-          :is-showmulti-select="typeValue === 'check' ? false : true" @change="changePage" @multiSelect="handleSelectionChange"
+          :is-showmulti-select="typeValue === 'detail' ? false : true" @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #preColumns>
-            <el-table-column label="#" width="55" align="center">
+            <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 v-if="typeValue !== 'check'" label="操作" align="center" width="60" fixed="right">
+            <el-table-column v-if="typeValue !== 'detail'" label="操作" align="center" width="60" fixed="right">
               <template #default="scope">
                 <el-button
                   size="small"
@@ -330,36 +313,30 @@
             </el-table-column>
           </template>
         </normal-table>
-      </table-container>
+      </detail-block>
 
-      <table-container title="审批流程">
-      <!-- <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          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="120">
-              <template #default="{ row }">
-                <el-button
-                  size="small"
-                  type="primary"
-                  link
-                  @click="handleSelect(row.$index, row)"
-                >
-                  选择
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table> -->
-      </table-container>
+      <detail-block title="审批流程">
+        <el-timeline>
+          <el-timeline-item timestamp="2018/4/12" placement="top">
+            <el-card>
+              <h4>Update Github template</h4>
+              <p>Tom committed 2018/4/12 20:46</p>
+            </el-card>
+          </el-timeline-item>
+          <el-timeline-item timestamp="2018/4/3" placement="top">
+            <el-card>
+              <h4>Update Github template</h4>
+              <p>Tom committed 2018/4/3 20:46</p>
+            </el-card>
+          </el-timeline-item>
+          <el-timeline-item timestamp="2018/4/2" placement="top">
+            <el-card>
+              <h4>Update Github template</h4>
+              <p>Tom committed 2018/4/2 20:46</p>
+            </el-card>
+          </el-timeline-item>
+        </el-timeline>
+      </detail-block>
     </div>
     <select-device-dialog
       :dialog-select-divice-visible="dialogSelectDiviceVisible"
diff --git a/src/views/device/receive/selectDeviceDialog.vue b/src/views/device/receive/selectDeviceDialog.vue
index d6f28f3..4a9793d 100644
--- a/src/views/device/receive/selectDeviceDialog.vue
+++ b/src/views/device/receive/selectDeviceDialog.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="ReceiveDialog">
 import { ref } from 'vue'
 import useUserStore from '@/store/modules/user'
+import { listPageApi } from '@/api/device/standingBook'
 const props = defineProps({
   dialogSelectDiviceVisible: {
     type: Boolean,
@@ -10,36 +11,20 @@
   isMulti: Boolean,
 })
 const emits = defineEmits(['closeDialog', 'updateDeviceConfirm'])
+const loadingTable = ref<boolean>(false)
 const userStore = useUserStore()
 // 查询条件
 const listQuery = ref({
-  deviceName: '', // 设备名称
-  deviceNumber: '', // 设备编号
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const total = ref(20)
 // 多选选中的内容
 const checkoutList = ref([])
 
-const list = ref([{
-  name: '设备01',
-  number: '设备01',
-  version: '设备01',
-  millNumber: '设备01',
-  status: '设备01',
-  person: '设备01',
-  date: '设备01',
-},
-{
-  name: '设备02',
-  number: '设备02',
-  version: '设备02',
-  millNumber: '设备02',
-  status: '设备02',
-  person: '设备02',
-  date: '设备02',
-}])// 表格数据
+const list = ref([])// 表格数据
 const columns = [
   {
     text: '设备名称',
@@ -72,8 +57,36 @@
 ]
 const table = ref()
 const dialogTableVisible = ref(false)// 控制对话框显隐
+
+// 获取数据列表
+const fetchData = () => {
+  loadingTable.value = true
+  listPageApi(listQuery.value as any).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map((item: any) => {
+        return {
+          ...item,
+          name: item.equipmentName,
+          number: item.equipmentNo,
+          version: item.modelNo,
+          millNumber: item.manufacturingNo,
+          status: item.managerStateName,
+          person: item.usePersonName,
+          date: item.validDate,
+          scope: item.mesureRange,
+          dep: item.useDeptName,
+        }
+      })
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
 watch(() => props.dialogSelectDiviceVisible, (newValue) => {
   dialogTableVisible.value = newValue
+  fetchData()
   if (!newValue) {
     table.value.clearMulti() // 清除多选选中
   }
@@ -92,12 +105,13 @@
 }
 // 重置
 const clearList = () => {
-  listQuery.value.deviceName = ''
-  listQuery.value.deviceNumber = ''
+  listQuery.value.equipmentName = ''
+  listQuery.value.equipmentNo = ''
+  fetchData()
 }
 // 搜索
 const searchList = () => {
-
+  fetchData()
 }
 // 多选选中
 const handleSelectionChange = (val: any) => {
@@ -112,26 +126,26 @@
   if (val && val.page) {
     listQuery.value.offset = val.page
   }
-  // fetchData(true)
+  fetchData()
 }
 </script>
 
 <template>
-  <el-dialog v-model="dialogTableVisible" title="选择设备" class="select-device-dialog" @close="close">
+  <el-dialog v-model="dialogTableVisible" width="60%" title="选择设备" class="select-device-dialog" @close="close">
     <search-area
       :need-clear="true"
       @search="searchList" @clear="clearList"
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.deviceName"
+          v-model.trim="listQuery.equipmentName"
           placeholder="设备名称"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.deviceNumber"
+          v-model.trim="listQuery.equipmentNo"
           placeholder="设备编号"
           clearable
         />
@@ -146,6 +160,7 @@
         :query="listQuery"
         :is-multi="isMulti"
         is-showmulti-select
+        :list-loading="loadingTable"
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
diff --git a/src/views/device/receive/solveComponent/detail.vue b/src/views/device/receive/solveComponent/detail.vue
index aa6cb58..42f7a61 100644
--- a/src/views/device/receive/solveComponent/detail.vue
+++ b/src/views/device/receive/solveComponent/detail.vue
@@ -1,13 +1,17 @@
 <script lang="ts" setup name="Detail">
-import { ref } from 'vue'
+import { onMounted, ref } from 'vue'
+import { useRoute, useRouter } from 'vue-router'
 import type { Ref } from 'vue'
 import type { IdeviceListQuery, Iform } from '../receive'
-
 const props = defineProps({
   typeValue: String,
 })
+
+const $route = useRoute()
+
 const { proxy } = getCurrentInstance() as any
 const total = ref(20)// 总数
+const deviceName = ref()
 
 // 表单数据
 const form = ref({
@@ -125,11 +129,15 @@
   standard: '',
   extarCss: '',
 })
+
+onMounted(() => {
+  deviceName.value = $route.query.deviceName
+})
 </script>
 
 <template>
   <app-container>
-    <detail-page title="设备领用处理-查看">
+    <detail-page :title="deviceName ? `${deviceName}-详情` : '设备领用处理-详情'">
       <template #btns>
         <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
           打印
@@ -175,49 +183,43 @@
           </div>
         </detail-block>
       </div>
-      <table-container title="设备领用列表">
+      <detail-block title="设备领用列表">
         <normal-table
           :data="list" :total="total" :columns="columns" :query="listQuery"
           @change="changePage"
         >
           <template #preColumns>
-            <el-table-column label="#" width="55" align="center">
+            <el-table-column label="序号" width="55" align="center">
               <template #default="scope">
                 {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
               </template>
             </el-table-column>
           </template>
         </normal-table>
-      </table-container>
+      </detail-block>
 
-      <table-container title="审批流程">
-        <!-- <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          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="120">
-              <template #default="{ row }">
-                <el-button
-                  size="small"
-                  type="primary"
-                  link
-                  @click="handleSelect(row.$index, row)"
-                >
-                  选择
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table> -->
-      </table-container>
+      <detail-block title="审批流程">
+        <el-timeline>
+          <el-timeline-item timestamp="2018/4/12" placement="top">
+            <el-card>
+              <h4>Update Github template</h4>
+              <p>Tom committed 2018/4/12 20:46</p>
+            </el-card>
+          </el-timeline-item>
+          <el-timeline-item timestamp="2018/4/3" placement="top">
+            <el-card>
+              <h4>Update Github template</h4>
+              <p>Tom committed 2018/4/3 20:46</p>
+            </el-card>
+          </el-timeline-item>
+          <el-timeline-item timestamp="2018/4/2" placement="top">
+            <el-card>
+              <h4>Update Github template</h4>
+              <p>Tom committed 2018/4/2 20:46</p>
+            </el-card>
+          </el-timeline-item>
+        </el-timeline>
+      </detail-block>
     </div>
   </app-container>
 </template>

diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 23ac34d..31f65c9 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -325,7 +325,7 @@
         },
       },
       {
-        path: 'solveCheck',
+        path: 'solveDetail',
         name: 'SolveListDetail',
         component: () => import('@/views/device/receive/solveComponent/detail.vue'),
         meta: {
diff --git a/src/views/device/receive/applyList.vue b/src/views/device/receive/applyList.vue
index a119e48..4674763 100644
--- a/src/views/device/receive/applyList.vue
+++ b/src/views/device/receive/applyList.vue
@@ -225,7 +225,7 @@
     approveOpinion.value = '0'
   }
   else if (val === '查看') {
-    $router.push({ path: '/receive/check', query: { typeValue: 'check' } })
+    $router.push({ path: '/receive/detail', query: { typeValue: 'detail', deviceName: row.name } })
   }
 }
 // 按钮切换
@@ -315,7 +315,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
       >
         <template #preColumns>
-          <el-table-column label="#" width="55" align="center">
+          <el-table-column label="序号" width="55" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/device/receive/createOrCheck.vue b/src/views/device/receive/createOrCheck.vue
index 660cd22..3151335 100644
--- a/src/views/device/receive/createOrCheck.vue
+++ b/src/views/device/receive/createOrCheck.vue
@@ -9,6 +9,7 @@
 import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
 const $route = useRoute()
 const typeValue = ref()
+const deviceName = ref()
 const isMulti = ref(false) // 是否批量添加(允许多选)
 const selectIndex = ref()
 const { proxy } = getCurrentInstance() as any
@@ -20,7 +21,6 @@
   edit: '编辑',
   add: '新建',
   detail: '详情',
-  check: '查看',
 }// 字典
 const haveApproveLimits = ref(true)// 是否有审批权限
 const isStart = ref(false)// 是否是发起人
@@ -34,25 +34,7 @@
   state: '', // 申请说明
 })
 const ruleFormRef = ref<FormInstance>() as any
-const list = ref([{
-  name: '测试1', // 仪器名称
-  number: '测试1', // 设备编号
-  version: '测试1', // 型号
-  scope: '测试1', // 测量范围
-  dep: '测试1', // 使用部门
-  person: '测试1', // 使用人
-  status: '测试1', // 管理状态
-  date: '测试1', // 有效日期
-}, {
-  name: '测试2', // 仪器名称
-  number: '测试2', // 设备编号
-  version: '测试2', // 型号
-  scope: '测试2', // 测量范围
-  dep: '测试2', // 使用部门
-  person: '测试2', // 使用人
-  status: '测试2', // 管理状态
-  date: '测试2', // 有效日期
-}])// 表格数据
+const list = ref([])// 表格数据
 // 查询条件
 const listQuery: Ref<IdeviceListQuery> = ref({
   name: '', // 仪器名称
@@ -230,12 +212,13 @@
 
 onMounted(() => {
   typeValue.value = $route.query.typeValue
+  deviceName.value = $route.query.deviceName
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page :title="`设备领用申请-${textMap[typeValue]}`">
+    <detail-page :title="typeValue === 'detail' && deviceName ? `${deviceName}-详情` : `设备领用申请-${textMap[typeValue]}`">
       <template #btns>
         <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('1')">
           同意
@@ -269,10 +252,10 @@
             <el-row :gutter="20">
               <el-col :span="12">
                 <el-form-item label="申请单位" prop="company">
-                  <el-input v-model="form.company" clearable :disabled="typeValue === 'check'" />
+                  <el-input v-model="form.company" clearable :disabled="typeValue === 'detail'" />
                 </el-form-item>
                 <el-form-item label="申请人" prop="person">
-                  <el-input v-model="form.person" clearable :disabled="typeValue === 'check'" />
+                  <el-input v-model="form.person" clearable :disabled="typeValue === 'detail'" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
@@ -281,42 +264,42 @@
                     v-model="form.time"
                     type="datetime"
                     placeholder="请选择领用时间"
-                    :disabled="typeValue === 'check'"
+                    :disabled="typeValue === 'detail'"
                   />
                 </el-form-item>
                 <el-form-item label="申请说明">
-                  <el-input v-model="form.state" type="textarea" clearable :disabled="typeValue === 'check'" />
+                  <el-input v-model="form.state" type="textarea" clearable :disabled="typeValue === 'detail'" />
                 </el-form-item>
               </el-col>
             </el-row>
           </el-form>
         </div>
       </div>
-      <table-container title="设备领用列表">
-        <template #btns-right>
-          <el-button v-if="typeValue !== 'check'" type="primary" @click="multiAdd">
+      <detail-block title="设备领用列表">
+        <template #btns>
+          <el-button v-if="typeValue !== 'detail'" type="primary" @click="multiAdd">
             批量添加
           </el-button>
-          <el-button v-if="typeValue !== 'check'" type="primary" @click="addRow">
+          <el-button v-if="typeValue !== 'detail'" type="primary" @click="addRow">
             增加行
           </el-button>
-          <el-button v-if="typeValue !== 'check'" type="primary" @click="delRow">
+          <el-button v-if="typeValue !== 'detail'" type="info" @click="delRow">
             删除行
           </el-button>
         </template>
         <normal-table
           :data="list" :total="total" :columns="columns" :query="listQuery"
-          :is-showmulti-select="typeValue === 'check' ? false : true" @change="changePage" @multiSelect="handleSelectionChange"
+          :is-showmulti-select="typeValue === 'detail' ? false : true" @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #preColumns>
-            <el-table-column label="#" width="55" align="center">
+            <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 v-if="typeValue !== 'check'" label="操作" align="center" width="60" fixed="right">
+            <el-table-column v-if="typeValue !== 'detail'" label="操作" align="center" width="60" fixed="right">
               <template #default="scope">
                 <el-button
                   size="small"
@@ -330,36 +313,30 @@
             </el-table-column>
           </template>
         </normal-table>
-      </table-container>
+      </detail-block>
 
-      <table-container title="审批流程">
-      <!-- <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          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="120">
-              <template #default="{ row }">
-                <el-button
-                  size="small"
-                  type="primary"
-                  link
-                  @click="handleSelect(row.$index, row)"
-                >
-                  选择
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table> -->
-      </table-container>
+      <detail-block title="审批流程">
+        <el-timeline>
+          <el-timeline-item timestamp="2018/4/12" placement="top">
+            <el-card>
+              <h4>Update Github template</h4>
+              <p>Tom committed 2018/4/12 20:46</p>
+            </el-card>
+          </el-timeline-item>
+          <el-timeline-item timestamp="2018/4/3" placement="top">
+            <el-card>
+              <h4>Update Github template</h4>
+              <p>Tom committed 2018/4/3 20:46</p>
+            </el-card>
+          </el-timeline-item>
+          <el-timeline-item timestamp="2018/4/2" placement="top">
+            <el-card>
+              <h4>Update Github template</h4>
+              <p>Tom committed 2018/4/2 20:46</p>
+            </el-card>
+          </el-timeline-item>
+        </el-timeline>
+      </detail-block>
     </div>
     <select-device-dialog
       :dialog-select-divice-visible="dialogSelectDiviceVisible"
diff --git a/src/views/device/receive/selectDeviceDialog.vue b/src/views/device/receive/selectDeviceDialog.vue
index d6f28f3..4a9793d 100644
--- a/src/views/device/receive/selectDeviceDialog.vue
+++ b/src/views/device/receive/selectDeviceDialog.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="ReceiveDialog">
 import { ref } from 'vue'
 import useUserStore from '@/store/modules/user'
+import { listPageApi } from '@/api/device/standingBook'
 const props = defineProps({
   dialogSelectDiviceVisible: {
     type: Boolean,
@@ -10,36 +11,20 @@
   isMulti: Boolean,
 })
 const emits = defineEmits(['closeDialog', 'updateDeviceConfirm'])
+const loadingTable = ref<boolean>(false)
 const userStore = useUserStore()
 // 查询条件
 const listQuery = ref({
-  deviceName: '', // 设备名称
-  deviceNumber: '', // 设备编号
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const total = ref(20)
 // 多选选中的内容
 const checkoutList = ref([])
 
-const list = ref([{
-  name: '设备01',
-  number: '设备01',
-  version: '设备01',
-  millNumber: '设备01',
-  status: '设备01',
-  person: '设备01',
-  date: '设备01',
-},
-{
-  name: '设备02',
-  number: '设备02',
-  version: '设备02',
-  millNumber: '设备02',
-  status: '设备02',
-  person: '设备02',
-  date: '设备02',
-}])// 表格数据
+const list = ref([])// 表格数据
 const columns = [
   {
     text: '设备名称',
@@ -72,8 +57,36 @@
 ]
 const table = ref()
 const dialogTableVisible = ref(false)// 控制对话框显隐
+
+// 获取数据列表
+const fetchData = () => {
+  loadingTable.value = true
+  listPageApi(listQuery.value as any).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map((item: any) => {
+        return {
+          ...item,
+          name: item.equipmentName,
+          number: item.equipmentNo,
+          version: item.modelNo,
+          millNumber: item.manufacturingNo,
+          status: item.managerStateName,
+          person: item.usePersonName,
+          date: item.validDate,
+          scope: item.mesureRange,
+          dep: item.useDeptName,
+        }
+      })
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
 watch(() => props.dialogSelectDiviceVisible, (newValue) => {
   dialogTableVisible.value = newValue
+  fetchData()
   if (!newValue) {
     table.value.clearMulti() // 清除多选选中
   }
@@ -92,12 +105,13 @@
 }
 // 重置
 const clearList = () => {
-  listQuery.value.deviceName = ''
-  listQuery.value.deviceNumber = ''
+  listQuery.value.equipmentName = ''
+  listQuery.value.equipmentNo = ''
+  fetchData()
 }
 // 搜索
 const searchList = () => {
-
+  fetchData()
 }
 // 多选选中
 const handleSelectionChange = (val: any) => {
@@ -112,26 +126,26 @@
   if (val && val.page) {
     listQuery.value.offset = val.page
   }
-  // fetchData(true)
+  fetchData()
 }
 </script>
 
 <template>
-  <el-dialog v-model="dialogTableVisible" title="选择设备" class="select-device-dialog" @close="close">
+  <el-dialog v-model="dialogTableVisible" width="60%" title="选择设备" class="select-device-dialog" @close="close">
     <search-area
       :need-clear="true"
       @search="searchList" @clear="clearList"
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.deviceName"
+          v-model.trim="listQuery.equipmentName"
           placeholder="设备名称"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.deviceNumber"
+          v-model.trim="listQuery.equipmentNo"
           placeholder="设备编号"
           clearable
         />
@@ -146,6 +160,7 @@
         :query="listQuery"
         :is-multi="isMulti"
         is-showmulti-select
+        :list-loading="loadingTable"
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
diff --git a/src/views/device/receive/solveComponent/detail.vue b/src/views/device/receive/solveComponent/detail.vue
index aa6cb58..42f7a61 100644
--- a/src/views/device/receive/solveComponent/detail.vue
+++ b/src/views/device/receive/solveComponent/detail.vue
@@ -1,13 +1,17 @@
 <script lang="ts" setup name="Detail">
-import { ref } from 'vue'
+import { onMounted, ref } from 'vue'
+import { useRoute, useRouter } from 'vue-router'
 import type { Ref } from 'vue'
 import type { IdeviceListQuery, Iform } from '../receive'
-
 const props = defineProps({
   typeValue: String,
 })
+
+const $route = useRoute()
+
 const { proxy } = getCurrentInstance() as any
 const total = ref(20)// 总数
+const deviceName = ref()
 
 // 表单数据
 const form = ref({
@@ -125,11 +129,15 @@
   standard: '',
   extarCss: '',
 })
+
+onMounted(() => {
+  deviceName.value = $route.query.deviceName
+})
 </script>
 
 <template>
   <app-container>
-    <detail-page title="设备领用处理-查看">
+    <detail-page :title="deviceName ? `${deviceName}-详情` : '设备领用处理-详情'">
       <template #btns>
         <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
           打印
@@ -175,49 +183,43 @@
           </div>
         </detail-block>
       </div>
-      <table-container title="设备领用列表">
+      <detail-block title="设备领用列表">
         <normal-table
           :data="list" :total="total" :columns="columns" :query="listQuery"
           @change="changePage"
         >
           <template #preColumns>
-            <el-table-column label="#" width="55" align="center">
+            <el-table-column label="序号" width="55" align="center">
               <template #default="scope">
                 {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
               </template>
             </el-table-column>
           </template>
         </normal-table>
-      </table-container>
+      </detail-block>
 
-      <table-container title="审批流程">
-        <!-- <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          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="120">
-              <template #default="{ row }">
-                <el-button
-                  size="small"
-                  type="primary"
-                  link
-                  @click="handleSelect(row.$index, row)"
-                >
-                  选择
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table> -->
-      </table-container>
+      <detail-block title="审批流程">
+        <el-timeline>
+          <el-timeline-item timestamp="2018/4/12" placement="top">
+            <el-card>
+              <h4>Update Github template</h4>
+              <p>Tom committed 2018/4/12 20:46</p>
+            </el-card>
+          </el-timeline-item>
+          <el-timeline-item timestamp="2018/4/3" placement="top">
+            <el-card>
+              <h4>Update Github template</h4>
+              <p>Tom committed 2018/4/3 20:46</p>
+            </el-card>
+          </el-timeline-item>
+          <el-timeline-item timestamp="2018/4/2" placement="top">
+            <el-card>
+              <h4>Update Github template</h4>
+              <p>Tom committed 2018/4/2 20:46</p>
+            </el-card>
+          </el-timeline-item>
+        </el-timeline>
+      </detail-block>
     </div>
   </app-container>
 </template>
diff --git a/src/views/device/receive/solveList.vue b/src/views/device/receive/solveList.vue
index 5d859bf..4fe40e3 100644
--- a/src/views/device/receive/solveList.vue
+++ b/src/views/device/receive/solveList.vue
@@ -218,7 +218,7 @@
       })
   }
   else if (val === '查看') {
-    $router.push('/receive/solveCheck')
+    $router.push({ path: '/receive/solveDetail', query: { deviceName: row.name } })
   }
 }
 // 右上角按钮切换
@@ -293,7 +293,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
       >
         <template #preColumns>
-          <el-table-column label="#" width="55" align="center">
+          <el-table-column label="序号" width="55" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>

diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 23ac34d..31f65c9 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -325,7 +325,7 @@
         },
       },
       {
-        path: 'solveCheck',
+        path: 'solveDetail',
         name: 'SolveListDetail',
         component: () => import('@/views/device/receive/solveComponent/detail.vue'),
         meta: {
diff --git a/src/views/device/receive/applyList.vue b/src/views/device/receive/applyList.vue
index a119e48..4674763 100644
--- a/src/views/device/receive/applyList.vue
+++ b/src/views/device/receive/applyList.vue
@@ -225,7 +225,7 @@
     approveOpinion.value = '0'
   }
   else if (val === '查看') {
-    $router.push({ path: '/receive/check', query: { typeValue: 'check' } })
+    $router.push({ path: '/receive/detail', query: { typeValue: 'detail', deviceName: row.name } })
   }
 }
 // 按钮切换
@@ -315,7 +315,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
       >
         <template #preColumns>
-          <el-table-column label="#" width="55" align="center">
+          <el-table-column label="序号" width="55" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/device/receive/createOrCheck.vue b/src/views/device/receive/createOrCheck.vue
index 660cd22..3151335 100644
--- a/src/views/device/receive/createOrCheck.vue
+++ b/src/views/device/receive/createOrCheck.vue
@@ -9,6 +9,7 @@
 import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
 const $route = useRoute()
 const typeValue = ref()
+const deviceName = ref()
 const isMulti = ref(false) // 是否批量添加(允许多选)
 const selectIndex = ref()
 const { proxy } = getCurrentInstance() as any
@@ -20,7 +21,6 @@
   edit: '编辑',
   add: '新建',
   detail: '详情',
-  check: '查看',
 }// 字典
 const haveApproveLimits = ref(true)// 是否有审批权限
 const isStart = ref(false)// 是否是发起人
@@ -34,25 +34,7 @@
   state: '', // 申请说明
 })
 const ruleFormRef = ref<FormInstance>() as any
-const list = ref([{
-  name: '测试1', // 仪器名称
-  number: '测试1', // 设备编号
-  version: '测试1', // 型号
-  scope: '测试1', // 测量范围
-  dep: '测试1', // 使用部门
-  person: '测试1', // 使用人
-  status: '测试1', // 管理状态
-  date: '测试1', // 有效日期
-}, {
-  name: '测试2', // 仪器名称
-  number: '测试2', // 设备编号
-  version: '测试2', // 型号
-  scope: '测试2', // 测量范围
-  dep: '测试2', // 使用部门
-  person: '测试2', // 使用人
-  status: '测试2', // 管理状态
-  date: '测试2', // 有效日期
-}])// 表格数据
+const list = ref([])// 表格数据
 // 查询条件
 const listQuery: Ref<IdeviceListQuery> = ref({
   name: '', // 仪器名称
@@ -230,12 +212,13 @@
 
 onMounted(() => {
   typeValue.value = $route.query.typeValue
+  deviceName.value = $route.query.deviceName
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page :title="`设备领用申请-${textMap[typeValue]}`">
+    <detail-page :title="typeValue === 'detail' && deviceName ? `${deviceName}-详情` : `设备领用申请-${textMap[typeValue]}`">
       <template #btns>
         <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('1')">
           同意
@@ -269,10 +252,10 @@
             <el-row :gutter="20">
               <el-col :span="12">
                 <el-form-item label="申请单位" prop="company">
-                  <el-input v-model="form.company" clearable :disabled="typeValue === 'check'" />
+                  <el-input v-model="form.company" clearable :disabled="typeValue === 'detail'" />
                 </el-form-item>
                 <el-form-item label="申请人" prop="person">
-                  <el-input v-model="form.person" clearable :disabled="typeValue === 'check'" />
+                  <el-input v-model="form.person" clearable :disabled="typeValue === 'detail'" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
@@ -281,42 +264,42 @@
                     v-model="form.time"
                     type="datetime"
                     placeholder="请选择领用时间"
-                    :disabled="typeValue === 'check'"
+                    :disabled="typeValue === 'detail'"
                   />
                 </el-form-item>
                 <el-form-item label="申请说明">
-                  <el-input v-model="form.state" type="textarea" clearable :disabled="typeValue === 'check'" />
+                  <el-input v-model="form.state" type="textarea" clearable :disabled="typeValue === 'detail'" />
                 </el-form-item>
               </el-col>
             </el-row>
           </el-form>
         </div>
       </div>
-      <table-container title="设备领用列表">
-        <template #btns-right>
-          <el-button v-if="typeValue !== 'check'" type="primary" @click="multiAdd">
+      <detail-block title="设备领用列表">
+        <template #btns>
+          <el-button v-if="typeValue !== 'detail'" type="primary" @click="multiAdd">
             批量添加
           </el-button>
-          <el-button v-if="typeValue !== 'check'" type="primary" @click="addRow">
+          <el-button v-if="typeValue !== 'detail'" type="primary" @click="addRow">
             增加行
           </el-button>
-          <el-button v-if="typeValue !== 'check'" type="primary" @click="delRow">
+          <el-button v-if="typeValue !== 'detail'" type="info" @click="delRow">
             删除行
           </el-button>
         </template>
         <normal-table
           :data="list" :total="total" :columns="columns" :query="listQuery"
-          :is-showmulti-select="typeValue === 'check' ? false : true" @change="changePage" @multiSelect="handleSelectionChange"
+          :is-showmulti-select="typeValue === 'detail' ? false : true" @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #preColumns>
-            <el-table-column label="#" width="55" align="center">
+            <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 v-if="typeValue !== 'check'" label="操作" align="center" width="60" fixed="right">
+            <el-table-column v-if="typeValue !== 'detail'" label="操作" align="center" width="60" fixed="right">
               <template #default="scope">
                 <el-button
                   size="small"
@@ -330,36 +313,30 @@
             </el-table-column>
           </template>
         </normal-table>
-      </table-container>
+      </detail-block>
 
-      <table-container title="审批流程">
-      <!-- <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          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="120">
-              <template #default="{ row }">
-                <el-button
-                  size="small"
-                  type="primary"
-                  link
-                  @click="handleSelect(row.$index, row)"
-                >
-                  选择
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table> -->
-      </table-container>
+      <detail-block title="审批流程">
+        <el-timeline>
+          <el-timeline-item timestamp="2018/4/12" placement="top">
+            <el-card>
+              <h4>Update Github template</h4>
+              <p>Tom committed 2018/4/12 20:46</p>
+            </el-card>
+          </el-timeline-item>
+          <el-timeline-item timestamp="2018/4/3" placement="top">
+            <el-card>
+              <h4>Update Github template</h4>
+              <p>Tom committed 2018/4/3 20:46</p>
+            </el-card>
+          </el-timeline-item>
+          <el-timeline-item timestamp="2018/4/2" placement="top">
+            <el-card>
+              <h4>Update Github template</h4>
+              <p>Tom committed 2018/4/2 20:46</p>
+            </el-card>
+          </el-timeline-item>
+        </el-timeline>
+      </detail-block>
     </div>
     <select-device-dialog
       :dialog-select-divice-visible="dialogSelectDiviceVisible"
diff --git a/src/views/device/receive/selectDeviceDialog.vue b/src/views/device/receive/selectDeviceDialog.vue
index d6f28f3..4a9793d 100644
--- a/src/views/device/receive/selectDeviceDialog.vue
+++ b/src/views/device/receive/selectDeviceDialog.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="ReceiveDialog">
 import { ref } from 'vue'
 import useUserStore from '@/store/modules/user'
+import { listPageApi } from '@/api/device/standingBook'
 const props = defineProps({
   dialogSelectDiviceVisible: {
     type: Boolean,
@@ -10,36 +11,20 @@
   isMulti: Boolean,
 })
 const emits = defineEmits(['closeDialog', 'updateDeviceConfirm'])
+const loadingTable = ref<boolean>(false)
 const userStore = useUserStore()
 // 查询条件
 const listQuery = ref({
-  deviceName: '', // 设备名称
-  deviceNumber: '', // 设备编号
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const total = ref(20)
 // 多选选中的内容
 const checkoutList = ref([])
 
-const list = ref([{
-  name: '设备01',
-  number: '设备01',
-  version: '设备01',
-  millNumber: '设备01',
-  status: '设备01',
-  person: '设备01',
-  date: '设备01',
-},
-{
-  name: '设备02',
-  number: '设备02',
-  version: '设备02',
-  millNumber: '设备02',
-  status: '设备02',
-  person: '设备02',
-  date: '设备02',
-}])// 表格数据
+const list = ref([])// 表格数据
 const columns = [
   {
     text: '设备名称',
@@ -72,8 +57,36 @@
 ]
 const table = ref()
 const dialogTableVisible = ref(false)// 控制对话框显隐
+
+// 获取数据列表
+const fetchData = () => {
+  loadingTable.value = true
+  listPageApi(listQuery.value as any).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map((item: any) => {
+        return {
+          ...item,
+          name: item.equipmentName,
+          number: item.equipmentNo,
+          version: item.modelNo,
+          millNumber: item.manufacturingNo,
+          status: item.managerStateName,
+          person: item.usePersonName,
+          date: item.validDate,
+          scope: item.mesureRange,
+          dep: item.useDeptName,
+        }
+      })
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
 watch(() => props.dialogSelectDiviceVisible, (newValue) => {
   dialogTableVisible.value = newValue
+  fetchData()
   if (!newValue) {
     table.value.clearMulti() // 清除多选选中
   }
@@ -92,12 +105,13 @@
 }
 // 重置
 const clearList = () => {
-  listQuery.value.deviceName = ''
-  listQuery.value.deviceNumber = ''
+  listQuery.value.equipmentName = ''
+  listQuery.value.equipmentNo = ''
+  fetchData()
 }
 // 搜索
 const searchList = () => {
-
+  fetchData()
 }
 // 多选选中
 const handleSelectionChange = (val: any) => {
@@ -112,26 +126,26 @@
   if (val && val.page) {
     listQuery.value.offset = val.page
   }
-  // fetchData(true)
+  fetchData()
 }
 </script>
 
 <template>
-  <el-dialog v-model="dialogTableVisible" title="选择设备" class="select-device-dialog" @close="close">
+  <el-dialog v-model="dialogTableVisible" width="60%" title="选择设备" class="select-device-dialog" @close="close">
     <search-area
       :need-clear="true"
       @search="searchList" @clear="clearList"
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.deviceName"
+          v-model.trim="listQuery.equipmentName"
           placeholder="设备名称"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.deviceNumber"
+          v-model.trim="listQuery.equipmentNo"
           placeholder="设备编号"
           clearable
         />
@@ -146,6 +160,7 @@
         :query="listQuery"
         :is-multi="isMulti"
         is-showmulti-select
+        :list-loading="loadingTable"
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
diff --git a/src/views/device/receive/solveComponent/detail.vue b/src/views/device/receive/solveComponent/detail.vue
index aa6cb58..42f7a61 100644
--- a/src/views/device/receive/solveComponent/detail.vue
+++ b/src/views/device/receive/solveComponent/detail.vue
@@ -1,13 +1,17 @@
 <script lang="ts" setup name="Detail">
-import { ref } from 'vue'
+import { onMounted, ref } from 'vue'
+import { useRoute, useRouter } from 'vue-router'
 import type { Ref } from 'vue'
 import type { IdeviceListQuery, Iform } from '../receive'
-
 const props = defineProps({
   typeValue: String,
 })
+
+const $route = useRoute()
+
 const { proxy } = getCurrentInstance() as any
 const total = ref(20)// 总数
+const deviceName = ref()
 
 // 表单数据
 const form = ref({
@@ -125,11 +129,15 @@
   standard: '',
   extarCss: '',
 })
+
+onMounted(() => {
+  deviceName.value = $route.query.deviceName
+})
 </script>
 
 <template>
   <app-container>
-    <detail-page title="设备领用处理-查看">
+    <detail-page :title="deviceName ? `${deviceName}-详情` : '设备领用处理-详情'">
       <template #btns>
         <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
           打印
@@ -175,49 +183,43 @@
           </div>
         </detail-block>
       </div>
-      <table-container title="设备领用列表">
+      <detail-block title="设备领用列表">
         <normal-table
           :data="list" :total="total" :columns="columns" :query="listQuery"
           @change="changePage"
         >
           <template #preColumns>
-            <el-table-column label="#" width="55" align="center">
+            <el-table-column label="序号" width="55" align="center">
               <template #default="scope">
                 {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
               </template>
             </el-table-column>
           </template>
         </normal-table>
-      </table-container>
+      </detail-block>
 
-      <table-container title="审批流程">
-        <!-- <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          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="120">
-              <template #default="{ row }">
-                <el-button
-                  size="small"
-                  type="primary"
-                  link
-                  @click="handleSelect(row.$index, row)"
-                >
-                  选择
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table> -->
-      </table-container>
+      <detail-block title="审批流程">
+        <el-timeline>
+          <el-timeline-item timestamp="2018/4/12" placement="top">
+            <el-card>
+              <h4>Update Github template</h4>
+              <p>Tom committed 2018/4/12 20:46</p>
+            </el-card>
+          </el-timeline-item>
+          <el-timeline-item timestamp="2018/4/3" placement="top">
+            <el-card>
+              <h4>Update Github template</h4>
+              <p>Tom committed 2018/4/3 20:46</p>
+            </el-card>
+          </el-timeline-item>
+          <el-timeline-item timestamp="2018/4/2" placement="top">
+            <el-card>
+              <h4>Update Github template</h4>
+              <p>Tom committed 2018/4/2 20:46</p>
+            </el-card>
+          </el-timeline-item>
+        </el-timeline>
+      </detail-block>
     </div>
   </app-container>
 </template>
diff --git a/src/views/device/receive/solveList.vue b/src/views/device/receive/solveList.vue
index 5d859bf..4fe40e3 100644
--- a/src/views/device/receive/solveList.vue
+++ b/src/views/device/receive/solveList.vue
@@ -218,7 +218,7 @@
       })
   }
   else if (val === '查看') {
-    $router.push('/receive/solveCheck')
+    $router.push({ path: '/receive/solveDetail', query: { deviceName: row.name } })
   }
 }
 // 右上角按钮切换
@@ -293,7 +293,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
       >
         <template #preColumns>
-          <el-table-column label="#" width="55" align="center">
+          <el-table-column label="序号" width="55" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/system/process/process.vue b/src/views/system/process/process.vue
index 960a6e1..187cd52 100644
--- a/src/views/system/process/process.vue
+++ b/src/views/system/process/process.vue
@@ -280,7 +280,7 @@
               @change="changePage"
             >
               <template #preColumns>
-                <el-table-column label="#" width="55" align="center">
+                <el-table-column label="序号" width="55" align="center">
                   <template #default="scope">
                     {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                   </template>