diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 9da2abd..3c91abd 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -1,4 +1,4 @@
-<!-- <script lang="ts" setup name="MaintenanceList">
+<script lang="ts" setup name="MaintenanceList">
 // 逻辑代码
 </script>
 
@@ -10,416 +10,4 @@
 
 <style lang="scss" scoped>
 // 样式
-</style> -->
-
-<script lang="ts" setup name="Receive">
-import { ref } from 'vue'
-import type { Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQuery, IlistType } from '@/views/device/receive/receive'
-import { exportExcel } from '@/utils/exportXlsx'
-import ButtonBox from '@/views/device/receive/buttonBox.vue'
-import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
-import createOrCheck from '@/views/device/receive/createOrCheck.vue'
-
-const loadingTable = ref(false) // 表格loading
-const active = ref() // 选中的按钮
-const isShowDialog = ref(false) // 是否显示dialog
-const approveOpinion = ref() // 审批意见：1同意2驳回0拒绝
-const type = {
-  add: '新建',
-  check: '查看',
-  normal: '正常',
-}
-const typeValue = ref('normal')
-// 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  number: '', // 编号
-  name: '', // 名称
-  dep: '', // 部门
-  person: '', // 人
-  date: '', // 日期
-  offset: 1,
-  limit: 10,
-})
-// 表格数据
-const list = ref([
-  {
-    number: 'string', // 编号
-    name: 'string', // 名称
-    fileNumber: 'string', // 文件号
-    type: 'string', // 类别
-    createPerson: 'string', // 创建人
-    createTime: 'string', // 创建时间
-    status: '审批中', // 审批状态
-    isStart: true, // 是否是发起者
-  },
-  {
-    number: '1', // 编号
-    name: '1', // 名称
-    fileNumber: '1', // 文件号
-    type: '1', // 类别
-    createPerson: '1', // 创建人
-    createTime: '1', // 创建时间
-    status: '已通过', // 审批状态
-    isStart: false,
-  },
-  {
-    number: '2', // 编号
-    name: '2', // 名称
-    fileNumber: '2', // 文件号
-    type: '2', // 类别
-    createPerson: '2', // 创建人
-    createTime: '2', // 创建时间
-    status: '未通过', // 审批状态0未通过
-    isStart: false,
-  },
-])
-const { proxy } = getCurrentInstance() as any
-// 总数
-const total = ref(20)
-// 表头
-const columns = ref([
-  {
-    text: '名称',
-    value: 'name',
-    // width: '160',
-  },
-  {
-    text: '编号',
-    value: 'number',
-    // width: '120',
-  },
-  {
-    text: '文件号',
-    value: 'fileNumber',
-  },
-  {
-    text: '类别',
-    value: 'type',
-  },
-  {
-    text: '创建人',
-    value: 'createPerson',
-  },
-  {
-    text: '创建时间',
-    value: 'createTime',
-  },
-  {
-    text: '审批状态',
-    value: 'status',
-  },
-])
-// 选中的内容
-const checkoutList = ref([])
-// 重置
-const clearList = () => {
-  listQuery.value.number = ''
-  listQuery.value.name = ''
-  listQuery.value.dep = ''
-  listQuery.value.person = ''
-  listQuery.value.date = ''
-}
-// 搜索
-const searchList = () => {
-
-}
-// 多选发生改变时
-const handleSelectionChange = (e: any) => {
-  checkoutList.value = e
-}
-// 新建
-const add = () => {
-  typeValue.value = 'add'
-}
-// 导出
-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: IlistType, index: number) => ({ index: index + 1, supplierNo: item.name, supplierName: item.number, businessContent: item.fileNumber, briefName: item.type, director: item.createPerson, mobile: item.createTime, companyCity: item.status })),
-      name: '设备领用申请',
-      titleArr: ['序号', '名称', '编号', '文件号', '类别', '创建人', '创建时间', '审批状态'],
-      sheetName: 'sheet1',
-    })
-  }
-  else {
-    exportExcel({
-      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.name, supplierName: item.number, businessContent: item.fileNumber, briefName: item.type, director: item.createPerson, mobile: item.createTime, companyCity: item.status })),
-      name: '设备领用申请',
-      titleArr: ['序号', '名称', '编号', '文件号', '类别', '创建人', '创建时间', '审批状态'],
-      sheetName: 'sheet1',
-    })
-  }
-  loading.close()
-}
-const exportAll = () => {
-  exportExcelBtn()
-}
-const close = () => {
-  typeValue.value = 'normal'
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  // fetchData(true)
-}
-// 打印
-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: IlistType, 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 === '同意') {
-    isShowDialog.value = true
-    approveOpinion.value = '1'
-  }
-  else if (val === '驳回') {
-    isShowDialog.value = true
-    approveOpinion.value = '2'
-  }
-  else if (val === '拒绝') {
-    isShowDialog.value = true
-    approveOpinion.value = '0'
-  }
-  else if (val === '查看') {
-    typeValue.value = 'check'
-  }
-}
-// 按钮切换
-const changeCurrentButton = (val: string) => {
-  clearList()
-  console.log('button 切换', val)
-  active.value = val
-  if (val === 'box') { // 草稿箱
-
-  }
-  else if (val === 'will') { // 未审批
-
-  }
-  else if (val === 'ing') { // 审批中
-
-  }
-  else if (val === 'pass') { // 已通过
-
-  }
-  else if (val === 'notPass') { // 未通过
-
-  }
-  else if (val === 'cancle') { // 已取消
-
-  }
-  else { // 全部
-
-  }
-}
-// 监听关闭对话框
-const closeDialog = () => {
-  isShowDialog.value = false
-}
-</script>
-
-<template>
-  <app-container>
-    <search-area
-      v-if="typeValue !== 'add' && typeValue !== 'check'"
-      :need-clear="true"
-      @search="searchList" @clear="clearList"
-    >
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.number"
-          placeholder="申请编号"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.name"
-          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 !== '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>
-      </template>
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-      >
-        <template #preColumns>
-          <el-table-column label="#" width="55" align="center">
-            <template #default="scope">
-              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="290">
-            <template #default="{ row }">
-              <el-button
-                size="small"
-                type="primary"
-                link
-                @click="handleEdit(row.$index, row, '查看')"
-              >
-                查看
-              </el-button>
-              <el-button
-                size="small"
-                link
-                type="primary"
-                @click="handleEdit(row.$index, row, '同意')"
-              >
-                同意
-              </el-button>
-              <el-button
-                size="small"
-                link
-                type="primary"
-                @click="handleEdit(row.$index, row, '驳回')"
-              >
-                驳回
-              </el-button>
-              <el-button
-                size="small"
-                link
-                type="primary"
-                @click="handleEdit(row.$index, row, '拒绝')"
-              >
-                拒绝
-              </el-button>
-              <!-- 是发起者且审批中可以取消 -->
-              <el-button
-                :disabled="row.status === '审批中' && row.isStart"
-                size="small"
-                link
-                type="primary"
-                @click="handleEdit(row.$index, row, '取消')"
-              >
-                取消
-              </el-button>
-              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-              <el-button
-                :disabled="row.status === '未通过' || row.status === '已通过' || !row.isStart"
-                size="small"
-                link
-                type="danger"
-                @click="handleEdit(row.$index, row, '删除')"
-              >
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <button-box v-if="typeValue !== 'add' && typeValue !== 'check'" :active="active" @changeCurrentButton="changeCurrentButton" />
-    <receive-dialog :is-show-dialog="isShowDialog" :approve-opinion="approveOpinion" @closeDialog="closeDialog" />
-    <create-or-check
-      v-if="typeValue === 'add' || typeValue === 'check'"
-      :type-value="typeValue"
-      @close="close"
-    />
-  </app-container>
-</template>
-
-<style lang="scss" scoped>
-// 样式
 </style>
-

diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 9da2abd..3c91abd 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -1,4 +1,4 @@
-<!-- <script lang="ts" setup name="MaintenanceList">
+<script lang="ts" setup name="MaintenanceList">
 // 逻辑代码
 </script>
 
@@ -10,416 +10,4 @@
 
 <style lang="scss" scoped>
 // 样式
-</style> -->
-
-<script lang="ts" setup name="Receive">
-import { ref } from 'vue'
-import type { Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQuery, IlistType } from '@/views/device/receive/receive'
-import { exportExcel } from '@/utils/exportXlsx'
-import ButtonBox from '@/views/device/receive/buttonBox.vue'
-import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
-import createOrCheck from '@/views/device/receive/createOrCheck.vue'
-
-const loadingTable = ref(false) // 表格loading
-const active = ref() // 选中的按钮
-const isShowDialog = ref(false) // 是否显示dialog
-const approveOpinion = ref() // 审批意见：1同意2驳回0拒绝
-const type = {
-  add: '新建',
-  check: '查看',
-  normal: '正常',
-}
-const typeValue = ref('normal')
-// 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  number: '', // 编号
-  name: '', // 名称
-  dep: '', // 部门
-  person: '', // 人
-  date: '', // 日期
-  offset: 1,
-  limit: 10,
-})
-// 表格数据
-const list = ref([
-  {
-    number: 'string', // 编号
-    name: 'string', // 名称
-    fileNumber: 'string', // 文件号
-    type: 'string', // 类别
-    createPerson: 'string', // 创建人
-    createTime: 'string', // 创建时间
-    status: '审批中', // 审批状态
-    isStart: true, // 是否是发起者
-  },
-  {
-    number: '1', // 编号
-    name: '1', // 名称
-    fileNumber: '1', // 文件号
-    type: '1', // 类别
-    createPerson: '1', // 创建人
-    createTime: '1', // 创建时间
-    status: '已通过', // 审批状态
-    isStart: false,
-  },
-  {
-    number: '2', // 编号
-    name: '2', // 名称
-    fileNumber: '2', // 文件号
-    type: '2', // 类别
-    createPerson: '2', // 创建人
-    createTime: '2', // 创建时间
-    status: '未通过', // 审批状态0未通过
-    isStart: false,
-  },
-])
-const { proxy } = getCurrentInstance() as any
-// 总数
-const total = ref(20)
-// 表头
-const columns = ref([
-  {
-    text: '名称',
-    value: 'name',
-    // width: '160',
-  },
-  {
-    text: '编号',
-    value: 'number',
-    // width: '120',
-  },
-  {
-    text: '文件号',
-    value: 'fileNumber',
-  },
-  {
-    text: '类别',
-    value: 'type',
-  },
-  {
-    text: '创建人',
-    value: 'createPerson',
-  },
-  {
-    text: '创建时间',
-    value: 'createTime',
-  },
-  {
-    text: '审批状态',
-    value: 'status',
-  },
-])
-// 选中的内容
-const checkoutList = ref([])
-// 重置
-const clearList = () => {
-  listQuery.value.number = ''
-  listQuery.value.name = ''
-  listQuery.value.dep = ''
-  listQuery.value.person = ''
-  listQuery.value.date = ''
-}
-// 搜索
-const searchList = () => {
-
-}
-// 多选发生改变时
-const handleSelectionChange = (e: any) => {
-  checkoutList.value = e
-}
-// 新建
-const add = () => {
-  typeValue.value = 'add'
-}
-// 导出
-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: IlistType, index: number) => ({ index: index + 1, supplierNo: item.name, supplierName: item.number, businessContent: item.fileNumber, briefName: item.type, director: item.createPerson, mobile: item.createTime, companyCity: item.status })),
-      name: '设备领用申请',
-      titleArr: ['序号', '名称', '编号', '文件号', '类别', '创建人', '创建时间', '审批状态'],
-      sheetName: 'sheet1',
-    })
-  }
-  else {
-    exportExcel({
-      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.name, supplierName: item.number, businessContent: item.fileNumber, briefName: item.type, director: item.createPerson, mobile: item.createTime, companyCity: item.status })),
-      name: '设备领用申请',
-      titleArr: ['序号', '名称', '编号', '文件号', '类别', '创建人', '创建时间', '审批状态'],
-      sheetName: 'sheet1',
-    })
-  }
-  loading.close()
-}
-const exportAll = () => {
-  exportExcelBtn()
-}
-const close = () => {
-  typeValue.value = 'normal'
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  // fetchData(true)
-}
-// 打印
-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: IlistType, 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 === '同意') {
-    isShowDialog.value = true
-    approveOpinion.value = '1'
-  }
-  else if (val === '驳回') {
-    isShowDialog.value = true
-    approveOpinion.value = '2'
-  }
-  else if (val === '拒绝') {
-    isShowDialog.value = true
-    approveOpinion.value = '0'
-  }
-  else if (val === '查看') {
-    typeValue.value = 'check'
-  }
-}
-// 按钮切换
-const changeCurrentButton = (val: string) => {
-  clearList()
-  console.log('button 切换', val)
-  active.value = val
-  if (val === 'box') { // 草稿箱
-
-  }
-  else if (val === 'will') { // 未审批
-
-  }
-  else if (val === 'ing') { // 审批中
-
-  }
-  else if (val === 'pass') { // 已通过
-
-  }
-  else if (val === 'notPass') { // 未通过
-
-  }
-  else if (val === 'cancle') { // 已取消
-
-  }
-  else { // 全部
-
-  }
-}
-// 监听关闭对话框
-const closeDialog = () => {
-  isShowDialog.value = false
-}
-</script>
-
-<template>
-  <app-container>
-    <search-area
-      v-if="typeValue !== 'add' && typeValue !== 'check'"
-      :need-clear="true"
-      @search="searchList" @clear="clearList"
-    >
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.number"
-          placeholder="申请编号"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.name"
-          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 !== '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>
-      </template>
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-      >
-        <template #preColumns>
-          <el-table-column label="#" width="55" align="center">
-            <template #default="scope">
-              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="290">
-            <template #default="{ row }">
-              <el-button
-                size="small"
-                type="primary"
-                link
-                @click="handleEdit(row.$index, row, '查看')"
-              >
-                查看
-              </el-button>
-              <el-button
-                size="small"
-                link
-                type="primary"
-                @click="handleEdit(row.$index, row, '同意')"
-              >
-                同意
-              </el-button>
-              <el-button
-                size="small"
-                link
-                type="primary"
-                @click="handleEdit(row.$index, row, '驳回')"
-              >
-                驳回
-              </el-button>
-              <el-button
-                size="small"
-                link
-                type="primary"
-                @click="handleEdit(row.$index, row, '拒绝')"
-              >
-                拒绝
-              </el-button>
-              <!-- 是发起者且审批中可以取消 -->
-              <el-button
-                :disabled="row.status === '审批中' && row.isStart"
-                size="small"
-                link
-                type="primary"
-                @click="handleEdit(row.$index, row, '取消')"
-              >
-                取消
-              </el-button>
-              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-              <el-button
-                :disabled="row.status === '未通过' || row.status === '已通过' || !row.isStart"
-                size="small"
-                link
-                type="danger"
-                @click="handleEdit(row.$index, row, '删除')"
-              >
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <button-box v-if="typeValue !== 'add' && typeValue !== 'check'" :active="active" @changeCurrentButton="changeCurrentButton" />
-    <receive-dialog :is-show-dialog="isShowDialog" :approve-opinion="approveOpinion" @closeDialog="closeDialog" />
-    <create-or-check
-      v-if="typeValue === 'add' || typeValue === 'check'"
-      :type-value="typeValue"
-      @close="close"
-    />
-  </app-container>
-</template>
-
-<style lang="scss" scoped>
-// 样式
 </style>
-
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 1df82e3..a4ace73 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -1,4 +1,4 @@
-<!-- <script lang="ts" setup name="ManageCheckList">
+<script lang="ts" setup name="ManageCheckList">
 // 逻辑代码
 </script>
 
@@ -10,372 +10,4 @@
 
 <style lang="scss" scoped>
 // 样式
-</style> -->
-<script lang="ts" setup name="SolveList">
-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')
-// 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  number: '', // 编号
-  name: '', // 名称
-  dep: '', // 部门
-  person: '', // 人
-  date: '', // 日期
-  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 columns = [
-  {
-    text: '申请编号',
-    value: 'number',
-    // width: '120',
-  },
-  {
-    text: '申请名称',
-    value: 'name',
-    // width: '160',
-  },
-  {
-    text: '申请部门',
-    value: 'dep',
-  },
-  {
-    text: '申请人',
-    value: 'person',
-  },
-  {
-    text: '申请时间',
-    value: 'date',
-  },
-  {
-    text: '审批状态',
-    value: 'status',
-  },
-]
-// 选中的内容
-const checkoutList = ref([])
-// 重置
-const clearList = () => {
-  listQuery.value.number = ''
-  listQuery.value.name = ''
-  listQuery.value.dep = ''
-  listQuery.value.person = ''
-  listQuery.value.date = ''
-}
-// 搜索
-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 changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  // fetchData(true)
-}
-// 打印
-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>
-    <search-area
-      v-if="typeValue !== 'check'"
-      :need-clear="true"
-      @search="searchList" @clear="clearList"
-    >
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.number"
-          placeholder="申请编号"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.name"
-          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>
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-      >
-        <template #preColumns>
-          <el-table-column label="#" width="55" align="center">
-            <template #default="scope">
-              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="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>
-
-<style lang="scss" scoped>
-// 样式
 </style>
-

diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 9da2abd..3c91abd 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -1,4 +1,4 @@
-<!-- <script lang="ts" setup name="MaintenanceList">
+<script lang="ts" setup name="MaintenanceList">
 // 逻辑代码
 </script>
 
@@ -10,416 +10,4 @@
 
 <style lang="scss" scoped>
 // 样式
-</style> -->
-
-<script lang="ts" setup name="Receive">
-import { ref } from 'vue'
-import type { Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQuery, IlistType } from '@/views/device/receive/receive'
-import { exportExcel } from '@/utils/exportXlsx'
-import ButtonBox from '@/views/device/receive/buttonBox.vue'
-import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
-import createOrCheck from '@/views/device/receive/createOrCheck.vue'
-
-const loadingTable = ref(false) // 表格loading
-const active = ref() // 选中的按钮
-const isShowDialog = ref(false) // 是否显示dialog
-const approveOpinion = ref() // 审批意见：1同意2驳回0拒绝
-const type = {
-  add: '新建',
-  check: '查看',
-  normal: '正常',
-}
-const typeValue = ref('normal')
-// 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  number: '', // 编号
-  name: '', // 名称
-  dep: '', // 部门
-  person: '', // 人
-  date: '', // 日期
-  offset: 1,
-  limit: 10,
-})
-// 表格数据
-const list = ref([
-  {
-    number: 'string', // 编号
-    name: 'string', // 名称
-    fileNumber: 'string', // 文件号
-    type: 'string', // 类别
-    createPerson: 'string', // 创建人
-    createTime: 'string', // 创建时间
-    status: '审批中', // 审批状态
-    isStart: true, // 是否是发起者
-  },
-  {
-    number: '1', // 编号
-    name: '1', // 名称
-    fileNumber: '1', // 文件号
-    type: '1', // 类别
-    createPerson: '1', // 创建人
-    createTime: '1', // 创建时间
-    status: '已通过', // 审批状态
-    isStart: false,
-  },
-  {
-    number: '2', // 编号
-    name: '2', // 名称
-    fileNumber: '2', // 文件号
-    type: '2', // 类别
-    createPerson: '2', // 创建人
-    createTime: '2', // 创建时间
-    status: '未通过', // 审批状态0未通过
-    isStart: false,
-  },
-])
-const { proxy } = getCurrentInstance() as any
-// 总数
-const total = ref(20)
-// 表头
-const columns = ref([
-  {
-    text: '名称',
-    value: 'name',
-    // width: '160',
-  },
-  {
-    text: '编号',
-    value: 'number',
-    // width: '120',
-  },
-  {
-    text: '文件号',
-    value: 'fileNumber',
-  },
-  {
-    text: '类别',
-    value: 'type',
-  },
-  {
-    text: '创建人',
-    value: 'createPerson',
-  },
-  {
-    text: '创建时间',
-    value: 'createTime',
-  },
-  {
-    text: '审批状态',
-    value: 'status',
-  },
-])
-// 选中的内容
-const checkoutList = ref([])
-// 重置
-const clearList = () => {
-  listQuery.value.number = ''
-  listQuery.value.name = ''
-  listQuery.value.dep = ''
-  listQuery.value.person = ''
-  listQuery.value.date = ''
-}
-// 搜索
-const searchList = () => {
-
-}
-// 多选发生改变时
-const handleSelectionChange = (e: any) => {
-  checkoutList.value = e
-}
-// 新建
-const add = () => {
-  typeValue.value = 'add'
-}
-// 导出
-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: IlistType, index: number) => ({ index: index + 1, supplierNo: item.name, supplierName: item.number, businessContent: item.fileNumber, briefName: item.type, director: item.createPerson, mobile: item.createTime, companyCity: item.status })),
-      name: '设备领用申请',
-      titleArr: ['序号', '名称', '编号', '文件号', '类别', '创建人', '创建时间', '审批状态'],
-      sheetName: 'sheet1',
-    })
-  }
-  else {
-    exportExcel({
-      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.name, supplierName: item.number, businessContent: item.fileNumber, briefName: item.type, director: item.createPerson, mobile: item.createTime, companyCity: item.status })),
-      name: '设备领用申请',
-      titleArr: ['序号', '名称', '编号', '文件号', '类别', '创建人', '创建时间', '审批状态'],
-      sheetName: 'sheet1',
-    })
-  }
-  loading.close()
-}
-const exportAll = () => {
-  exportExcelBtn()
-}
-const close = () => {
-  typeValue.value = 'normal'
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  // fetchData(true)
-}
-// 打印
-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: IlistType, 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 === '同意') {
-    isShowDialog.value = true
-    approveOpinion.value = '1'
-  }
-  else if (val === '驳回') {
-    isShowDialog.value = true
-    approveOpinion.value = '2'
-  }
-  else if (val === '拒绝') {
-    isShowDialog.value = true
-    approveOpinion.value = '0'
-  }
-  else if (val === '查看') {
-    typeValue.value = 'check'
-  }
-}
-// 按钮切换
-const changeCurrentButton = (val: string) => {
-  clearList()
-  console.log('button 切换', val)
-  active.value = val
-  if (val === 'box') { // 草稿箱
-
-  }
-  else if (val === 'will') { // 未审批
-
-  }
-  else if (val === 'ing') { // 审批中
-
-  }
-  else if (val === 'pass') { // 已通过
-
-  }
-  else if (val === 'notPass') { // 未通过
-
-  }
-  else if (val === 'cancle') { // 已取消
-
-  }
-  else { // 全部
-
-  }
-}
-// 监听关闭对话框
-const closeDialog = () => {
-  isShowDialog.value = false
-}
-</script>
-
-<template>
-  <app-container>
-    <search-area
-      v-if="typeValue !== 'add' && typeValue !== 'check'"
-      :need-clear="true"
-      @search="searchList" @clear="clearList"
-    >
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.number"
-          placeholder="申请编号"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.name"
-          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 !== '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>
-      </template>
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-      >
-        <template #preColumns>
-          <el-table-column label="#" width="55" align="center">
-            <template #default="scope">
-              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="290">
-            <template #default="{ row }">
-              <el-button
-                size="small"
-                type="primary"
-                link
-                @click="handleEdit(row.$index, row, '查看')"
-              >
-                查看
-              </el-button>
-              <el-button
-                size="small"
-                link
-                type="primary"
-                @click="handleEdit(row.$index, row, '同意')"
-              >
-                同意
-              </el-button>
-              <el-button
-                size="small"
-                link
-                type="primary"
-                @click="handleEdit(row.$index, row, '驳回')"
-              >
-                驳回
-              </el-button>
-              <el-button
-                size="small"
-                link
-                type="primary"
-                @click="handleEdit(row.$index, row, '拒绝')"
-              >
-                拒绝
-              </el-button>
-              <!-- 是发起者且审批中可以取消 -->
-              <el-button
-                :disabled="row.status === '审批中' && row.isStart"
-                size="small"
-                link
-                type="primary"
-                @click="handleEdit(row.$index, row, '取消')"
-              >
-                取消
-              </el-button>
-              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-              <el-button
-                :disabled="row.status === '未通过' || row.status === '已通过' || !row.isStart"
-                size="small"
-                link
-                type="danger"
-                @click="handleEdit(row.$index, row, '删除')"
-              >
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <button-box v-if="typeValue !== 'add' && typeValue !== 'check'" :active="active" @changeCurrentButton="changeCurrentButton" />
-    <receive-dialog :is-show-dialog="isShowDialog" :approve-opinion="approveOpinion" @closeDialog="closeDialog" />
-    <create-or-check
-      v-if="typeValue === 'add' || typeValue === 'check'"
-      :type-value="typeValue"
-      @close="close"
-    />
-  </app-container>
-</template>
-
-<style lang="scss" scoped>
-// 样式
 </style>
-
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 1df82e3..a4ace73 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -1,4 +1,4 @@
-<!-- <script lang="ts" setup name="ManageCheckList">
+<script lang="ts" setup name="ManageCheckList">
 // 逻辑代码
 </script>
 
@@ -10,372 +10,4 @@
 
 <style lang="scss" scoped>
 // 样式
-</style> -->
-<script lang="ts" setup name="SolveList">
-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')
-// 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  number: '', // 编号
-  name: '', // 名称
-  dep: '', // 部门
-  person: '', // 人
-  date: '', // 日期
-  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 columns = [
-  {
-    text: '申请编号',
-    value: 'number',
-    // width: '120',
-  },
-  {
-    text: '申请名称',
-    value: 'name',
-    // width: '160',
-  },
-  {
-    text: '申请部门',
-    value: 'dep',
-  },
-  {
-    text: '申请人',
-    value: 'person',
-  },
-  {
-    text: '申请时间',
-    value: 'date',
-  },
-  {
-    text: '审批状态',
-    value: 'status',
-  },
-]
-// 选中的内容
-const checkoutList = ref([])
-// 重置
-const clearList = () => {
-  listQuery.value.number = ''
-  listQuery.value.name = ''
-  listQuery.value.dep = ''
-  listQuery.value.person = ''
-  listQuery.value.date = ''
-}
-// 搜索
-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 changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  // fetchData(true)
-}
-// 打印
-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>
-    <search-area
-      v-if="typeValue !== 'check'"
-      :need-clear="true"
-      @search="searchList" @clear="clearList"
-    >
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.number"
-          placeholder="申请编号"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.name"
-          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>
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-      >
-        <template #preColumns>
-          <el-table-column label="#" width="55" align="center">
-            <template #default="scope">
-              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="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>
-
-<style lang="scss" scoped>
-// 样式
 </style>
-
diff --git a/src/views/device/receive/selectDeviceDialog.vue b/src/views/device/receive/selectDeviceDialog.vue
index d6f28f3..68d4381 100644
--- a/src/views/device/receive/selectDeviceDialog.vue
+++ b/src/views/device/receive/selectDeviceDialog.vue
@@ -1,108 +1,137 @@
-<!-- 选择设备 -->
-<script lang="ts" setup name="ReceiveDialog">
+<script lang="ts" setup name="SolveList">
 import { ref } from 'vue'
-import useUserStore from '@/store/modules/user'
-const props = defineProps({
-  dialogSelectDiviceVisible: {
-    type: Boolean,
-    default: false,
-  },
-  isMulti: Boolean,
-})
-const emits = defineEmits(['closeDialog', 'updateDeviceConfirm'])
-const userStore = useUserStore()
+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')
 // 查询条件
-const listQuery = ref({
-  deviceName: '', // 设备名称
-  deviceNumber: '', // 设备编号
+const listQuery: Ref<IlistQuery> = ref({
+  number: '', // 编号
+  name: '', // 名称
+  dep: '', // 部门
+  person: '', // 人
+  date: '', // 日期
   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: 'name',
-  },
-  {
-    text: '设备编号',
+    text: '申请编号',
     value: 'number',
+    // width: '120',
   },
   {
-    text: '型号',
-    value: 'version',
+    text: '申请名称',
+    value: 'name',
+    // width: '160',
   },
   {
-    text: '出厂编号',
-    value: 'millNumber',
+    text: '申请部门',
+    value: 'dep',
   },
   {
-    text: '管理状态',
-    value: 'status',
-  },
-  {
-    text: '使用人',
+    text: '申请人',
     value: 'person',
   },
   {
-    text: '有效日期',
+    text: '申请时间',
     value: 'date',
   },
+  {
+    text: '审批状态',
+    value: 'status',
+  },
 ]
-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 checkoutList = ref([])
 // 重置
 const clearList = () => {
-  listQuery.value.deviceName = ''
-  listQuery.value.deviceNumber = ''
+  listQuery.value.number = ''
+  listQuery.value.name = ''
+  listQuery.value.dep = ''
+  listQuery.value.person = ''
+  listQuery.value.date = ''
 }
 // 搜索
 const searchList = () => {
 
 }
-// 多选选中
-const handleSelectionChange = (val: any) => {
-  console.log('多选', val)
-  checkoutList.value = val
+// 多选发生改变时
+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 changePage = (val: { size?: number; page?: number }) => {
@@ -114,40 +143,164 @@
   }
   // 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>
-  <el-dialog v-model="dialogTableVisible" title="选择设备" class="select-device-dialog" @close="close">
+  <app-container>
     <search-area
+      v-if="typeValue !== 'check'"
       :need-clear="true"
       @search="searchList" @clear="clearList"
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.deviceName"
-          placeholder="设备名称"
+          v-model.trim="listQuery.number"
+          placeholder="申请编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.deviceNumber"
-          placeholder="设备编号"
+          v-model.trim="listQuery.name"
+          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>
+
+    <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>
       <normal-table
-        ref="table"
-        :data="list"
-        :total="total"
-        :columns="columns"
-        :query="listQuery"
-        :is-multi="isMulti"
-        is-showmulti-select
-        @change="changePage"
-        @multiSelect="handleSelectionChange"
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
       >
         <template #preColumns>
           <el-table-column label="#" width="55" align="center">
@@ -156,32 +309,60 @@
             </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>
-
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="close">取消</el-button>
-        <el-button type="primary" @click="confirm">
-          确定
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
+    <button-box
+      v-if="typeValue !== 'check'"
+      :active="active"
+      @changeCurrentButton="changeCurrentButton"
+    />
+    <detail v-if="typeValue === 'check'" :type-value="typeValue" @close="close" />
+  </app-container>
 </template>
 
 <style lang="scss" scoped>
 // 样式
-.receive-dialog {
-  .receive-dialog-item {
-    display: flex;
-    align-items: center;
-    margin-bottom: 28px;
-
-    .text {
-      margin-right: 30px;
-      white-space: nowrap;
-    }
-  }
-}
 </style>
+