diff --git a/src/views/device/receive/applyList.vue b/src/views/device/receive/applyList.vue
index 5ee8966..34256c6 100644
--- a/src/views/device/receive/applyList.vue
+++ b/src/views/device/receive/applyList.vue
@@ -314,15 +314,9 @@
 
     <table-container v-if="typeValue !== 'add' && typeValue !== 'check'">
       <template #btns-right>
-        <el-button v-if="proxy.hasPerm('/measure/measureSource/add')" type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button v-if="proxy.hasPerm('/measure/measureSource/export')" type="primary" @click="exportAll">
-          导出
-        </el-button>
-        <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
-          打印
-        </el-button>
+        <icon-button v-if="proxy.hasPerm('/measure/price/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/measure/price/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/measure/price/print')" v-print="printObj" icon="icon-print" title="打印" type="primary" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"

diff --git a/src/views/device/receive/applyList.vue b/src/views/device/receive/applyList.vue
index 5ee8966..34256c6 100644
--- a/src/views/device/receive/applyList.vue
+++ b/src/views/device/receive/applyList.vue
@@ -314,15 +314,9 @@
 
     <table-container v-if="typeValue !== 'add' && typeValue !== 'check'">
       <template #btns-right>
-        <el-button v-if="proxy.hasPerm('/measure/measureSource/add')" type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button v-if="proxy.hasPerm('/measure/measureSource/export')" type="primary" @click="exportAll">
-          导出
-        </el-button>
-        <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
-          打印
-        </el-button>
+        <icon-button v-if="proxy.hasPerm('/measure/price/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/measure/price/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/measure/price/print')" v-print="printObj" icon="icon-print" title="打印" type="primary" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
diff --git a/src/views/device/receive/createOrCheck.vue b/src/views/device/receive/createOrCheck.vue
index a40cae5..d2667cd 100644
--- a/src/views/device/receive/createOrCheck.vue
+++ b/src/views/device/receive/createOrCheck.vue
@@ -211,7 +211,7 @@
 const close = () => {
   emits('close')
 }
-// 选择涉笔对话框关闭
+// 选择设备对话框关闭
 const closeDialog = () => {
   dialogSelectDiviceVisible.value = false
   isShowDialog.value = false
@@ -386,6 +386,7 @@
     padding-right: 10px;
     border-radius: 10px;
     background-color: #fff;
+    // padding: 10px;
 
     .title-button {
       display: flex;

diff --git a/src/views/device/receive/applyList.vue b/src/views/device/receive/applyList.vue
index 5ee8966..34256c6 100644
--- a/src/views/device/receive/applyList.vue
+++ b/src/views/device/receive/applyList.vue
@@ -314,15 +314,9 @@
 
     <table-container v-if="typeValue !== 'add' && typeValue !== 'check'">
       <template #btns-right>
-        <el-button v-if="proxy.hasPerm('/measure/measureSource/add')" type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button v-if="proxy.hasPerm('/measure/measureSource/export')" type="primary" @click="exportAll">
-          导出
-        </el-button>
-        <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
-          打印
-        </el-button>
+        <icon-button v-if="proxy.hasPerm('/measure/price/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/measure/price/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/measure/price/print')" v-print="printObj" icon="icon-print" title="打印" type="primary" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
diff --git a/src/views/device/receive/createOrCheck.vue b/src/views/device/receive/createOrCheck.vue
index a40cae5..d2667cd 100644
--- a/src/views/device/receive/createOrCheck.vue
+++ b/src/views/device/receive/createOrCheck.vue
@@ -211,7 +211,7 @@
 const close = () => {
   emits('close')
 }
-// 选择涉笔对话框关闭
+// 选择设备对话框关闭
 const closeDialog = () => {
   dialogSelectDiviceVisible.value = false
   isShowDialog.value = false
@@ -386,6 +386,7 @@
     padding-right: 10px;
     border-radius: 10px;
     background-color: #fff;
+    // padding: 10px;
 
     .title-button {
       display: flex;
diff --git a/src/views/device/receive/selectDeviceDialog.vue b/src/views/device/receive/selectDeviceDialog.vue
index 68d4381..d6f28f3 100644
--- a/src/views/device/receive/selectDeviceDialog.vue
+++ b/src/views/device/receive/selectDeviceDialog.vue
@@ -1,137 +1,108 @@
-<script lang="ts" setup name="SolveList">
+<!-- 选择设备 -->
+<script lang="ts" setup name="ReceiveDialog">
 import { ref } from 'vue'
-import type { Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQuery, IsolveListType } from '@/views/device/receive/receive'
-import { exportExcel } from '@/utils/exportXlsx'
-import ButtonBox from '@/views/device/receive/solveComponent/buttonBox.vue'
-import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
-import detail from '@/views/device/receive/solveComponent/detail.vue'
-
-const loadingTable = ref(false) // 表格loading
-const active = ref('unused') // 选中的按钮
-const type = {
-  check: '查看',
-  normal: '正常',
-}
-const typeValue = ref('normal')
+import useUserStore from '@/store/modules/user'
+const props = defineProps({
+  dialogSelectDiviceVisible: {
+    type: Boolean,
+    default: false,
+  },
+  isMulti: Boolean,
+})
+const emits = defineEmits(['closeDialog', 'updateDeviceConfirm'])
+const userStore = useUserStore()
 // 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  number: '', // 编号
-  name: '', // 名称
-  dep: '', // 部门
-  person: '', // 人
-  date: '', // 日期
+const listQuery = ref({
+  deviceName: '', // 设备名称
+  deviceNumber: '', // 设备编号
   offset: 1,
   limit: 10,
 })
-// 表格数据
-const list = ref([
-  {
-    number: 'string', // 编号
-    name: 'string', // 名称
-    dep: 'string', // 文件号
-    person: 'string', // 类别
-    date: 'string', // 创建人
-    status: '审批中', // 审批状态
-  },
-  {
-    number: 'string', // 编号
-    name: 'string', // 名称
-    dep: 'string', // 文件号
-    person: 'string', // 类别
-    date: 'string', // 创建人
-    status: '审批中', // 审批状态
-  },
-  {
-    number: 'string', // 编号
-    name: 'string', // 名称
-    dep: 'string', // 文件号
-    person: 'string', // 类别
-    date: 'string', // 创建人
-    status: '审批中', // 审批状态
-  },
-])
-const { proxy } = getCurrentInstance() as any
-// 总数
 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 columns = [
   {
-    text: '申请编号',
-    value: 'number',
-    // width: '120',
-  },
-  {
-    text: '申请名称',
+    text: '设备名称',
     value: 'name',
-    // width: '160',
   },
   {
-    text: '申请部门',
-    value: 'dep',
+    text: '设备编号',
+    value: 'number',
   },
   {
-    text: '申请人',
+    text: '型号',
+    value: 'version',
+  },
+  {
+    text: '出厂编号',
+    value: 'millNumber',
+  },
+  {
+    text: '管理状态',
+    value: 'status',
+  },
+  {
+    text: '使用人',
     value: 'person',
   },
   {
-    text: '申请时间',
+    text: '有效日期',
     value: 'date',
   },
-  {
-    text: '审批状态',
-    value: 'status',
-  },
 ]
-// 选中的内容
-const checkoutList = ref([])
+const table = ref()
+const dialogTableVisible = ref(false)// 控制对话框显隐
+watch(() => props.dialogSelectDiviceVisible, (newValue) => {
+  dialogTableVisible.value = newValue
+  if (!newValue) {
+    table.value.clearMulti() // 清除多选选中
+  }
+})
+// 关闭对话框
+const close = () => {
+  console.log('close-dialog')
+  emits('closeDialog')
+}
+// 确认
+const confirm = () => {
+  console.log('确认')
+  emits('updateDeviceConfirm', checkoutList.value)
+  // 调接口
+  close()
+}
 // 重置
 const clearList = () => {
-  listQuery.value.number = ''
-  listQuery.value.name = ''
-  listQuery.value.dep = ''
-  listQuery.value.person = ''
-  listQuery.value.date = ''
+  listQuery.value.deviceName = ''
+  listQuery.value.deviceNumber = ''
 }
 // 搜索
 const searchList = () => {
 
 }
-// 多选发生改变时
-const handleSelectionChange = (e: any) => {
-  checkoutList.value = e
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (checkoutList.value.length <= 0) {
-    exportExcel({
-      json: list.value.map((item: IsolveListType, index: number) => ({ index: index + 1, number: item.number, name: item.name, dep: item.dep, person: item.person, date: item.date, status: item.status })),
-      name: '设备领用处理',
-      titleArr: ['序号', '申请编号', '申请名称', '申请部门', '申请人', '申请时间', '审批状态'],
-      sheetName: 'sheet1',
-    })
-  }
-  else {
-    exportExcel({
-      json: checkoutList.value.map((item: IsolveListType, index: number) => ({ index: index + 1, number: item.number, name: item.name, dep: item.dep, person: item.person, date: item.date, status: item.status })),
-      name: '设备领用处理',
-      titleArr: ['序号', '申请编号', '申请名称', '申请部门', '申请人', '申请时间', '审批状态'],
-      sheetName: 'sheet1',
-    })
-  }
-  loading.close()
-}
-const exportAll = () => {
-  exportExcelBtn()
-}
-const close = () => {
-  typeValue.value = 'normal'
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  console.log('多选', val)
+  checkoutList.value = val
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -143,164 +114,40 @@
   }
   // fetchData(true)
 }
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '设备领用处理', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-// 操作
-const handleEdit = (index: number, row: IsolveListType, val: string) => {
-  if (val === '领用') {
-    ElMessageBox.confirm(
-      '确认领用吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        // 调领用接口
-        ElMessage({
-          type: 'success',
-          message: '领用成功',
-        })
-      })
-  }
-  else if (val === '删除') {
-    ElMessageBox.confirm(
-      '确认删除吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        // 调删除接口
-        ElMessage({
-          type: 'success',
-          message: '删除成功',
-        })
-      })
-  }
-  else if (val === '退领') {
-    ElMessageBox.confirm(
-      '确认退领吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        // 调退领接口
-        ElMessage({
-          type: 'success',
-          message: '退领成功',
-        })
-      })
-  }
-  else if (val === '查看') {
-    typeValue.value = 'check'
-  }
-}
-// 右上角按钮切换
-const changeCurrentButton = (val: string) => {
-  clearList()
-  console.log('button 切换', val)
-  active.value = val
-  if (val === 'unused') { // 未领用
-
-  }
-  else if (val === 'used') { // 已领用
-
-  }
-}
-// 标签识别
-const execTag = () => {
-
-}
 </script>
 
 <template>
-  <app-container>
+  <el-dialog v-model="dialogTableVisible" title="选择设备" class="select-device-dialog" @close="close">
     <search-area
-      v-if="typeValue !== 'check'"
       :need-clear="true"
       @search="searchList" @clear="clearList"
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.number"
-          placeholder="申请编号"
+          v-model.trim="listQuery.deviceName"
+          placeholder="设备名称"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.name"
-          placeholder="申请名称"
+          v-model.trim="listQuery.deviceNumber"
+          placeholder="设备编号"
           clearable
         />
       </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.dep"
-          placeholder="申请部门"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.person"
-          placeholder="申请人"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="listQuery.date"
-          type="date"
-          placeholder="申请日期"
-        />
-      </search-item>
     </search-area>
-
-    <table-container v-if="typeValue !== 'check'">
-      <template #btns-right>
-        <el-button v-if="proxy.hasPerm('/measure/measureSource/add')" type="primary" @click="execTag">
-          标签识别
-        </el-button>
-        <el-button v-if="proxy.hasPerm('/measure/measureSource/export')" type="primary" @click="exportAll">
-          导出
-        </el-button>
-        <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
-          打印
-        </el-button>
-      </template>
+    <table-container>
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        ref="table"
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :is-multi="isMulti"
+        is-showmulti-select
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
       >
         <template #preColumns>
           <el-table-column label="#" width="55" align="center">
@@ -309,60 +156,32 @@
             </template>
           </el-table-column>
         </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="180">
-            <template #default="{ row }">
-              <el-button
-                size="small"
-                type="primary"
-                link
-                @click="handleEdit(row.$index, row, '查看')"
-              >
-                查看
-              </el-button>
-              <el-button
-                v-if="active === 'unused'"
-                size="small"
-                link
-                type="primary"
-                @click="handleEdit(row.$index, row, '领用')"
-              >
-                领用
-              </el-button>
-              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-              <el-button
-                v-if="active === 'unused'"
-                size="small"
-                link
-                type="danger"
-                @click="handleEdit(row.$index, row, '删除')"
-              >
-                删除
-              </el-button>
-              <el-button
-                v-if="active === 'used'"
-                size="small"
-                link
-                type="primary"
-                @click="handleEdit(row.$index, row, '退领')"
-              >
-                退领
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
       </normal-table>
     </table-container>
-    <button-box
-      v-if="typeValue !== 'check'"
-      :active="active"
-      @changeCurrentButton="changeCurrentButton"
-    />
-    <detail v-if="typeValue === 'check'" :type-value="typeValue" @close="close" />
-  </app-container>
+
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="close">取消</el-button>
+        <el-button type="primary" @click="confirm">
+          确定
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
 </template>
 
 <style lang="scss" scoped>
 // 样式
-</style>
+.receive-dialog {
+  .receive-dialog-item {
+    display: flex;
+    align-items: center;
+    margin-bottom: 28px;
 
+    .text {
+      margin-right: 30px;
+      white-space: nowrap;
+    }
+  }
+}
+</style>

diff --git a/src/views/device/receive/applyList.vue b/src/views/device/receive/applyList.vue
index 5ee8966..34256c6 100644
--- a/src/views/device/receive/applyList.vue
+++ b/src/views/device/receive/applyList.vue
@@ -314,15 +314,9 @@
 
     <table-container v-if="typeValue !== 'add' && typeValue !== 'check'">
       <template #btns-right>
-        <el-button v-if="proxy.hasPerm('/measure/measureSource/add')" type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button v-if="proxy.hasPerm('/measure/measureSource/export')" type="primary" @click="exportAll">
-          导出
-        </el-button>
-        <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
-          打印
-        </el-button>
+        <icon-button v-if="proxy.hasPerm('/measure/price/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/measure/price/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/measure/price/print')" v-print="printObj" icon="icon-print" title="打印" type="primary" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
diff --git a/src/views/device/receive/createOrCheck.vue b/src/views/device/receive/createOrCheck.vue
index a40cae5..d2667cd 100644
--- a/src/views/device/receive/createOrCheck.vue
+++ b/src/views/device/receive/createOrCheck.vue
@@ -211,7 +211,7 @@
 const close = () => {
   emits('close')
 }
-// 选择涉笔对话框关闭
+// 选择设备对话框关闭
 const closeDialog = () => {
   dialogSelectDiviceVisible.value = false
   isShowDialog.value = false
@@ -386,6 +386,7 @@
     padding-right: 10px;
     border-radius: 10px;
     background-color: #fff;
+    // padding: 10px;
 
     .title-button {
       display: flex;
diff --git a/src/views/device/receive/selectDeviceDialog.vue b/src/views/device/receive/selectDeviceDialog.vue
index 68d4381..d6f28f3 100644
--- a/src/views/device/receive/selectDeviceDialog.vue
+++ b/src/views/device/receive/selectDeviceDialog.vue
@@ -1,137 +1,108 @@
-<script lang="ts" setup name="SolveList">
+<!-- 选择设备 -->
+<script lang="ts" setup name="ReceiveDialog">
 import { ref } from 'vue'
-import type { Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQuery, IsolveListType } from '@/views/device/receive/receive'
-import { exportExcel } from '@/utils/exportXlsx'
-import ButtonBox from '@/views/device/receive/solveComponent/buttonBox.vue'
-import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
-import detail from '@/views/device/receive/solveComponent/detail.vue'
-
-const loadingTable = ref(false) // 表格loading
-const active = ref('unused') // 选中的按钮
-const type = {
-  check: '查看',
-  normal: '正常',
-}
-const typeValue = ref('normal')
+import useUserStore from '@/store/modules/user'
+const props = defineProps({
+  dialogSelectDiviceVisible: {
+    type: Boolean,
+    default: false,
+  },
+  isMulti: Boolean,
+})
+const emits = defineEmits(['closeDialog', 'updateDeviceConfirm'])
+const userStore = useUserStore()
 // 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  number: '', // 编号
-  name: '', // 名称
-  dep: '', // 部门
-  person: '', // 人
-  date: '', // 日期
+const listQuery = ref({
+  deviceName: '', // 设备名称
+  deviceNumber: '', // 设备编号
   offset: 1,
   limit: 10,
 })
-// 表格数据
-const list = ref([
-  {
-    number: 'string', // 编号
-    name: 'string', // 名称
-    dep: 'string', // 文件号
-    person: 'string', // 类别
-    date: 'string', // 创建人
-    status: '审批中', // 审批状态
-  },
-  {
-    number: 'string', // 编号
-    name: 'string', // 名称
-    dep: 'string', // 文件号
-    person: 'string', // 类别
-    date: 'string', // 创建人
-    status: '审批中', // 审批状态
-  },
-  {
-    number: 'string', // 编号
-    name: 'string', // 名称
-    dep: 'string', // 文件号
-    person: 'string', // 类别
-    date: 'string', // 创建人
-    status: '审批中', // 审批状态
-  },
-])
-const { proxy } = getCurrentInstance() as any
-// 总数
 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 columns = [
   {
-    text: '申请编号',
-    value: 'number',
-    // width: '120',
-  },
-  {
-    text: '申请名称',
+    text: '设备名称',
     value: 'name',
-    // width: '160',
   },
   {
-    text: '申请部门',
-    value: 'dep',
+    text: '设备编号',
+    value: 'number',
   },
   {
-    text: '申请人',
+    text: '型号',
+    value: 'version',
+  },
+  {
+    text: '出厂编号',
+    value: 'millNumber',
+  },
+  {
+    text: '管理状态',
+    value: 'status',
+  },
+  {
+    text: '使用人',
     value: 'person',
   },
   {
-    text: '申请时间',
+    text: '有效日期',
     value: 'date',
   },
-  {
-    text: '审批状态',
-    value: 'status',
-  },
 ]
-// 选中的内容
-const checkoutList = ref([])
+const table = ref()
+const dialogTableVisible = ref(false)// 控制对话框显隐
+watch(() => props.dialogSelectDiviceVisible, (newValue) => {
+  dialogTableVisible.value = newValue
+  if (!newValue) {
+    table.value.clearMulti() // 清除多选选中
+  }
+})
+// 关闭对话框
+const close = () => {
+  console.log('close-dialog')
+  emits('closeDialog')
+}
+// 确认
+const confirm = () => {
+  console.log('确认')
+  emits('updateDeviceConfirm', checkoutList.value)
+  // 调接口
+  close()
+}
 // 重置
 const clearList = () => {
-  listQuery.value.number = ''
-  listQuery.value.name = ''
-  listQuery.value.dep = ''
-  listQuery.value.person = ''
-  listQuery.value.date = ''
+  listQuery.value.deviceName = ''
+  listQuery.value.deviceNumber = ''
 }
 // 搜索
 const searchList = () => {
 
 }
-// 多选发生改变时
-const handleSelectionChange = (e: any) => {
-  checkoutList.value = e
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (checkoutList.value.length <= 0) {
-    exportExcel({
-      json: list.value.map((item: IsolveListType, index: number) => ({ index: index + 1, number: item.number, name: item.name, dep: item.dep, person: item.person, date: item.date, status: item.status })),
-      name: '设备领用处理',
-      titleArr: ['序号', '申请编号', '申请名称', '申请部门', '申请人', '申请时间', '审批状态'],
-      sheetName: 'sheet1',
-    })
-  }
-  else {
-    exportExcel({
-      json: checkoutList.value.map((item: IsolveListType, index: number) => ({ index: index + 1, number: item.number, name: item.name, dep: item.dep, person: item.person, date: item.date, status: item.status })),
-      name: '设备领用处理',
-      titleArr: ['序号', '申请编号', '申请名称', '申请部门', '申请人', '申请时间', '审批状态'],
-      sheetName: 'sheet1',
-    })
-  }
-  loading.close()
-}
-const exportAll = () => {
-  exportExcelBtn()
-}
-const close = () => {
-  typeValue.value = 'normal'
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  console.log('多选', val)
+  checkoutList.value = val
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -143,164 +114,40 @@
   }
   // fetchData(true)
 }
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '设备领用处理', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-// 操作
-const handleEdit = (index: number, row: IsolveListType, val: string) => {
-  if (val === '领用') {
-    ElMessageBox.confirm(
-      '确认领用吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        // 调领用接口
-        ElMessage({
-          type: 'success',
-          message: '领用成功',
-        })
-      })
-  }
-  else if (val === '删除') {
-    ElMessageBox.confirm(
-      '确认删除吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        // 调删除接口
-        ElMessage({
-          type: 'success',
-          message: '删除成功',
-        })
-      })
-  }
-  else if (val === '退领') {
-    ElMessageBox.confirm(
-      '确认退领吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        // 调退领接口
-        ElMessage({
-          type: 'success',
-          message: '退领成功',
-        })
-      })
-  }
-  else if (val === '查看') {
-    typeValue.value = 'check'
-  }
-}
-// 右上角按钮切换
-const changeCurrentButton = (val: string) => {
-  clearList()
-  console.log('button 切换', val)
-  active.value = val
-  if (val === 'unused') { // 未领用
-
-  }
-  else if (val === 'used') { // 已领用
-
-  }
-}
-// 标签识别
-const execTag = () => {
-
-}
 </script>
 
 <template>
-  <app-container>
+  <el-dialog v-model="dialogTableVisible" title="选择设备" class="select-device-dialog" @close="close">
     <search-area
-      v-if="typeValue !== 'check'"
       :need-clear="true"
       @search="searchList" @clear="clearList"
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.number"
-          placeholder="申请编号"
+          v-model.trim="listQuery.deviceName"
+          placeholder="设备名称"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.name"
-          placeholder="申请名称"
+          v-model.trim="listQuery.deviceNumber"
+          placeholder="设备编号"
           clearable
         />
       </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.dep"
-          placeholder="申请部门"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.person"
-          placeholder="申请人"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="listQuery.date"
-          type="date"
-          placeholder="申请日期"
-        />
-      </search-item>
     </search-area>
-
-    <table-container v-if="typeValue !== 'check'">
-      <template #btns-right>
-        <el-button v-if="proxy.hasPerm('/measure/measureSource/add')" type="primary" @click="execTag">
-          标签识别
-        </el-button>
-        <el-button v-if="proxy.hasPerm('/measure/measureSource/export')" type="primary" @click="exportAll">
-          导出
-        </el-button>
-        <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
-          打印
-        </el-button>
-      </template>
+    <table-container>
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        ref="table"
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :is-multi="isMulti"
+        is-showmulti-select
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
       >
         <template #preColumns>
           <el-table-column label="#" width="55" align="center">
@@ -309,60 +156,32 @@
             </template>
           </el-table-column>
         </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="180">
-            <template #default="{ row }">
-              <el-button
-                size="small"
-                type="primary"
-                link
-                @click="handleEdit(row.$index, row, '查看')"
-              >
-                查看
-              </el-button>
-              <el-button
-                v-if="active === 'unused'"
-                size="small"
-                link
-                type="primary"
-                @click="handleEdit(row.$index, row, '领用')"
-              >
-                领用
-              </el-button>
-              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-              <el-button
-                v-if="active === 'unused'"
-                size="small"
-                link
-                type="danger"
-                @click="handleEdit(row.$index, row, '删除')"
-              >
-                删除
-              </el-button>
-              <el-button
-                v-if="active === 'used'"
-                size="small"
-                link
-                type="primary"
-                @click="handleEdit(row.$index, row, '退领')"
-              >
-                退领
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
       </normal-table>
     </table-container>
-    <button-box
-      v-if="typeValue !== 'check'"
-      :active="active"
-      @changeCurrentButton="changeCurrentButton"
-    />
-    <detail v-if="typeValue === 'check'" :type-value="typeValue" @close="close" />
-  </app-container>
+
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="close">取消</el-button>
+        <el-button type="primary" @click="confirm">
+          确定
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
 </template>
 
 <style lang="scss" scoped>
 // 样式
-</style>
+.receive-dialog {
+  .receive-dialog-item {
+    display: flex;
+    align-items: center;
+    margin-bottom: 28px;
 
+    .text {
+      margin-right: 30px;
+      white-space: nowrap;
+    }
+  }
+}
+</style>
diff --git a/src/views/device/receive/solveComponent/detail.vue b/src/views/device/receive/solveComponent/detail.vue
index 862fad1..6091fc5 100644
--- a/src/views/device/receive/solveComponent/detail.vue
+++ b/src/views/device/receive/solveComponent/detail.vue
@@ -237,6 +237,7 @@
     padding-right: 10px;
     border-radius: 10px;
     background-color: #fff;
+    // padding: 10px;
 
     .title-button {
       display: flex;

diff --git a/src/views/device/receive/applyList.vue b/src/views/device/receive/applyList.vue
index 5ee8966..34256c6 100644
--- a/src/views/device/receive/applyList.vue
+++ b/src/views/device/receive/applyList.vue
@@ -314,15 +314,9 @@
 
     <table-container v-if="typeValue !== 'add' && typeValue !== 'check'">
       <template #btns-right>
-        <el-button v-if="proxy.hasPerm('/measure/measureSource/add')" type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button v-if="proxy.hasPerm('/measure/measureSource/export')" type="primary" @click="exportAll">
-          导出
-        </el-button>
-        <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
-          打印
-        </el-button>
+        <icon-button v-if="proxy.hasPerm('/measure/price/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/measure/price/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/measure/price/print')" v-print="printObj" icon="icon-print" title="打印" type="primary" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
diff --git a/src/views/device/receive/createOrCheck.vue b/src/views/device/receive/createOrCheck.vue
index a40cae5..d2667cd 100644
--- a/src/views/device/receive/createOrCheck.vue
+++ b/src/views/device/receive/createOrCheck.vue
@@ -211,7 +211,7 @@
 const close = () => {
   emits('close')
 }
-// 选择涉笔对话框关闭
+// 选择设备对话框关闭
 const closeDialog = () => {
   dialogSelectDiviceVisible.value = false
   isShowDialog.value = false
@@ -386,6 +386,7 @@
     padding-right: 10px;
     border-radius: 10px;
     background-color: #fff;
+    // padding: 10px;
 
     .title-button {
       display: flex;
diff --git a/src/views/device/receive/selectDeviceDialog.vue b/src/views/device/receive/selectDeviceDialog.vue
index 68d4381..d6f28f3 100644
--- a/src/views/device/receive/selectDeviceDialog.vue
+++ b/src/views/device/receive/selectDeviceDialog.vue
@@ -1,137 +1,108 @@
-<script lang="ts" setup name="SolveList">
+<!-- 选择设备 -->
+<script lang="ts" setup name="ReceiveDialog">
 import { ref } from 'vue'
-import type { Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQuery, IsolveListType } from '@/views/device/receive/receive'
-import { exportExcel } from '@/utils/exportXlsx'
-import ButtonBox from '@/views/device/receive/solveComponent/buttonBox.vue'
-import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
-import detail from '@/views/device/receive/solveComponent/detail.vue'
-
-const loadingTable = ref(false) // 表格loading
-const active = ref('unused') // 选中的按钮
-const type = {
-  check: '查看',
-  normal: '正常',
-}
-const typeValue = ref('normal')
+import useUserStore from '@/store/modules/user'
+const props = defineProps({
+  dialogSelectDiviceVisible: {
+    type: Boolean,
+    default: false,
+  },
+  isMulti: Boolean,
+})
+const emits = defineEmits(['closeDialog', 'updateDeviceConfirm'])
+const userStore = useUserStore()
 // 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  number: '', // 编号
-  name: '', // 名称
-  dep: '', // 部门
-  person: '', // 人
-  date: '', // 日期
+const listQuery = ref({
+  deviceName: '', // 设备名称
+  deviceNumber: '', // 设备编号
   offset: 1,
   limit: 10,
 })
-// 表格数据
-const list = ref([
-  {
-    number: 'string', // 编号
-    name: 'string', // 名称
-    dep: 'string', // 文件号
-    person: 'string', // 类别
-    date: 'string', // 创建人
-    status: '审批中', // 审批状态
-  },
-  {
-    number: 'string', // 编号
-    name: 'string', // 名称
-    dep: 'string', // 文件号
-    person: 'string', // 类别
-    date: 'string', // 创建人
-    status: '审批中', // 审批状态
-  },
-  {
-    number: 'string', // 编号
-    name: 'string', // 名称
-    dep: 'string', // 文件号
-    person: 'string', // 类别
-    date: 'string', // 创建人
-    status: '审批中', // 审批状态
-  },
-])
-const { proxy } = getCurrentInstance() as any
-// 总数
 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 columns = [
   {
-    text: '申请编号',
-    value: 'number',
-    // width: '120',
-  },
-  {
-    text: '申请名称',
+    text: '设备名称',
     value: 'name',
-    // width: '160',
   },
   {
-    text: '申请部门',
-    value: 'dep',
+    text: '设备编号',
+    value: 'number',
   },
   {
-    text: '申请人',
+    text: '型号',
+    value: 'version',
+  },
+  {
+    text: '出厂编号',
+    value: 'millNumber',
+  },
+  {
+    text: '管理状态',
+    value: 'status',
+  },
+  {
+    text: '使用人',
     value: 'person',
   },
   {
-    text: '申请时间',
+    text: '有效日期',
     value: 'date',
   },
-  {
-    text: '审批状态',
-    value: 'status',
-  },
 ]
-// 选中的内容
-const checkoutList = ref([])
+const table = ref()
+const dialogTableVisible = ref(false)// 控制对话框显隐
+watch(() => props.dialogSelectDiviceVisible, (newValue) => {
+  dialogTableVisible.value = newValue
+  if (!newValue) {
+    table.value.clearMulti() // 清除多选选中
+  }
+})
+// 关闭对话框
+const close = () => {
+  console.log('close-dialog')
+  emits('closeDialog')
+}
+// 确认
+const confirm = () => {
+  console.log('确认')
+  emits('updateDeviceConfirm', checkoutList.value)
+  // 调接口
+  close()
+}
 // 重置
 const clearList = () => {
-  listQuery.value.number = ''
-  listQuery.value.name = ''
-  listQuery.value.dep = ''
-  listQuery.value.person = ''
-  listQuery.value.date = ''
+  listQuery.value.deviceName = ''
+  listQuery.value.deviceNumber = ''
 }
 // 搜索
 const searchList = () => {
 
 }
-// 多选发生改变时
-const handleSelectionChange = (e: any) => {
-  checkoutList.value = e
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (checkoutList.value.length <= 0) {
-    exportExcel({
-      json: list.value.map((item: IsolveListType, index: number) => ({ index: index + 1, number: item.number, name: item.name, dep: item.dep, person: item.person, date: item.date, status: item.status })),
-      name: '设备领用处理',
-      titleArr: ['序号', '申请编号', '申请名称', '申请部门', '申请人', '申请时间', '审批状态'],
-      sheetName: 'sheet1',
-    })
-  }
-  else {
-    exportExcel({
-      json: checkoutList.value.map((item: IsolveListType, index: number) => ({ index: index + 1, number: item.number, name: item.name, dep: item.dep, person: item.person, date: item.date, status: item.status })),
-      name: '设备领用处理',
-      titleArr: ['序号', '申请编号', '申请名称', '申请部门', '申请人', '申请时间', '审批状态'],
-      sheetName: 'sheet1',
-    })
-  }
-  loading.close()
-}
-const exportAll = () => {
-  exportExcelBtn()
-}
-const close = () => {
-  typeValue.value = 'normal'
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  console.log('多选', val)
+  checkoutList.value = val
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -143,164 +114,40 @@
   }
   // fetchData(true)
 }
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '设备领用处理', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-// 操作
-const handleEdit = (index: number, row: IsolveListType, val: string) => {
-  if (val === '领用') {
-    ElMessageBox.confirm(
-      '确认领用吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        // 调领用接口
-        ElMessage({
-          type: 'success',
-          message: '领用成功',
-        })
-      })
-  }
-  else if (val === '删除') {
-    ElMessageBox.confirm(
-      '确认删除吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        // 调删除接口
-        ElMessage({
-          type: 'success',
-          message: '删除成功',
-        })
-      })
-  }
-  else if (val === '退领') {
-    ElMessageBox.confirm(
-      '确认退领吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        // 调退领接口
-        ElMessage({
-          type: 'success',
-          message: '退领成功',
-        })
-      })
-  }
-  else if (val === '查看') {
-    typeValue.value = 'check'
-  }
-}
-// 右上角按钮切换
-const changeCurrentButton = (val: string) => {
-  clearList()
-  console.log('button 切换', val)
-  active.value = val
-  if (val === 'unused') { // 未领用
-
-  }
-  else if (val === 'used') { // 已领用
-
-  }
-}
-// 标签识别
-const execTag = () => {
-
-}
 </script>
 
 <template>
-  <app-container>
+  <el-dialog v-model="dialogTableVisible" title="选择设备" class="select-device-dialog" @close="close">
     <search-area
-      v-if="typeValue !== 'check'"
       :need-clear="true"
       @search="searchList" @clear="clearList"
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.number"
-          placeholder="申请编号"
+          v-model.trim="listQuery.deviceName"
+          placeholder="设备名称"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.name"
-          placeholder="申请名称"
+          v-model.trim="listQuery.deviceNumber"
+          placeholder="设备编号"
           clearable
         />
       </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.dep"
-          placeholder="申请部门"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.person"
-          placeholder="申请人"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="listQuery.date"
-          type="date"
-          placeholder="申请日期"
-        />
-      </search-item>
     </search-area>
-
-    <table-container v-if="typeValue !== 'check'">
-      <template #btns-right>
-        <el-button v-if="proxy.hasPerm('/measure/measureSource/add')" type="primary" @click="execTag">
-          标签识别
-        </el-button>
-        <el-button v-if="proxy.hasPerm('/measure/measureSource/export')" type="primary" @click="exportAll">
-          导出
-        </el-button>
-        <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
-          打印
-        </el-button>
-      </template>
+    <table-container>
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        ref="table"
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :is-multi="isMulti"
+        is-showmulti-select
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
       >
         <template #preColumns>
           <el-table-column label="#" width="55" align="center">
@@ -309,60 +156,32 @@
             </template>
           </el-table-column>
         </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="180">
-            <template #default="{ row }">
-              <el-button
-                size="small"
-                type="primary"
-                link
-                @click="handleEdit(row.$index, row, '查看')"
-              >
-                查看
-              </el-button>
-              <el-button
-                v-if="active === 'unused'"
-                size="small"
-                link
-                type="primary"
-                @click="handleEdit(row.$index, row, '领用')"
-              >
-                领用
-              </el-button>
-              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-              <el-button
-                v-if="active === 'unused'"
-                size="small"
-                link
-                type="danger"
-                @click="handleEdit(row.$index, row, '删除')"
-              >
-                删除
-              </el-button>
-              <el-button
-                v-if="active === 'used'"
-                size="small"
-                link
-                type="primary"
-                @click="handleEdit(row.$index, row, '退领')"
-              >
-                退领
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
       </normal-table>
     </table-container>
-    <button-box
-      v-if="typeValue !== 'check'"
-      :active="active"
-      @changeCurrentButton="changeCurrentButton"
-    />
-    <detail v-if="typeValue === 'check'" :type-value="typeValue" @close="close" />
-  </app-container>
+
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="close">取消</el-button>
+        <el-button type="primary" @click="confirm">
+          确定
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
 </template>
 
 <style lang="scss" scoped>
 // 样式
-</style>
+.receive-dialog {
+  .receive-dialog-item {
+    display: flex;
+    align-items: center;
+    margin-bottom: 28px;
 
+    .text {
+      margin-right: 30px;
+      white-space: nowrap;
+    }
+  }
+}
+</style>
diff --git a/src/views/device/receive/solveComponent/detail.vue b/src/views/device/receive/solveComponent/detail.vue
index 862fad1..6091fc5 100644
--- a/src/views/device/receive/solveComponent/detail.vue
+++ b/src/views/device/receive/solveComponent/detail.vue
@@ -237,6 +237,7 @@
     padding-right: 10px;
     border-radius: 10px;
     background-color: #fff;
+    // padding: 10px;
 
     .title-button {
       display: flex;
diff --git a/src/views/device/receive/solveList.vue b/src/views/device/receive/solveList.vue
index 68d4381..7c737d6 100644
--- a/src/views/device/receive/solveList.vue
+++ b/src/views/device/receive/solveList.vue
@@ -291,12 +291,8 @@
         <el-button v-if="proxy.hasPerm('/measure/measureSource/add')" type="primary" @click="execTag">
           标签识别
         </el-button>
-        <el-button v-if="proxy.hasPerm('/measure/measureSource/export')" type="primary" @click="exportAll">
-          导出
-        </el-button>
-        <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
-          打印
-        </el-button>
+        <icon-button v-if="proxy.hasPerm('/measure/price/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/measure/price/print')" v-print="printObj" icon="icon-print" title="打印" type="primary" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"

diff --git a/src/views/device/receive/applyList.vue b/src/views/device/receive/applyList.vue
index 5ee8966..34256c6 100644
--- a/src/views/device/receive/applyList.vue
+++ b/src/views/device/receive/applyList.vue
@@ -314,15 +314,9 @@
 
     <table-container v-if="typeValue !== 'add' && typeValue !== 'check'">
       <template #btns-right>
-        <el-button v-if="proxy.hasPerm('/measure/measureSource/add')" type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button v-if="proxy.hasPerm('/measure/measureSource/export')" type="primary" @click="exportAll">
-          导出
-        </el-button>
-        <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
-          打印
-        </el-button>
+        <icon-button v-if="proxy.hasPerm('/measure/price/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/measure/price/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/measure/price/print')" v-print="printObj" icon="icon-print" title="打印" type="primary" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
diff --git a/src/views/device/receive/createOrCheck.vue b/src/views/device/receive/createOrCheck.vue
index a40cae5..d2667cd 100644
--- a/src/views/device/receive/createOrCheck.vue
+++ b/src/views/device/receive/createOrCheck.vue
@@ -211,7 +211,7 @@
 const close = () => {
   emits('close')
 }
-// 选择涉笔对话框关闭
+// 选择设备对话框关闭
 const closeDialog = () => {
   dialogSelectDiviceVisible.value = false
   isShowDialog.value = false
@@ -386,6 +386,7 @@
     padding-right: 10px;
     border-radius: 10px;
     background-color: #fff;
+    // padding: 10px;
 
     .title-button {
       display: flex;
diff --git a/src/views/device/receive/selectDeviceDialog.vue b/src/views/device/receive/selectDeviceDialog.vue
index 68d4381..d6f28f3 100644
--- a/src/views/device/receive/selectDeviceDialog.vue
+++ b/src/views/device/receive/selectDeviceDialog.vue
@@ -1,137 +1,108 @@
-<script lang="ts" setup name="SolveList">
+<!-- 选择设备 -->
+<script lang="ts" setup name="ReceiveDialog">
 import { ref } from 'vue'
-import type { Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQuery, IsolveListType } from '@/views/device/receive/receive'
-import { exportExcel } from '@/utils/exportXlsx'
-import ButtonBox from '@/views/device/receive/solveComponent/buttonBox.vue'
-import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
-import detail from '@/views/device/receive/solveComponent/detail.vue'
-
-const loadingTable = ref(false) // 表格loading
-const active = ref('unused') // 选中的按钮
-const type = {
-  check: '查看',
-  normal: '正常',
-}
-const typeValue = ref('normal')
+import useUserStore from '@/store/modules/user'
+const props = defineProps({
+  dialogSelectDiviceVisible: {
+    type: Boolean,
+    default: false,
+  },
+  isMulti: Boolean,
+})
+const emits = defineEmits(['closeDialog', 'updateDeviceConfirm'])
+const userStore = useUserStore()
 // 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  number: '', // 编号
-  name: '', // 名称
-  dep: '', // 部门
-  person: '', // 人
-  date: '', // 日期
+const listQuery = ref({
+  deviceName: '', // 设备名称
+  deviceNumber: '', // 设备编号
   offset: 1,
   limit: 10,
 })
-// 表格数据
-const list = ref([
-  {
-    number: 'string', // 编号
-    name: 'string', // 名称
-    dep: 'string', // 文件号
-    person: 'string', // 类别
-    date: 'string', // 创建人
-    status: '审批中', // 审批状态
-  },
-  {
-    number: 'string', // 编号
-    name: 'string', // 名称
-    dep: 'string', // 文件号
-    person: 'string', // 类别
-    date: 'string', // 创建人
-    status: '审批中', // 审批状态
-  },
-  {
-    number: 'string', // 编号
-    name: 'string', // 名称
-    dep: 'string', // 文件号
-    person: 'string', // 类别
-    date: 'string', // 创建人
-    status: '审批中', // 审批状态
-  },
-])
-const { proxy } = getCurrentInstance() as any
-// 总数
 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 columns = [
   {
-    text: '申请编号',
-    value: 'number',
-    // width: '120',
-  },
-  {
-    text: '申请名称',
+    text: '设备名称',
     value: 'name',
-    // width: '160',
   },
   {
-    text: '申请部门',
-    value: 'dep',
+    text: '设备编号',
+    value: 'number',
   },
   {
-    text: '申请人',
+    text: '型号',
+    value: 'version',
+  },
+  {
+    text: '出厂编号',
+    value: 'millNumber',
+  },
+  {
+    text: '管理状态',
+    value: 'status',
+  },
+  {
+    text: '使用人',
     value: 'person',
   },
   {
-    text: '申请时间',
+    text: '有效日期',
     value: 'date',
   },
-  {
-    text: '审批状态',
-    value: 'status',
-  },
 ]
-// 选中的内容
-const checkoutList = ref([])
+const table = ref()
+const dialogTableVisible = ref(false)// 控制对话框显隐
+watch(() => props.dialogSelectDiviceVisible, (newValue) => {
+  dialogTableVisible.value = newValue
+  if (!newValue) {
+    table.value.clearMulti() // 清除多选选中
+  }
+})
+// 关闭对话框
+const close = () => {
+  console.log('close-dialog')
+  emits('closeDialog')
+}
+// 确认
+const confirm = () => {
+  console.log('确认')
+  emits('updateDeviceConfirm', checkoutList.value)
+  // 调接口
+  close()
+}
 // 重置
 const clearList = () => {
-  listQuery.value.number = ''
-  listQuery.value.name = ''
-  listQuery.value.dep = ''
-  listQuery.value.person = ''
-  listQuery.value.date = ''
+  listQuery.value.deviceName = ''
+  listQuery.value.deviceNumber = ''
 }
 // 搜索
 const searchList = () => {
 
 }
-// 多选发生改变时
-const handleSelectionChange = (e: any) => {
-  checkoutList.value = e
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (checkoutList.value.length <= 0) {
-    exportExcel({
-      json: list.value.map((item: IsolveListType, index: number) => ({ index: index + 1, number: item.number, name: item.name, dep: item.dep, person: item.person, date: item.date, status: item.status })),
-      name: '设备领用处理',
-      titleArr: ['序号', '申请编号', '申请名称', '申请部门', '申请人', '申请时间', '审批状态'],
-      sheetName: 'sheet1',
-    })
-  }
-  else {
-    exportExcel({
-      json: checkoutList.value.map((item: IsolveListType, index: number) => ({ index: index + 1, number: item.number, name: item.name, dep: item.dep, person: item.person, date: item.date, status: item.status })),
-      name: '设备领用处理',
-      titleArr: ['序号', '申请编号', '申请名称', '申请部门', '申请人', '申请时间', '审批状态'],
-      sheetName: 'sheet1',
-    })
-  }
-  loading.close()
-}
-const exportAll = () => {
-  exportExcelBtn()
-}
-const close = () => {
-  typeValue.value = 'normal'
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  console.log('多选', val)
+  checkoutList.value = val
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -143,164 +114,40 @@
   }
   // fetchData(true)
 }
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '设备领用处理', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-// 操作
-const handleEdit = (index: number, row: IsolveListType, val: string) => {
-  if (val === '领用') {
-    ElMessageBox.confirm(
-      '确认领用吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        // 调领用接口
-        ElMessage({
-          type: 'success',
-          message: '领用成功',
-        })
-      })
-  }
-  else if (val === '删除') {
-    ElMessageBox.confirm(
-      '确认删除吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        // 调删除接口
-        ElMessage({
-          type: 'success',
-          message: '删除成功',
-        })
-      })
-  }
-  else if (val === '退领') {
-    ElMessageBox.confirm(
-      '确认退领吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        // 调退领接口
-        ElMessage({
-          type: 'success',
-          message: '退领成功',
-        })
-      })
-  }
-  else if (val === '查看') {
-    typeValue.value = 'check'
-  }
-}
-// 右上角按钮切换
-const changeCurrentButton = (val: string) => {
-  clearList()
-  console.log('button 切换', val)
-  active.value = val
-  if (val === 'unused') { // 未领用
-
-  }
-  else if (val === 'used') { // 已领用
-
-  }
-}
-// 标签识别
-const execTag = () => {
-
-}
 </script>
 
 <template>
-  <app-container>
+  <el-dialog v-model="dialogTableVisible" title="选择设备" class="select-device-dialog" @close="close">
     <search-area
-      v-if="typeValue !== 'check'"
       :need-clear="true"
       @search="searchList" @clear="clearList"
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.number"
-          placeholder="申请编号"
+          v-model.trim="listQuery.deviceName"
+          placeholder="设备名称"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.name"
-          placeholder="申请名称"
+          v-model.trim="listQuery.deviceNumber"
+          placeholder="设备编号"
           clearable
         />
       </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.dep"
-          placeholder="申请部门"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.person"
-          placeholder="申请人"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="listQuery.date"
-          type="date"
-          placeholder="申请日期"
-        />
-      </search-item>
     </search-area>
-
-    <table-container v-if="typeValue !== 'check'">
-      <template #btns-right>
-        <el-button v-if="proxy.hasPerm('/measure/measureSource/add')" type="primary" @click="execTag">
-          标签识别
-        </el-button>
-        <el-button v-if="proxy.hasPerm('/measure/measureSource/export')" type="primary" @click="exportAll">
-          导出
-        </el-button>
-        <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
-          打印
-        </el-button>
-      </template>
+    <table-container>
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        ref="table"
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :is-multi="isMulti"
+        is-showmulti-select
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
       >
         <template #preColumns>
           <el-table-column label="#" width="55" align="center">
@@ -309,60 +156,32 @@
             </template>
           </el-table-column>
         </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="180">
-            <template #default="{ row }">
-              <el-button
-                size="small"
-                type="primary"
-                link
-                @click="handleEdit(row.$index, row, '查看')"
-              >
-                查看
-              </el-button>
-              <el-button
-                v-if="active === 'unused'"
-                size="small"
-                link
-                type="primary"
-                @click="handleEdit(row.$index, row, '领用')"
-              >
-                领用
-              </el-button>
-              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-              <el-button
-                v-if="active === 'unused'"
-                size="small"
-                link
-                type="danger"
-                @click="handleEdit(row.$index, row, '删除')"
-              >
-                删除
-              </el-button>
-              <el-button
-                v-if="active === 'used'"
-                size="small"
-                link
-                type="primary"
-                @click="handleEdit(row.$index, row, '退领')"
-              >
-                退领
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
       </normal-table>
     </table-container>
-    <button-box
-      v-if="typeValue !== 'check'"
-      :active="active"
-      @changeCurrentButton="changeCurrentButton"
-    />
-    <detail v-if="typeValue === 'check'" :type-value="typeValue" @close="close" />
-  </app-container>
+
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="close">取消</el-button>
+        <el-button type="primary" @click="confirm">
+          确定
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
 </template>
 
 <style lang="scss" scoped>
 // 样式
-</style>
+.receive-dialog {
+  .receive-dialog-item {
+    display: flex;
+    align-items: center;
+    margin-bottom: 28px;
 
+    .text {
+      margin-right: 30px;
+      white-space: nowrap;
+    }
+  }
+}
+</style>
diff --git a/src/views/device/receive/solveComponent/detail.vue b/src/views/device/receive/solveComponent/detail.vue
index 862fad1..6091fc5 100644
--- a/src/views/device/receive/solveComponent/detail.vue
+++ b/src/views/device/receive/solveComponent/detail.vue
@@ -237,6 +237,7 @@
     padding-right: 10px;
     border-radius: 10px;
     background-color: #fff;
+    // padding: 10px;
 
     .title-button {
       display: flex;
diff --git a/src/views/device/receive/solveList.vue b/src/views/device/receive/solveList.vue
index 68d4381..7c737d6 100644
--- a/src/views/device/receive/solveList.vue
+++ b/src/views/device/receive/solveList.vue
@@ -291,12 +291,8 @@
         <el-button v-if="proxy.hasPerm('/measure/measureSource/add')" type="primary" @click="execTag">
           标签识别
         </el-button>
-        <el-button v-if="proxy.hasPerm('/measure/measureSource/export')" type="primary" @click="exportAll">
-          导出
-        </el-button>
-        <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
-          打印
-        </el-button>
+        <icon-button v-if="proxy.hasPerm('/measure/price/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/measure/price/print')" v-print="printObj" icon="icon-print" title="打印" type="primary" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
diff --git a/src/views/system/process/process.vue b/src/views/system/process/process.vue
index bae84ec..962131e 100644
--- a/src/views/system/process/process.vue
+++ b/src/views/system/process/process.vue
@@ -260,12 +260,8 @@
         <!-- 查询结果Table显示 -->
         <table-container>
           <template #btns-right>
-            <el-button type="primary" @click="exportExcelBtn">
-              导出
-            </el-button>
-            <el-button v-print="printObj" type="primary">
-              打印
-            </el-button>
+            <icon-button v-if="proxy.hasPerm('/measure/price/export')" icon="icon-export" title="导出" type="primary" @click="exportExcelBtn" />
+            <icon-button v-if="proxy.hasPerm('/measure/price/print')" v-print="printObj" icon="icon-print" title="打印" type="primary" />
           </template>
 
           <div class="table-area">