diff --git a/src/components/drawer/copyerDrawer.vue b/src/components/drawer/copyerDrawer.vue
index 2bcbacc..d97284d 100644
--- a/src/components/drawer/copyerDrawer.vue
+++ b/src/components/drawer/copyerDrawer.vue
@@ -59,7 +59,7 @@
 </script>
 
 <template>
-  <el-drawer v-model="visible" :append-to-body="true" title="抄送人设置" direction="rtl" custom-class="set_copyer" size="550px" :@close="closeDrawer">
+  <el-drawer v-model="visible" :append-to-body="true" title="抄送人设置" direction="rtl" custom-class="set_copyer" size="550px" @close="closeDrawer">
     <div class="demo-drawer__content">
       <div class="copyer_content drawer_content">
         <el-button type="primary" @click="addCopyer">

diff --git a/src/components/drawer/copyerDrawer.vue b/src/components/drawer/copyerDrawer.vue
index 2bcbacc..d97284d 100644
--- a/src/components/drawer/copyerDrawer.vue
+++ b/src/components/drawer/copyerDrawer.vue
@@ -59,7 +59,7 @@
 </script>
 
 <template>
-  <el-drawer v-model="visible" :append-to-body="true" title="抄送人设置" direction="rtl" custom-class="set_copyer" size="550px" :@close="closeDrawer">
+  <el-drawer v-model="visible" :append-to-body="true" title="抄送人设置" direction="rtl" custom-class="set_copyer" size="550px" @close="closeDrawer">
     <div class="demo-drawer__content">
       <div class="copyer_content drawer_content">
         <el-button type="primary" @click="addCopyer">
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 1644a80..23ac34d 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -303,6 +303,18 @@
         },
       },
       {
+        path: ':type',
+        name: 'ApplyListDetail',
+        component: () => import('@/views/device/receive/createOrCheck.vue'),
+        meta: {
+          title: '设备领用申请',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/receive/applyList',
+        },
+      },
+      {
         path: 'solveList',
         name: 'SolveList',
         component: () => import('@/views/device/receive/solveList.vue'),
@@ -312,6 +324,18 @@
           auth: '/device/receive/solveList',
         },
       },
+      {
+        path: 'solveCheck',
+        name: 'SolveListDetail',
+        component: () => import('@/views/device/receive/solveComponent/detail.vue'),
+        meta: {
+          title: '设备领用处理',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/receive/solveList',
+        },
+      },
     ],
   },
   {

diff --git a/src/components/drawer/copyerDrawer.vue b/src/components/drawer/copyerDrawer.vue
index 2bcbacc..d97284d 100644
--- a/src/components/drawer/copyerDrawer.vue
+++ b/src/components/drawer/copyerDrawer.vue
@@ -59,7 +59,7 @@
 </script>
 
 <template>
-  <el-drawer v-model="visible" :append-to-body="true" title="抄送人设置" direction="rtl" custom-class="set_copyer" size="550px" :@close="closeDrawer">
+  <el-drawer v-model="visible" :append-to-body="true" title="抄送人设置" direction="rtl" custom-class="set_copyer" size="550px" @close="closeDrawer">
     <div class="demo-drawer__content">
       <div class="copyer_content drawer_content">
         <el-button type="primary" @click="addCopyer">
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 1644a80..23ac34d 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -303,6 +303,18 @@
         },
       },
       {
+        path: ':type',
+        name: 'ApplyListDetail',
+        component: () => import('@/views/device/receive/createOrCheck.vue'),
+        meta: {
+          title: '设备领用申请',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/receive/applyList',
+        },
+      },
+      {
         path: 'solveList',
         name: 'SolveList',
         component: () => import('@/views/device/receive/solveList.vue'),
@@ -312,6 +324,18 @@
           auth: '/device/receive/solveList',
         },
       },
+      {
+        path: 'solveCheck',
+        name: 'SolveListDetail',
+        component: () => import('@/views/device/receive/solveComponent/detail.vue'),
+        meta: {
+          title: '设备领用处理',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/receive/solveList',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 1f5cdcf..edac0e5 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -170,12 +170,38 @@
         component: () => import('@/views/system/process/process.vue'),
         meta: {
           title: '流程管理',
+          icon: 'ep:key',
           auth: '/sys/process',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/process',
         },
       },
+      {
+        path: 'edit',
+        name: 'ProcessListEdit',
+        component: () => import('@/views/system/process/editProcess.vue'),
+        meta: {
+          title: '流程管理',
+          icon: 'ep:key',
+          auth: '/sys/process',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/process/list',
+        },
+      },
+      {
+        path: 'detail',
+        name: 'ProcessListDetail',
+        component: () => import('@/views/system/process/detailProcess.vue'),
+        meta: {
+          title: '流程管理',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/process/list',
+        },
+      },
     ],
   },
   {

diff --git a/src/components/drawer/copyerDrawer.vue b/src/components/drawer/copyerDrawer.vue
index 2bcbacc..d97284d 100644
--- a/src/components/drawer/copyerDrawer.vue
+++ b/src/components/drawer/copyerDrawer.vue
@@ -59,7 +59,7 @@
 </script>
 
 <template>
-  <el-drawer v-model="visible" :append-to-body="true" title="抄送人设置" direction="rtl" custom-class="set_copyer" size="550px" :@close="closeDrawer">
+  <el-drawer v-model="visible" :append-to-body="true" title="抄送人设置" direction="rtl" custom-class="set_copyer" size="550px" @close="closeDrawer">
     <div class="demo-drawer__content">
       <div class="copyer_content drawer_content">
         <el-button type="primary" @click="addCopyer">
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 1644a80..23ac34d 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -303,6 +303,18 @@
         },
       },
       {
+        path: ':type',
+        name: 'ApplyListDetail',
+        component: () => import('@/views/device/receive/createOrCheck.vue'),
+        meta: {
+          title: '设备领用申请',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/receive/applyList',
+        },
+      },
+      {
         path: 'solveList',
         name: 'SolveList',
         component: () => import('@/views/device/receive/solveList.vue'),
@@ -312,6 +324,18 @@
           auth: '/device/receive/solveList',
         },
       },
+      {
+        path: 'solveCheck',
+        name: 'SolveListDetail',
+        component: () => import('@/views/device/receive/solveComponent/detail.vue'),
+        meta: {
+          title: '设备领用处理',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/receive/solveList',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 1f5cdcf..edac0e5 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -170,12 +170,38 @@
         component: () => import('@/views/system/process/process.vue'),
         meta: {
           title: '流程管理',
+          icon: 'ep:key',
           auth: '/sys/process',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/process',
         },
       },
+      {
+        path: 'edit',
+        name: 'ProcessListEdit',
+        component: () => import('@/views/system/process/editProcess.vue'),
+        meta: {
+          title: '流程管理',
+          icon: 'ep:key',
+          auth: '/sys/process',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/process/list',
+        },
+      },
+      {
+        path: 'detail',
+        name: 'ProcessListDetail',
+        component: () => import('@/views/system/process/detailProcess.vue'),
+        meta: {
+          title: '流程管理',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/process/list',
+        },
+      },
     ],
   },
   {
diff --git a/src/views/device/receive/applyList.vue b/src/views/device/receive/applyList.vue
index 34256c6..ee6107e 100644
--- a/src/views/device/receive/applyList.vue
+++ b/src/views/device/receive/applyList.vue
@@ -2,22 +2,16 @@
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { useRoute, useRouter } from 'vue-router'
 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: '', // 编号
@@ -115,9 +109,10 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
+const $router = useRouter()
 // 新建
 const add = () => {
-  typeValue.value = 'add'
+  $router.push({ path: '/receive/add', query: { typeValue: 'add' } })
 }
 // 导出
 const exportExcelBtn = () => {
@@ -147,9 +142,7 @@
 const exportAll = () => {
   exportExcelBtn()
 }
-const close = () => {
-  typeValue.value = 'normal'
-}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -232,7 +225,7 @@
     approveOpinion.value = '0'
   }
   else if (val === '查看') {
-    typeValue.value = 'check'
+    $router.push({ path: '/receive/check', query: { typeValue: 'check' } })
   }
 }
 // 按钮切换
@@ -271,7 +264,6 @@
 <template>
   <app-container>
     <search-area
-      v-if="typeValue !== 'add' && typeValue !== 'check'"
       :need-clear="true"
       @search="searchList" @clear="clearList"
     >
@@ -312,7 +304,7 @@
       </search-item>
     </search-area>
 
-    <table-container v-if="typeValue !== 'add' && typeValue !== 'check'">
+    <table-container>
       <template #btns-right>
         <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" />
@@ -330,7 +322,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="290">
+          <el-table-column label="操作" align="center" width="220">
             <template #default="{ row }">
               <el-button
                 size="small"
@@ -389,13 +381,8 @@
         </template>
       </normal-table>
     </table-container>
-    <button-box v-if="typeValue !== 'add' && typeValue !== 'check'" :active="active" @changeCurrentButton="changeCurrentButton" />
+    <button-box :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>
 

diff --git a/src/components/drawer/copyerDrawer.vue b/src/components/drawer/copyerDrawer.vue
index 2bcbacc..d97284d 100644
--- a/src/components/drawer/copyerDrawer.vue
+++ b/src/components/drawer/copyerDrawer.vue
@@ -59,7 +59,7 @@
 </script>
 
 <template>
-  <el-drawer v-model="visible" :append-to-body="true" title="抄送人设置" direction="rtl" custom-class="set_copyer" size="550px" :@close="closeDrawer">
+  <el-drawer v-model="visible" :append-to-body="true" title="抄送人设置" direction="rtl" custom-class="set_copyer" size="550px" @close="closeDrawer">
     <div class="demo-drawer__content">
       <div class="copyer_content drawer_content">
         <el-button type="primary" @click="addCopyer">
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 1644a80..23ac34d 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -303,6 +303,18 @@
         },
       },
       {
+        path: ':type',
+        name: 'ApplyListDetail',
+        component: () => import('@/views/device/receive/createOrCheck.vue'),
+        meta: {
+          title: '设备领用申请',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/receive/applyList',
+        },
+      },
+      {
         path: 'solveList',
         name: 'SolveList',
         component: () => import('@/views/device/receive/solveList.vue'),
@@ -312,6 +324,18 @@
           auth: '/device/receive/solveList',
         },
       },
+      {
+        path: 'solveCheck',
+        name: 'SolveListDetail',
+        component: () => import('@/views/device/receive/solveComponent/detail.vue'),
+        meta: {
+          title: '设备领用处理',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/receive/solveList',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 1f5cdcf..edac0e5 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -170,12 +170,38 @@
         component: () => import('@/views/system/process/process.vue'),
         meta: {
           title: '流程管理',
+          icon: 'ep:key',
           auth: '/sys/process',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/process',
         },
       },
+      {
+        path: 'edit',
+        name: 'ProcessListEdit',
+        component: () => import('@/views/system/process/editProcess.vue'),
+        meta: {
+          title: '流程管理',
+          icon: 'ep:key',
+          auth: '/sys/process',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/process/list',
+        },
+      },
+      {
+        path: 'detail',
+        name: 'ProcessListDetail',
+        component: () => import('@/views/system/process/detailProcess.vue'),
+        meta: {
+          title: '流程管理',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/process/list',
+        },
+      },
     ],
   },
   {
diff --git a/src/views/device/receive/applyList.vue b/src/views/device/receive/applyList.vue
index 34256c6..ee6107e 100644
--- a/src/views/device/receive/applyList.vue
+++ b/src/views/device/receive/applyList.vue
@@ -2,22 +2,16 @@
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { useRoute, useRouter } from 'vue-router'
 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: '', // 编号
@@ -115,9 +109,10 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
+const $router = useRouter()
 // 新建
 const add = () => {
-  typeValue.value = 'add'
+  $router.push({ path: '/receive/add', query: { typeValue: 'add' } })
 }
 // 导出
 const exportExcelBtn = () => {
@@ -147,9 +142,7 @@
 const exportAll = () => {
   exportExcelBtn()
 }
-const close = () => {
-  typeValue.value = 'normal'
-}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -232,7 +225,7 @@
     approveOpinion.value = '0'
   }
   else if (val === '查看') {
-    typeValue.value = 'check'
+    $router.push({ path: '/receive/check', query: { typeValue: 'check' } })
   }
 }
 // 按钮切换
@@ -271,7 +264,6 @@
 <template>
   <app-container>
     <search-area
-      v-if="typeValue !== 'add' && typeValue !== 'check'"
       :need-clear="true"
       @search="searchList" @clear="clearList"
     >
@@ -312,7 +304,7 @@
       </search-item>
     </search-area>
 
-    <table-container v-if="typeValue !== 'add' && typeValue !== 'check'">
+    <table-container>
       <template #btns-right>
         <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" />
@@ -330,7 +322,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="290">
+          <el-table-column label="操作" align="center" width="220">
             <template #default="{ row }">
               <el-button
                 size="small"
@@ -389,13 +381,8 @@
         </template>
       </normal-table>
     </table-container>
-    <button-box v-if="typeValue !== 'add' && typeValue !== 'check'" :active="active" @changeCurrentButton="changeCurrentButton" />
+    <button-box :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>
 
diff --git a/src/views/device/receive/createOrCheck.vue b/src/views/device/receive/createOrCheck.vue
index d2667cd..5355408 100644
--- a/src/views/device/receive/createOrCheck.vue
+++ b/src/views/device/receive/createOrCheck.vue
@@ -1,16 +1,14 @@
 <script lang="ts" setup name="CreateOrCheck">
-import { reactive, ref } from 'vue'
+import { onMounted, reactive, ref } from 'vue'
 import type { Ref } from 'vue'
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage } from 'element-plus'
+import { useRoute, useRouter } from 'vue-router'
 import type { IdeviceListQuery, Iform } from './receive'
 import SelectDeviceDialog from './selectDeviceDialog.vue'
 import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
-
-const props = defineProps({
-  typeValue: String,
-})
-const emits = defineEmits(['close'])
+const $route = useRoute()
+const typeValue = ref()
 const isMulti = ref(false) // 是否批量添加(允许多选)
 const selectIndex = ref()
 const { proxy } = getCurrentInstance() as any
@@ -18,11 +16,12 @@
 const isShowDialog = ref(false) // 控制审批对话框显隐
 const total = ref(20)// 总数
 const approveOpinion = ref() // 审批意见：1同意2驳回0拒绝
-const type = {
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
   add: '新建',
+  detail: '详情',
   check: '查看',
-  normal: '正常',
-}
+}// 字典
 const haveApproveLimits = ref(true)// 是否有审批权限
 const isStart = ref(false)// 是否是发起人
 // 选中的内容
@@ -207,9 +206,10 @@
   dialogSelectDiviceVisible.value = true
   isMulti.value = true
 }
+const $router = useRouter()
 // 点击关闭
 const close = () => {
-  emits('close')
+  $router.push('/receive/applyList')
 }
 // 选择设备对话框关闭
 const closeDialog = () => {
@@ -227,38 +227,38 @@
     list.value.splice(selectIndex.value, 1, val[0])
   }
 }
+
+onMounted(() => {
+  typeValue.value = $route.query.typeValue
+})
 </script>
 
 <template>
   <app-container>
+    <detail-page :title="`设备领用申请-${textMap[typeValue]}`">
+      <template #btns>
+        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('1')">
+          同意
+        </el-button>
+        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('2')">
+          驳回
+        </el-button>
+        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('0')">
+          拒绝
+        </el-button>
+        <el-button v-if="isStart && typeValue === 'add'" type="primary" @click="handleClick('3')">
+          提交
+        </el-button>
+        <el-button v-if="isStart && typeValue === 'add'" type="primary" @click="handleClick('4')">
+          撤回
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
     <div class="create-check">
       <div class="top-info">
-        <div class="title-button">
-          <h4 class="title">
-            基本信息
-          </h4>
-          <div class="button-group">
-            <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" plain @click="handleClick('1')">
-              同意
-            </el-button>
-            <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" plain @click="handleClick('2')">
-              驳回
-            </el-button>
-            <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" plain @click="handleClick('0')">
-              拒绝
-            </el-button>
-            <el-button v-if="isStart && typeValue === 'add'" type="primary" plain @click="handleClick('3')">
-              提交
-            </el-button>
-            <el-button v-if="isStart && typeValue === 'add'" type="primary" plain @click="handleClick('4')">
-              撤回
-            </el-button>
-            <el-button type="primary" plain @click="close">
-              关闭
-            </el-button>
-          </div>
-        </div>
-
         <div class="form-area">
           <el-form
             ref="ruleFormRef"
@@ -269,10 +269,10 @@
             <el-row :gutter="20">
               <el-col :span="12">
                 <el-form-item label="申请单位" prop="company">
-                  <el-input v-model="form.company" clearable />
+                  <el-input v-model="form.company" clearable :disabled="typeValue === 'check'" />
                 </el-form-item>
                 <el-form-item label="申请人" prop="person">
-                  <el-input v-model="form.person" clearable />
+                  <el-input v-model="form.person" clearable :disabled="typeValue === 'check'" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
@@ -281,10 +281,11 @@
                     v-model="form.time"
                     type="datetime"
                     placeholder="请选择领用时间"
+                    :disabled="typeValue === 'check'"
                   />
                 </el-form-item>
                 <el-form-item label="申请说明">
-                  <el-input v-model="form.state" type="textarea" clearable />
+                  <el-input v-model="form.state" type="textarea" clearable :disabled="typeValue === 'check'" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -293,13 +294,13 @@
       </div>
       <table-container title="设备领用列表">
         <template #btns-right>
-          <el-button type="primary" @click="multiAdd">
+          <el-button v-if="typeValue !== 'check'" type="primary" @click="multiAdd">
             批量添加
           </el-button>
-          <el-button type="primary" @click="addRow">
+          <el-button v-if="typeValue !== 'check'" type="primary" @click="addRow">
             增加行
           </el-button>
-          <el-button type="primary" @click="delRow">
+          <el-button v-if="typeValue !== 'check'" type="primary" @click="delRow">
             删除行
           </el-button>
         </template>
@@ -315,7 +316,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="120">
+            <el-table-column label="操作" align="center" width="60">
               <template #default="scope">
                 <el-button
                   size="small"
@@ -332,7 +333,7 @@
       </table-container>
 
       <table-container title="审批流程">
-        <!-- <normal-table
+      <!-- <normal-table
           :data="list" :total="total" :columns="columns" :query="listQuery"
           is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
@@ -360,25 +361,27 @@
         </normal-table> -->
       </table-container>
     </div>
-  </app-container>
-  <select-device-dialog
-    :dialog-select-divice-visible="dialogSelectDiviceVisible"
-    :is-multi="isMulti"
-    @closeDialog="closeDialog"
-    @updateDeviceConfirm="updateDeviceConfirm"
-  />
+    <select-device-dialog
+      :dialog-select-divice-visible="dialogSelectDiviceVisible"
+      :is-multi="isMulti"
+      @closeDialog="closeDialog"
+      @updateDeviceConfirm="updateDeviceConfirm"
+    />
 
-  <!-- 同意、驳回、拒绝对话框显示 -->
-  <receive-dialog
-    :is-show-dialog="isShowDialog"
-    :approve-opinion="approveOpinion"
-    @closeDialog="closeDialog"
-  />
+    <!-- 同意、驳回、拒绝对话框显示 -->
+    <receive-dialog
+      :is-show-dialog="isShowDialog"
+      :approve-opinion="approveOpinion"
+      @closeDialog="closeDialog"
+    />
+  </app-container>
 </template>
 
 <style lang="scss" scoped>
 // 样式
 .create-check {
+  margin-top: 10px;
+
   .top-info {
     display: flex;
     flex-direction: column;

diff --git a/src/components/drawer/copyerDrawer.vue b/src/components/drawer/copyerDrawer.vue
index 2bcbacc..d97284d 100644
--- a/src/components/drawer/copyerDrawer.vue
+++ b/src/components/drawer/copyerDrawer.vue
@@ -59,7 +59,7 @@
 </script>
 
 <template>
-  <el-drawer v-model="visible" :append-to-body="true" title="抄送人设置" direction="rtl" custom-class="set_copyer" size="550px" :@close="closeDrawer">
+  <el-drawer v-model="visible" :append-to-body="true" title="抄送人设置" direction="rtl" custom-class="set_copyer" size="550px" @close="closeDrawer">
     <div class="demo-drawer__content">
       <div class="copyer_content drawer_content">
         <el-button type="primary" @click="addCopyer">
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 1644a80..23ac34d 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -303,6 +303,18 @@
         },
       },
       {
+        path: ':type',
+        name: 'ApplyListDetail',
+        component: () => import('@/views/device/receive/createOrCheck.vue'),
+        meta: {
+          title: '设备领用申请',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/receive/applyList',
+        },
+      },
+      {
         path: 'solveList',
         name: 'SolveList',
         component: () => import('@/views/device/receive/solveList.vue'),
@@ -312,6 +324,18 @@
           auth: '/device/receive/solveList',
         },
       },
+      {
+        path: 'solveCheck',
+        name: 'SolveListDetail',
+        component: () => import('@/views/device/receive/solveComponent/detail.vue'),
+        meta: {
+          title: '设备领用处理',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/receive/solveList',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 1f5cdcf..edac0e5 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -170,12 +170,38 @@
         component: () => import('@/views/system/process/process.vue'),
         meta: {
           title: '流程管理',
+          icon: 'ep:key',
           auth: '/sys/process',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/process',
         },
       },
+      {
+        path: 'edit',
+        name: 'ProcessListEdit',
+        component: () => import('@/views/system/process/editProcess.vue'),
+        meta: {
+          title: '流程管理',
+          icon: 'ep:key',
+          auth: '/sys/process',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/process/list',
+        },
+      },
+      {
+        path: 'detail',
+        name: 'ProcessListDetail',
+        component: () => import('@/views/system/process/detailProcess.vue'),
+        meta: {
+          title: '流程管理',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/process/list',
+        },
+      },
     ],
   },
   {
diff --git a/src/views/device/receive/applyList.vue b/src/views/device/receive/applyList.vue
index 34256c6..ee6107e 100644
--- a/src/views/device/receive/applyList.vue
+++ b/src/views/device/receive/applyList.vue
@@ -2,22 +2,16 @@
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { useRoute, useRouter } from 'vue-router'
 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: '', // 编号
@@ -115,9 +109,10 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
+const $router = useRouter()
 // 新建
 const add = () => {
-  typeValue.value = 'add'
+  $router.push({ path: '/receive/add', query: { typeValue: 'add' } })
 }
 // 导出
 const exportExcelBtn = () => {
@@ -147,9 +142,7 @@
 const exportAll = () => {
   exportExcelBtn()
 }
-const close = () => {
-  typeValue.value = 'normal'
-}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -232,7 +225,7 @@
     approveOpinion.value = '0'
   }
   else if (val === '查看') {
-    typeValue.value = 'check'
+    $router.push({ path: '/receive/check', query: { typeValue: 'check' } })
   }
 }
 // 按钮切换
@@ -271,7 +264,6 @@
 <template>
   <app-container>
     <search-area
-      v-if="typeValue !== 'add' && typeValue !== 'check'"
       :need-clear="true"
       @search="searchList" @clear="clearList"
     >
@@ -312,7 +304,7 @@
       </search-item>
     </search-area>
 
-    <table-container v-if="typeValue !== 'add' && typeValue !== 'check'">
+    <table-container>
       <template #btns-right>
         <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" />
@@ -330,7 +322,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="290">
+          <el-table-column label="操作" align="center" width="220">
             <template #default="{ row }">
               <el-button
                 size="small"
@@ -389,13 +381,8 @@
         </template>
       </normal-table>
     </table-container>
-    <button-box v-if="typeValue !== 'add' && typeValue !== 'check'" :active="active" @changeCurrentButton="changeCurrentButton" />
+    <button-box :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>
 
diff --git a/src/views/device/receive/createOrCheck.vue b/src/views/device/receive/createOrCheck.vue
index d2667cd..5355408 100644
--- a/src/views/device/receive/createOrCheck.vue
+++ b/src/views/device/receive/createOrCheck.vue
@@ -1,16 +1,14 @@
 <script lang="ts" setup name="CreateOrCheck">
-import { reactive, ref } from 'vue'
+import { onMounted, reactive, ref } from 'vue'
 import type { Ref } from 'vue'
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage } from 'element-plus'
+import { useRoute, useRouter } from 'vue-router'
 import type { IdeviceListQuery, Iform } from './receive'
 import SelectDeviceDialog from './selectDeviceDialog.vue'
 import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
-
-const props = defineProps({
-  typeValue: String,
-})
-const emits = defineEmits(['close'])
+const $route = useRoute()
+const typeValue = ref()
 const isMulti = ref(false) // 是否批量添加(允许多选)
 const selectIndex = ref()
 const { proxy } = getCurrentInstance() as any
@@ -18,11 +16,12 @@
 const isShowDialog = ref(false) // 控制审批对话框显隐
 const total = ref(20)// 总数
 const approveOpinion = ref() // 审批意见：1同意2驳回0拒绝
-const type = {
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
   add: '新建',
+  detail: '详情',
   check: '查看',
-  normal: '正常',
-}
+}// 字典
 const haveApproveLimits = ref(true)// 是否有审批权限
 const isStart = ref(false)// 是否是发起人
 // 选中的内容
@@ -207,9 +206,10 @@
   dialogSelectDiviceVisible.value = true
   isMulti.value = true
 }
+const $router = useRouter()
 // 点击关闭
 const close = () => {
-  emits('close')
+  $router.push('/receive/applyList')
 }
 // 选择设备对话框关闭
 const closeDialog = () => {
@@ -227,38 +227,38 @@
     list.value.splice(selectIndex.value, 1, val[0])
   }
 }
+
+onMounted(() => {
+  typeValue.value = $route.query.typeValue
+})
 </script>
 
 <template>
   <app-container>
+    <detail-page :title="`设备领用申请-${textMap[typeValue]}`">
+      <template #btns>
+        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('1')">
+          同意
+        </el-button>
+        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('2')">
+          驳回
+        </el-button>
+        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('0')">
+          拒绝
+        </el-button>
+        <el-button v-if="isStart && typeValue === 'add'" type="primary" @click="handleClick('3')">
+          提交
+        </el-button>
+        <el-button v-if="isStart && typeValue === 'add'" type="primary" @click="handleClick('4')">
+          撤回
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
     <div class="create-check">
       <div class="top-info">
-        <div class="title-button">
-          <h4 class="title">
-            基本信息
-          </h4>
-          <div class="button-group">
-            <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" plain @click="handleClick('1')">
-              同意
-            </el-button>
-            <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" plain @click="handleClick('2')">
-              驳回
-            </el-button>
-            <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" plain @click="handleClick('0')">
-              拒绝
-            </el-button>
-            <el-button v-if="isStart && typeValue === 'add'" type="primary" plain @click="handleClick('3')">
-              提交
-            </el-button>
-            <el-button v-if="isStart && typeValue === 'add'" type="primary" plain @click="handleClick('4')">
-              撤回
-            </el-button>
-            <el-button type="primary" plain @click="close">
-              关闭
-            </el-button>
-          </div>
-        </div>
-
         <div class="form-area">
           <el-form
             ref="ruleFormRef"
@@ -269,10 +269,10 @@
             <el-row :gutter="20">
               <el-col :span="12">
                 <el-form-item label="申请单位" prop="company">
-                  <el-input v-model="form.company" clearable />
+                  <el-input v-model="form.company" clearable :disabled="typeValue === 'check'" />
                 </el-form-item>
                 <el-form-item label="申请人" prop="person">
-                  <el-input v-model="form.person" clearable />
+                  <el-input v-model="form.person" clearable :disabled="typeValue === 'check'" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
@@ -281,10 +281,11 @@
                     v-model="form.time"
                     type="datetime"
                     placeholder="请选择领用时间"
+                    :disabled="typeValue === 'check'"
                   />
                 </el-form-item>
                 <el-form-item label="申请说明">
-                  <el-input v-model="form.state" type="textarea" clearable />
+                  <el-input v-model="form.state" type="textarea" clearable :disabled="typeValue === 'check'" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -293,13 +294,13 @@
       </div>
       <table-container title="设备领用列表">
         <template #btns-right>
-          <el-button type="primary" @click="multiAdd">
+          <el-button v-if="typeValue !== 'check'" type="primary" @click="multiAdd">
             批量添加
           </el-button>
-          <el-button type="primary" @click="addRow">
+          <el-button v-if="typeValue !== 'check'" type="primary" @click="addRow">
             增加行
           </el-button>
-          <el-button type="primary" @click="delRow">
+          <el-button v-if="typeValue !== 'check'" type="primary" @click="delRow">
             删除行
           </el-button>
         </template>
@@ -315,7 +316,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="120">
+            <el-table-column label="操作" align="center" width="60">
               <template #default="scope">
                 <el-button
                   size="small"
@@ -332,7 +333,7 @@
       </table-container>
 
       <table-container title="审批流程">
-        <!-- <normal-table
+      <!-- <normal-table
           :data="list" :total="total" :columns="columns" :query="listQuery"
           is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
@@ -360,25 +361,27 @@
         </normal-table> -->
       </table-container>
     </div>
-  </app-container>
-  <select-device-dialog
-    :dialog-select-divice-visible="dialogSelectDiviceVisible"
-    :is-multi="isMulti"
-    @closeDialog="closeDialog"
-    @updateDeviceConfirm="updateDeviceConfirm"
-  />
+    <select-device-dialog
+      :dialog-select-divice-visible="dialogSelectDiviceVisible"
+      :is-multi="isMulti"
+      @closeDialog="closeDialog"
+      @updateDeviceConfirm="updateDeviceConfirm"
+    />
 
-  <!-- 同意、驳回、拒绝对话框显示 -->
-  <receive-dialog
-    :is-show-dialog="isShowDialog"
-    :approve-opinion="approveOpinion"
-    @closeDialog="closeDialog"
-  />
+    <!-- 同意、驳回、拒绝对话框显示 -->
+    <receive-dialog
+      :is-show-dialog="isShowDialog"
+      :approve-opinion="approveOpinion"
+      @closeDialog="closeDialog"
+    />
+  </app-container>
 </template>
 
 <style lang="scss" scoped>
 // 样式
 .create-check {
+  margin-top: 10px;
+
   .top-info {
     display: flex;
     flex-direction: column;
diff --git a/src/views/device/receive/solveComponent/detail.vue b/src/views/device/receive/solveComponent/detail.vue
index 6091fc5..aa6cb58 100644
--- a/src/views/device/receive/solveComponent/detail.vue
+++ b/src/views/device/receive/solveComponent/detail.vue
@@ -6,13 +6,8 @@
 const props = defineProps({
   typeValue: String,
 })
-const emits = defineEmits(['close'])
 const { proxy } = getCurrentInstance() as any
 const total = ref(20)// 总数
-const type = {
-  check: '查看',
-  normal: '正常',
-}
 
 // 表单数据
 const form = ref({
@@ -99,8 +94,9 @@
   // fetchData(true)
 }
 // 点击关闭
+const $router = useRouter()
 const close = () => {
-  emits('close')
+  $router.push('/receive/solveList')
 }
 // 打印
 const printObj = ref({
@@ -133,52 +129,51 @@
 
 <template>
   <app-container>
+    <detail-page title="设备领用处理-查看">
+      <template #btns>
+        <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
     <div id="lysq" class="lysq-create-check">
       <div class="top-info">
-        <div class="title-button">
-          <h4 class="title">
-            领用申请
-          </h4>
-          <div class="button-group">
-            <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
-              打印
-            </el-button>
-            <el-button type="primary" plain @click="close">
-              关闭
-            </el-button>
+        <detail-block title="领用申请">
+          <div class="form-area">
+            <el-form
+              ref="ruleFormRef"
+              :model="form"
+              label-width="120px"
+            >
+              <el-row :gutter="20">
+                <el-col :span="12">
+                  <el-form-item label="申请单位">
+                    <el-input v-model="form.company" clearable disabled />
+                  </el-form-item>
+                  <el-form-item label="申请人">
+                    <el-input v-model="form.person" clearable disabled />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="领用时间">
+                    <el-date-picker
+                      v-model="form.time"
+                      type="datetime"
+                      placeholder="请选择领用时间"
+                      disabled
+                    />
+                  </el-form-item>
+                  <el-form-item label="申请说明">
+                    <el-input v-model="form.state" type="textarea" clearable disabled />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
           </div>
-        </div>
-
-        <div class="form-area">
-          <el-form
-            ref="ruleFormRef"
-            :model="form"
-            label-width="120px"
-          >
-            <el-row :gutter="20">
-              <el-col :span="12">
-                <el-form-item label="申请单位">
-                  <el-input v-model="form.company" clearable />
-                </el-form-item>
-                <el-form-item label="申请人">
-                  <el-input v-model="form.person" clearable />
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="领用时间">
-                  <el-date-picker
-                    v-model="form.time"
-                    type="datetime"
-                    placeholder="请选择领用时间"
-                  />
-                </el-form-item>
-                <el-form-item label="申请说明">
-                  <el-input v-model="form.state" type="textarea" clearable />
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </el-form>
-        </div>
+        </detail-block>
       </div>
       <table-container title="设备领用列表">
         <normal-table
@@ -230,6 +225,8 @@
 <style lang="scss" scoped>
 // 样式
 .lysq-create-check {
+  margin-top: 10px;
+
   .top-info {
     display: flex;
     flex-direction: column;

diff --git a/src/components/drawer/copyerDrawer.vue b/src/components/drawer/copyerDrawer.vue
index 2bcbacc..d97284d 100644
--- a/src/components/drawer/copyerDrawer.vue
+++ b/src/components/drawer/copyerDrawer.vue
@@ -59,7 +59,7 @@
 </script>
 
 <template>
-  <el-drawer v-model="visible" :append-to-body="true" title="抄送人设置" direction="rtl" custom-class="set_copyer" size="550px" :@close="closeDrawer">
+  <el-drawer v-model="visible" :append-to-body="true" title="抄送人设置" direction="rtl" custom-class="set_copyer" size="550px" @close="closeDrawer">
     <div class="demo-drawer__content">
       <div class="copyer_content drawer_content">
         <el-button type="primary" @click="addCopyer">
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 1644a80..23ac34d 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -303,6 +303,18 @@
         },
       },
       {
+        path: ':type',
+        name: 'ApplyListDetail',
+        component: () => import('@/views/device/receive/createOrCheck.vue'),
+        meta: {
+          title: '设备领用申请',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/receive/applyList',
+        },
+      },
+      {
         path: 'solveList',
         name: 'SolveList',
         component: () => import('@/views/device/receive/solveList.vue'),
@@ -312,6 +324,18 @@
           auth: '/device/receive/solveList',
         },
       },
+      {
+        path: 'solveCheck',
+        name: 'SolveListDetail',
+        component: () => import('@/views/device/receive/solveComponent/detail.vue'),
+        meta: {
+          title: '设备领用处理',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/receive/solveList',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 1f5cdcf..edac0e5 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -170,12 +170,38 @@
         component: () => import('@/views/system/process/process.vue'),
         meta: {
           title: '流程管理',
+          icon: 'ep:key',
           auth: '/sys/process',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/process',
         },
       },
+      {
+        path: 'edit',
+        name: 'ProcessListEdit',
+        component: () => import('@/views/system/process/editProcess.vue'),
+        meta: {
+          title: '流程管理',
+          icon: 'ep:key',
+          auth: '/sys/process',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/process/list',
+        },
+      },
+      {
+        path: 'detail',
+        name: 'ProcessListDetail',
+        component: () => import('@/views/system/process/detailProcess.vue'),
+        meta: {
+          title: '流程管理',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/process/list',
+        },
+      },
     ],
   },
   {
diff --git a/src/views/device/receive/applyList.vue b/src/views/device/receive/applyList.vue
index 34256c6..ee6107e 100644
--- a/src/views/device/receive/applyList.vue
+++ b/src/views/device/receive/applyList.vue
@@ -2,22 +2,16 @@
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { useRoute, useRouter } from 'vue-router'
 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: '', // 编号
@@ -115,9 +109,10 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
+const $router = useRouter()
 // 新建
 const add = () => {
-  typeValue.value = 'add'
+  $router.push({ path: '/receive/add', query: { typeValue: 'add' } })
 }
 // 导出
 const exportExcelBtn = () => {
@@ -147,9 +142,7 @@
 const exportAll = () => {
   exportExcelBtn()
 }
-const close = () => {
-  typeValue.value = 'normal'
-}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -232,7 +225,7 @@
     approveOpinion.value = '0'
   }
   else if (val === '查看') {
-    typeValue.value = 'check'
+    $router.push({ path: '/receive/check', query: { typeValue: 'check' } })
   }
 }
 // 按钮切换
@@ -271,7 +264,6 @@
 <template>
   <app-container>
     <search-area
-      v-if="typeValue !== 'add' && typeValue !== 'check'"
       :need-clear="true"
       @search="searchList" @clear="clearList"
     >
@@ -312,7 +304,7 @@
       </search-item>
     </search-area>
 
-    <table-container v-if="typeValue !== 'add' && typeValue !== 'check'">
+    <table-container>
       <template #btns-right>
         <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" />
@@ -330,7 +322,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="290">
+          <el-table-column label="操作" align="center" width="220">
             <template #default="{ row }">
               <el-button
                 size="small"
@@ -389,13 +381,8 @@
         </template>
       </normal-table>
     </table-container>
-    <button-box v-if="typeValue !== 'add' && typeValue !== 'check'" :active="active" @changeCurrentButton="changeCurrentButton" />
+    <button-box :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>
 
diff --git a/src/views/device/receive/createOrCheck.vue b/src/views/device/receive/createOrCheck.vue
index d2667cd..5355408 100644
--- a/src/views/device/receive/createOrCheck.vue
+++ b/src/views/device/receive/createOrCheck.vue
@@ -1,16 +1,14 @@
 <script lang="ts" setup name="CreateOrCheck">
-import { reactive, ref } from 'vue'
+import { onMounted, reactive, ref } from 'vue'
 import type { Ref } from 'vue'
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage } from 'element-plus'
+import { useRoute, useRouter } from 'vue-router'
 import type { IdeviceListQuery, Iform } from './receive'
 import SelectDeviceDialog from './selectDeviceDialog.vue'
 import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
-
-const props = defineProps({
-  typeValue: String,
-})
-const emits = defineEmits(['close'])
+const $route = useRoute()
+const typeValue = ref()
 const isMulti = ref(false) // 是否批量添加(允许多选)
 const selectIndex = ref()
 const { proxy } = getCurrentInstance() as any
@@ -18,11 +16,12 @@
 const isShowDialog = ref(false) // 控制审批对话框显隐
 const total = ref(20)// 总数
 const approveOpinion = ref() // 审批意见：1同意2驳回0拒绝
-const type = {
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
   add: '新建',
+  detail: '详情',
   check: '查看',
-  normal: '正常',
-}
+}// 字典
 const haveApproveLimits = ref(true)// 是否有审批权限
 const isStart = ref(false)// 是否是发起人
 // 选中的内容
@@ -207,9 +206,10 @@
   dialogSelectDiviceVisible.value = true
   isMulti.value = true
 }
+const $router = useRouter()
 // 点击关闭
 const close = () => {
-  emits('close')
+  $router.push('/receive/applyList')
 }
 // 选择设备对话框关闭
 const closeDialog = () => {
@@ -227,38 +227,38 @@
     list.value.splice(selectIndex.value, 1, val[0])
   }
 }
+
+onMounted(() => {
+  typeValue.value = $route.query.typeValue
+})
 </script>
 
 <template>
   <app-container>
+    <detail-page :title="`设备领用申请-${textMap[typeValue]}`">
+      <template #btns>
+        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('1')">
+          同意
+        </el-button>
+        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('2')">
+          驳回
+        </el-button>
+        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('0')">
+          拒绝
+        </el-button>
+        <el-button v-if="isStart && typeValue === 'add'" type="primary" @click="handleClick('3')">
+          提交
+        </el-button>
+        <el-button v-if="isStart && typeValue === 'add'" type="primary" @click="handleClick('4')">
+          撤回
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
     <div class="create-check">
       <div class="top-info">
-        <div class="title-button">
-          <h4 class="title">
-            基本信息
-          </h4>
-          <div class="button-group">
-            <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" plain @click="handleClick('1')">
-              同意
-            </el-button>
-            <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" plain @click="handleClick('2')">
-              驳回
-            </el-button>
-            <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" plain @click="handleClick('0')">
-              拒绝
-            </el-button>
-            <el-button v-if="isStart && typeValue === 'add'" type="primary" plain @click="handleClick('3')">
-              提交
-            </el-button>
-            <el-button v-if="isStart && typeValue === 'add'" type="primary" plain @click="handleClick('4')">
-              撤回
-            </el-button>
-            <el-button type="primary" plain @click="close">
-              关闭
-            </el-button>
-          </div>
-        </div>
-
         <div class="form-area">
           <el-form
             ref="ruleFormRef"
@@ -269,10 +269,10 @@
             <el-row :gutter="20">
               <el-col :span="12">
                 <el-form-item label="申请单位" prop="company">
-                  <el-input v-model="form.company" clearable />
+                  <el-input v-model="form.company" clearable :disabled="typeValue === 'check'" />
                 </el-form-item>
                 <el-form-item label="申请人" prop="person">
-                  <el-input v-model="form.person" clearable />
+                  <el-input v-model="form.person" clearable :disabled="typeValue === 'check'" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
@@ -281,10 +281,11 @@
                     v-model="form.time"
                     type="datetime"
                     placeholder="请选择领用时间"
+                    :disabled="typeValue === 'check'"
                   />
                 </el-form-item>
                 <el-form-item label="申请说明">
-                  <el-input v-model="form.state" type="textarea" clearable />
+                  <el-input v-model="form.state" type="textarea" clearable :disabled="typeValue === 'check'" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -293,13 +294,13 @@
       </div>
       <table-container title="设备领用列表">
         <template #btns-right>
-          <el-button type="primary" @click="multiAdd">
+          <el-button v-if="typeValue !== 'check'" type="primary" @click="multiAdd">
             批量添加
           </el-button>
-          <el-button type="primary" @click="addRow">
+          <el-button v-if="typeValue !== 'check'" type="primary" @click="addRow">
             增加行
           </el-button>
-          <el-button type="primary" @click="delRow">
+          <el-button v-if="typeValue !== 'check'" type="primary" @click="delRow">
             删除行
           </el-button>
         </template>
@@ -315,7 +316,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="120">
+            <el-table-column label="操作" align="center" width="60">
               <template #default="scope">
                 <el-button
                   size="small"
@@ -332,7 +333,7 @@
       </table-container>
 
       <table-container title="审批流程">
-        <!-- <normal-table
+      <!-- <normal-table
           :data="list" :total="total" :columns="columns" :query="listQuery"
           is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
@@ -360,25 +361,27 @@
         </normal-table> -->
       </table-container>
     </div>
-  </app-container>
-  <select-device-dialog
-    :dialog-select-divice-visible="dialogSelectDiviceVisible"
-    :is-multi="isMulti"
-    @closeDialog="closeDialog"
-    @updateDeviceConfirm="updateDeviceConfirm"
-  />
+    <select-device-dialog
+      :dialog-select-divice-visible="dialogSelectDiviceVisible"
+      :is-multi="isMulti"
+      @closeDialog="closeDialog"
+      @updateDeviceConfirm="updateDeviceConfirm"
+    />
 
-  <!-- 同意、驳回、拒绝对话框显示 -->
-  <receive-dialog
-    :is-show-dialog="isShowDialog"
-    :approve-opinion="approveOpinion"
-    @closeDialog="closeDialog"
-  />
+    <!-- 同意、驳回、拒绝对话框显示 -->
+    <receive-dialog
+      :is-show-dialog="isShowDialog"
+      :approve-opinion="approveOpinion"
+      @closeDialog="closeDialog"
+    />
+  </app-container>
 </template>
 
 <style lang="scss" scoped>
 // 样式
 .create-check {
+  margin-top: 10px;
+
   .top-info {
     display: flex;
     flex-direction: column;
diff --git a/src/views/device/receive/solveComponent/detail.vue b/src/views/device/receive/solveComponent/detail.vue
index 6091fc5..aa6cb58 100644
--- a/src/views/device/receive/solveComponent/detail.vue
+++ b/src/views/device/receive/solveComponent/detail.vue
@@ -6,13 +6,8 @@
 const props = defineProps({
   typeValue: String,
 })
-const emits = defineEmits(['close'])
 const { proxy } = getCurrentInstance() as any
 const total = ref(20)// 总数
-const type = {
-  check: '查看',
-  normal: '正常',
-}
 
 // 表单数据
 const form = ref({
@@ -99,8 +94,9 @@
   // fetchData(true)
 }
 // 点击关闭
+const $router = useRouter()
 const close = () => {
-  emits('close')
+  $router.push('/receive/solveList')
 }
 // 打印
 const printObj = ref({
@@ -133,52 +129,51 @@
 
 <template>
   <app-container>
+    <detail-page title="设备领用处理-查看">
+      <template #btns>
+        <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
     <div id="lysq" class="lysq-create-check">
       <div class="top-info">
-        <div class="title-button">
-          <h4 class="title">
-            领用申请
-          </h4>
-          <div class="button-group">
-            <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
-              打印
-            </el-button>
-            <el-button type="primary" plain @click="close">
-              关闭
-            </el-button>
+        <detail-block title="领用申请">
+          <div class="form-area">
+            <el-form
+              ref="ruleFormRef"
+              :model="form"
+              label-width="120px"
+            >
+              <el-row :gutter="20">
+                <el-col :span="12">
+                  <el-form-item label="申请单位">
+                    <el-input v-model="form.company" clearable disabled />
+                  </el-form-item>
+                  <el-form-item label="申请人">
+                    <el-input v-model="form.person" clearable disabled />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="领用时间">
+                    <el-date-picker
+                      v-model="form.time"
+                      type="datetime"
+                      placeholder="请选择领用时间"
+                      disabled
+                    />
+                  </el-form-item>
+                  <el-form-item label="申请说明">
+                    <el-input v-model="form.state" type="textarea" clearable disabled />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
           </div>
-        </div>
-
-        <div class="form-area">
-          <el-form
-            ref="ruleFormRef"
-            :model="form"
-            label-width="120px"
-          >
-            <el-row :gutter="20">
-              <el-col :span="12">
-                <el-form-item label="申请单位">
-                  <el-input v-model="form.company" clearable />
-                </el-form-item>
-                <el-form-item label="申请人">
-                  <el-input v-model="form.person" clearable />
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="领用时间">
-                  <el-date-picker
-                    v-model="form.time"
-                    type="datetime"
-                    placeholder="请选择领用时间"
-                  />
-                </el-form-item>
-                <el-form-item label="申请说明">
-                  <el-input v-model="form.state" type="textarea" clearable />
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </el-form>
-        </div>
+        </detail-block>
       </div>
       <table-container title="设备领用列表">
         <normal-table
@@ -230,6 +225,8 @@
 <style lang="scss" scoped>
 // 样式
 .lysq-create-check {
+  margin-top: 10px;
+
   .top-info {
     display: flex;
     flex-direction: column;
diff --git a/src/views/device/receive/solveList.vue b/src/views/device/receive/solveList.vue
index 7c737d6..f1db533 100644
--- a/src/views/device/receive/solveList.vue
+++ b/src/views/device/receive/solveList.vue
@@ -2,11 +2,11 @@
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { useRoute, useRouter } from 'vue-router'
 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') // 选中的按钮
@@ -14,7 +14,6 @@
   check: '查看',
   normal: '正常',
 }
-const typeValue = ref('normal')
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
   number: '', // 编号
@@ -130,9 +129,6 @@
 const exportAll = () => {
   exportExcelBtn()
 }
-const close = () => {
-  typeValue.value = 'normal'
-}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -165,6 +161,7 @@
   extarCss: '',
 })
 // 操作
+const $router = useRouter()
 const handleEdit = (index: number, row: IsolveListType, val: string) => {
   if (val === '领用') {
     ElMessageBox.confirm(
@@ -221,7 +218,7 @@
       })
   }
   else if (val === '查看') {
-    typeValue.value = 'check'
+    $router.push('/receive/solveCheck')
   }
 }
 // 右上角按钮切换
@@ -245,7 +242,6 @@
 <template>
   <app-container>
     <search-area
-      v-if="typeValue !== 'check'"
       :need-clear="true"
       @search="searchList" @clear="clearList"
     >
@@ -286,7 +282,7 @@
       </search-item>
     </search-area>
 
-    <table-container v-if="typeValue !== 'check'">
+    <table-container>
       <template #btns-right>
         <el-button v-if="proxy.hasPerm('/measure/measureSource/add')" type="primary" @click="execTag">
           标签识别
@@ -306,7 +302,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="180">
+          <el-table-column label="操作" align="center" width="130">
             <template #default="{ row }">
               <el-button
                 size="small"
@@ -350,11 +346,9 @@
       </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>
 

diff --git a/src/components/drawer/copyerDrawer.vue b/src/components/drawer/copyerDrawer.vue
index 2bcbacc..d97284d 100644
--- a/src/components/drawer/copyerDrawer.vue
+++ b/src/components/drawer/copyerDrawer.vue
@@ -59,7 +59,7 @@
 </script>
 
 <template>
-  <el-drawer v-model="visible" :append-to-body="true" title="抄送人设置" direction="rtl" custom-class="set_copyer" size="550px" :@close="closeDrawer">
+  <el-drawer v-model="visible" :append-to-body="true" title="抄送人设置" direction="rtl" custom-class="set_copyer" size="550px" @close="closeDrawer">
     <div class="demo-drawer__content">
       <div class="copyer_content drawer_content">
         <el-button type="primary" @click="addCopyer">
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 1644a80..23ac34d 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -303,6 +303,18 @@
         },
       },
       {
+        path: ':type',
+        name: 'ApplyListDetail',
+        component: () => import('@/views/device/receive/createOrCheck.vue'),
+        meta: {
+          title: '设备领用申请',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/receive/applyList',
+        },
+      },
+      {
         path: 'solveList',
         name: 'SolveList',
         component: () => import('@/views/device/receive/solveList.vue'),
@@ -312,6 +324,18 @@
           auth: '/device/receive/solveList',
         },
       },
+      {
+        path: 'solveCheck',
+        name: 'SolveListDetail',
+        component: () => import('@/views/device/receive/solveComponent/detail.vue'),
+        meta: {
+          title: '设备领用处理',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/receive/solveList',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 1f5cdcf..edac0e5 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -170,12 +170,38 @@
         component: () => import('@/views/system/process/process.vue'),
         meta: {
           title: '流程管理',
+          icon: 'ep:key',
           auth: '/sys/process',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/process',
         },
       },
+      {
+        path: 'edit',
+        name: 'ProcessListEdit',
+        component: () => import('@/views/system/process/editProcess.vue'),
+        meta: {
+          title: '流程管理',
+          icon: 'ep:key',
+          auth: '/sys/process',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/process/list',
+        },
+      },
+      {
+        path: 'detail',
+        name: 'ProcessListDetail',
+        component: () => import('@/views/system/process/detailProcess.vue'),
+        meta: {
+          title: '流程管理',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/process/list',
+        },
+      },
     ],
   },
   {
diff --git a/src/views/device/receive/applyList.vue b/src/views/device/receive/applyList.vue
index 34256c6..ee6107e 100644
--- a/src/views/device/receive/applyList.vue
+++ b/src/views/device/receive/applyList.vue
@@ -2,22 +2,16 @@
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { useRoute, useRouter } from 'vue-router'
 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: '', // 编号
@@ -115,9 +109,10 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
+const $router = useRouter()
 // 新建
 const add = () => {
-  typeValue.value = 'add'
+  $router.push({ path: '/receive/add', query: { typeValue: 'add' } })
 }
 // 导出
 const exportExcelBtn = () => {
@@ -147,9 +142,7 @@
 const exportAll = () => {
   exportExcelBtn()
 }
-const close = () => {
-  typeValue.value = 'normal'
-}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -232,7 +225,7 @@
     approveOpinion.value = '0'
   }
   else if (val === '查看') {
-    typeValue.value = 'check'
+    $router.push({ path: '/receive/check', query: { typeValue: 'check' } })
   }
 }
 // 按钮切换
@@ -271,7 +264,6 @@
 <template>
   <app-container>
     <search-area
-      v-if="typeValue !== 'add' && typeValue !== 'check'"
       :need-clear="true"
       @search="searchList" @clear="clearList"
     >
@@ -312,7 +304,7 @@
       </search-item>
     </search-area>
 
-    <table-container v-if="typeValue !== 'add' && typeValue !== 'check'">
+    <table-container>
       <template #btns-right>
         <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" />
@@ -330,7 +322,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="290">
+          <el-table-column label="操作" align="center" width="220">
             <template #default="{ row }">
               <el-button
                 size="small"
@@ -389,13 +381,8 @@
         </template>
       </normal-table>
     </table-container>
-    <button-box v-if="typeValue !== 'add' && typeValue !== 'check'" :active="active" @changeCurrentButton="changeCurrentButton" />
+    <button-box :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>
 
diff --git a/src/views/device/receive/createOrCheck.vue b/src/views/device/receive/createOrCheck.vue
index d2667cd..5355408 100644
--- a/src/views/device/receive/createOrCheck.vue
+++ b/src/views/device/receive/createOrCheck.vue
@@ -1,16 +1,14 @@
 <script lang="ts" setup name="CreateOrCheck">
-import { reactive, ref } from 'vue'
+import { onMounted, reactive, ref } from 'vue'
 import type { Ref } from 'vue'
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage } from 'element-plus'
+import { useRoute, useRouter } from 'vue-router'
 import type { IdeviceListQuery, Iform } from './receive'
 import SelectDeviceDialog from './selectDeviceDialog.vue'
 import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
-
-const props = defineProps({
-  typeValue: String,
-})
-const emits = defineEmits(['close'])
+const $route = useRoute()
+const typeValue = ref()
 const isMulti = ref(false) // 是否批量添加(允许多选)
 const selectIndex = ref()
 const { proxy } = getCurrentInstance() as any
@@ -18,11 +16,12 @@
 const isShowDialog = ref(false) // 控制审批对话框显隐
 const total = ref(20)// 总数
 const approveOpinion = ref() // 审批意见：1同意2驳回0拒绝
-const type = {
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
   add: '新建',
+  detail: '详情',
   check: '查看',
-  normal: '正常',
-}
+}// 字典
 const haveApproveLimits = ref(true)// 是否有审批权限
 const isStart = ref(false)// 是否是发起人
 // 选中的内容
@@ -207,9 +206,10 @@
   dialogSelectDiviceVisible.value = true
   isMulti.value = true
 }
+const $router = useRouter()
 // 点击关闭
 const close = () => {
-  emits('close')
+  $router.push('/receive/applyList')
 }
 // 选择设备对话框关闭
 const closeDialog = () => {
@@ -227,38 +227,38 @@
     list.value.splice(selectIndex.value, 1, val[0])
   }
 }
+
+onMounted(() => {
+  typeValue.value = $route.query.typeValue
+})
 </script>
 
 <template>
   <app-container>
+    <detail-page :title="`设备领用申请-${textMap[typeValue]}`">
+      <template #btns>
+        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('1')">
+          同意
+        </el-button>
+        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('2')">
+          驳回
+        </el-button>
+        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('0')">
+          拒绝
+        </el-button>
+        <el-button v-if="isStart && typeValue === 'add'" type="primary" @click="handleClick('3')">
+          提交
+        </el-button>
+        <el-button v-if="isStart && typeValue === 'add'" type="primary" @click="handleClick('4')">
+          撤回
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
     <div class="create-check">
       <div class="top-info">
-        <div class="title-button">
-          <h4 class="title">
-            基本信息
-          </h4>
-          <div class="button-group">
-            <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" plain @click="handleClick('1')">
-              同意
-            </el-button>
-            <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" plain @click="handleClick('2')">
-              驳回
-            </el-button>
-            <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" plain @click="handleClick('0')">
-              拒绝
-            </el-button>
-            <el-button v-if="isStart && typeValue === 'add'" type="primary" plain @click="handleClick('3')">
-              提交
-            </el-button>
-            <el-button v-if="isStart && typeValue === 'add'" type="primary" plain @click="handleClick('4')">
-              撤回
-            </el-button>
-            <el-button type="primary" plain @click="close">
-              关闭
-            </el-button>
-          </div>
-        </div>
-
         <div class="form-area">
           <el-form
             ref="ruleFormRef"
@@ -269,10 +269,10 @@
             <el-row :gutter="20">
               <el-col :span="12">
                 <el-form-item label="申请单位" prop="company">
-                  <el-input v-model="form.company" clearable />
+                  <el-input v-model="form.company" clearable :disabled="typeValue === 'check'" />
                 </el-form-item>
                 <el-form-item label="申请人" prop="person">
-                  <el-input v-model="form.person" clearable />
+                  <el-input v-model="form.person" clearable :disabled="typeValue === 'check'" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
@@ -281,10 +281,11 @@
                     v-model="form.time"
                     type="datetime"
                     placeholder="请选择领用时间"
+                    :disabled="typeValue === 'check'"
                   />
                 </el-form-item>
                 <el-form-item label="申请说明">
-                  <el-input v-model="form.state" type="textarea" clearable />
+                  <el-input v-model="form.state" type="textarea" clearable :disabled="typeValue === 'check'" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -293,13 +294,13 @@
       </div>
       <table-container title="设备领用列表">
         <template #btns-right>
-          <el-button type="primary" @click="multiAdd">
+          <el-button v-if="typeValue !== 'check'" type="primary" @click="multiAdd">
             批量添加
           </el-button>
-          <el-button type="primary" @click="addRow">
+          <el-button v-if="typeValue !== 'check'" type="primary" @click="addRow">
             增加行
           </el-button>
-          <el-button type="primary" @click="delRow">
+          <el-button v-if="typeValue !== 'check'" type="primary" @click="delRow">
             删除行
           </el-button>
         </template>
@@ -315,7 +316,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="120">
+            <el-table-column label="操作" align="center" width="60">
               <template #default="scope">
                 <el-button
                   size="small"
@@ -332,7 +333,7 @@
       </table-container>
 
       <table-container title="审批流程">
-        <!-- <normal-table
+      <!-- <normal-table
           :data="list" :total="total" :columns="columns" :query="listQuery"
           is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
@@ -360,25 +361,27 @@
         </normal-table> -->
       </table-container>
     </div>
-  </app-container>
-  <select-device-dialog
-    :dialog-select-divice-visible="dialogSelectDiviceVisible"
-    :is-multi="isMulti"
-    @closeDialog="closeDialog"
-    @updateDeviceConfirm="updateDeviceConfirm"
-  />
+    <select-device-dialog
+      :dialog-select-divice-visible="dialogSelectDiviceVisible"
+      :is-multi="isMulti"
+      @closeDialog="closeDialog"
+      @updateDeviceConfirm="updateDeviceConfirm"
+    />
 
-  <!-- 同意、驳回、拒绝对话框显示 -->
-  <receive-dialog
-    :is-show-dialog="isShowDialog"
-    :approve-opinion="approveOpinion"
-    @closeDialog="closeDialog"
-  />
+    <!-- 同意、驳回、拒绝对话框显示 -->
+    <receive-dialog
+      :is-show-dialog="isShowDialog"
+      :approve-opinion="approveOpinion"
+      @closeDialog="closeDialog"
+    />
+  </app-container>
 </template>
 
 <style lang="scss" scoped>
 // 样式
 .create-check {
+  margin-top: 10px;
+
   .top-info {
     display: flex;
     flex-direction: column;
diff --git a/src/views/device/receive/solveComponent/detail.vue b/src/views/device/receive/solveComponent/detail.vue
index 6091fc5..aa6cb58 100644
--- a/src/views/device/receive/solveComponent/detail.vue
+++ b/src/views/device/receive/solveComponent/detail.vue
@@ -6,13 +6,8 @@
 const props = defineProps({
   typeValue: String,
 })
-const emits = defineEmits(['close'])
 const { proxy } = getCurrentInstance() as any
 const total = ref(20)// 总数
-const type = {
-  check: '查看',
-  normal: '正常',
-}
 
 // 表单数据
 const form = ref({
@@ -99,8 +94,9 @@
   // fetchData(true)
 }
 // 点击关闭
+const $router = useRouter()
 const close = () => {
-  emits('close')
+  $router.push('/receive/solveList')
 }
 // 打印
 const printObj = ref({
@@ -133,52 +129,51 @@
 
 <template>
   <app-container>
+    <detail-page title="设备领用处理-查看">
+      <template #btns>
+        <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
     <div id="lysq" class="lysq-create-check">
       <div class="top-info">
-        <div class="title-button">
-          <h4 class="title">
-            领用申请
-          </h4>
-          <div class="button-group">
-            <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
-              打印
-            </el-button>
-            <el-button type="primary" plain @click="close">
-              关闭
-            </el-button>
+        <detail-block title="领用申请">
+          <div class="form-area">
+            <el-form
+              ref="ruleFormRef"
+              :model="form"
+              label-width="120px"
+            >
+              <el-row :gutter="20">
+                <el-col :span="12">
+                  <el-form-item label="申请单位">
+                    <el-input v-model="form.company" clearable disabled />
+                  </el-form-item>
+                  <el-form-item label="申请人">
+                    <el-input v-model="form.person" clearable disabled />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="领用时间">
+                    <el-date-picker
+                      v-model="form.time"
+                      type="datetime"
+                      placeholder="请选择领用时间"
+                      disabled
+                    />
+                  </el-form-item>
+                  <el-form-item label="申请说明">
+                    <el-input v-model="form.state" type="textarea" clearable disabled />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
           </div>
-        </div>
-
-        <div class="form-area">
-          <el-form
-            ref="ruleFormRef"
-            :model="form"
-            label-width="120px"
-          >
-            <el-row :gutter="20">
-              <el-col :span="12">
-                <el-form-item label="申请单位">
-                  <el-input v-model="form.company" clearable />
-                </el-form-item>
-                <el-form-item label="申请人">
-                  <el-input v-model="form.person" clearable />
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="领用时间">
-                  <el-date-picker
-                    v-model="form.time"
-                    type="datetime"
-                    placeholder="请选择领用时间"
-                  />
-                </el-form-item>
-                <el-form-item label="申请说明">
-                  <el-input v-model="form.state" type="textarea" clearable />
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </el-form>
-        </div>
+        </detail-block>
       </div>
       <table-container title="设备领用列表">
         <normal-table
@@ -230,6 +225,8 @@
 <style lang="scss" scoped>
 // 样式
 .lysq-create-check {
+  margin-top: 10px;
+
   .top-info {
     display: flex;
     flex-direction: column;
diff --git a/src/views/device/receive/solveList.vue b/src/views/device/receive/solveList.vue
index 7c737d6..f1db533 100644
--- a/src/views/device/receive/solveList.vue
+++ b/src/views/device/receive/solveList.vue
@@ -2,11 +2,11 @@
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { useRoute, useRouter } from 'vue-router'
 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') // 选中的按钮
@@ -14,7 +14,6 @@
   check: '查看',
   normal: '正常',
 }
-const typeValue = ref('normal')
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
   number: '', // 编号
@@ -130,9 +129,6 @@
 const exportAll = () => {
   exportExcelBtn()
 }
-const close = () => {
-  typeValue.value = 'normal'
-}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -165,6 +161,7 @@
   extarCss: '',
 })
 // 操作
+const $router = useRouter()
 const handleEdit = (index: number, row: IsolveListType, val: string) => {
   if (val === '领用') {
     ElMessageBox.confirm(
@@ -221,7 +218,7 @@
       })
   }
   else if (val === '查看') {
-    typeValue.value = 'check'
+    $router.push('/receive/solveCheck')
   }
 }
 // 右上角按钮切换
@@ -245,7 +242,6 @@
 <template>
   <app-container>
     <search-area
-      v-if="typeValue !== 'check'"
       :need-clear="true"
       @search="searchList" @clear="clearList"
     >
@@ -286,7 +282,7 @@
       </search-item>
     </search-area>
 
-    <table-container v-if="typeValue !== 'check'">
+    <table-container>
       <template #btns-right>
         <el-button v-if="proxy.hasPerm('/measure/measureSource/add')" type="primary" @click="execTag">
           标签识别
@@ -306,7 +302,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="180">
+          <el-table-column label="操作" align="center" width="130">
             <template #default="{ row }">
               <el-button
                 size="small"
@@ -350,11 +346,9 @@
       </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>
 
diff --git a/src/views/setting.vue b/src/views/setting.vue
index 9910a0d..664598f 100644
--- a/src/views/setting.vue
+++ b/src/views/setting.vue
@@ -108,13 +108,13 @@
   }
 }
 // 退出流程编辑,退回上一页
-const closeSetting = () => {
-  router.go(-1)
-}
+// const closeSetting = () => {
+//   router.go(-1)
+// }
 </script>
 
 <template>
-  <div>
+  <div class="workFlow-setting">
     <!-- <div class="fd-nav">
       <div class="fd-nav-left">
         <div class="fd-nav-back" @click="toReturn">
@@ -135,7 +135,7 @@
         关 闭
       </el-button>
     </div> -->
-    <el-button>保存</el-button>
+    <!-- <el-button>保存</el-button> -->
     <div class="fd-nav-content">
       <section class="dingflow-design">
         <!-- <div class="zoom">
@@ -168,35 +168,40 @@
 </template>
 
 <style lang="scss" scoped>
-.close-button {
-  display: flex;
-  justify-content: flex-end;
-  margin: 20px;
-}
+.workFlow-setting {
+  margin-top: 10px;
 
-.box-scale {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-// .end-node-circle {
-.end-node {
-  justify-content: center;
-  flex-direction: column;
-  align-content: center;
+  .close-button {
+    display: flex;
+    justify-content: flex-end;
+    margin: 20px;
+  }
 
-  p {
-    width: 280px;
-    height: 40px;
-    line-height: 40px;
-    color: #fff;
-    text-align: center;
-    background-color: #8cafff;
-    border-radius: 4px;
-    font-size: 14px;
-    margin: 0;
+  .box-scale {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+  // .end-node-circle {
+  .end-node {
+    justify-content: center;
+    flex-direction: column;
+    align-content: center;
+
+    p {
+      width: 280px;
+      height: 40px;
+      line-height: 40px;
+      color: #fff;
+      text-align: center;
+      background-color: #8cafff;
+      border-radius: 4px;
+      font-size: 14px;
+      margin: 0;
+    }
   }
 }
+
 // }
 </style>
 

diff --git a/src/components/drawer/copyerDrawer.vue b/src/components/drawer/copyerDrawer.vue
index 2bcbacc..d97284d 100644
--- a/src/components/drawer/copyerDrawer.vue
+++ b/src/components/drawer/copyerDrawer.vue
@@ -59,7 +59,7 @@
 </script>
 
 <template>
-  <el-drawer v-model="visible" :append-to-body="true" title="抄送人设置" direction="rtl" custom-class="set_copyer" size="550px" :@close="closeDrawer">
+  <el-drawer v-model="visible" :append-to-body="true" title="抄送人设置" direction="rtl" custom-class="set_copyer" size="550px" @close="closeDrawer">
     <div class="demo-drawer__content">
       <div class="copyer_content drawer_content">
         <el-button type="primary" @click="addCopyer">
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 1644a80..23ac34d 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -303,6 +303,18 @@
         },
       },
       {
+        path: ':type',
+        name: 'ApplyListDetail',
+        component: () => import('@/views/device/receive/createOrCheck.vue'),
+        meta: {
+          title: '设备领用申请',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/receive/applyList',
+        },
+      },
+      {
         path: 'solveList',
         name: 'SolveList',
         component: () => import('@/views/device/receive/solveList.vue'),
@@ -312,6 +324,18 @@
           auth: '/device/receive/solveList',
         },
       },
+      {
+        path: 'solveCheck',
+        name: 'SolveListDetail',
+        component: () => import('@/views/device/receive/solveComponent/detail.vue'),
+        meta: {
+          title: '设备领用处理',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/receive/solveList',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 1f5cdcf..edac0e5 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -170,12 +170,38 @@
         component: () => import('@/views/system/process/process.vue'),
         meta: {
           title: '流程管理',
+          icon: 'ep:key',
           auth: '/sys/process',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/process',
         },
       },
+      {
+        path: 'edit',
+        name: 'ProcessListEdit',
+        component: () => import('@/views/system/process/editProcess.vue'),
+        meta: {
+          title: '流程管理',
+          icon: 'ep:key',
+          auth: '/sys/process',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/process/list',
+        },
+      },
+      {
+        path: 'detail',
+        name: 'ProcessListDetail',
+        component: () => import('@/views/system/process/detailProcess.vue'),
+        meta: {
+          title: '流程管理',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/process/list',
+        },
+      },
     ],
   },
   {
diff --git a/src/views/device/receive/applyList.vue b/src/views/device/receive/applyList.vue
index 34256c6..ee6107e 100644
--- a/src/views/device/receive/applyList.vue
+++ b/src/views/device/receive/applyList.vue
@@ -2,22 +2,16 @@
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { useRoute, useRouter } from 'vue-router'
 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: '', // 编号
@@ -115,9 +109,10 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
+const $router = useRouter()
 // 新建
 const add = () => {
-  typeValue.value = 'add'
+  $router.push({ path: '/receive/add', query: { typeValue: 'add' } })
 }
 // 导出
 const exportExcelBtn = () => {
@@ -147,9 +142,7 @@
 const exportAll = () => {
   exportExcelBtn()
 }
-const close = () => {
-  typeValue.value = 'normal'
-}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -232,7 +225,7 @@
     approveOpinion.value = '0'
   }
   else if (val === '查看') {
-    typeValue.value = 'check'
+    $router.push({ path: '/receive/check', query: { typeValue: 'check' } })
   }
 }
 // 按钮切换
@@ -271,7 +264,6 @@
 <template>
   <app-container>
     <search-area
-      v-if="typeValue !== 'add' && typeValue !== 'check'"
       :need-clear="true"
       @search="searchList" @clear="clearList"
     >
@@ -312,7 +304,7 @@
       </search-item>
     </search-area>
 
-    <table-container v-if="typeValue !== 'add' && typeValue !== 'check'">
+    <table-container>
       <template #btns-right>
         <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" />
@@ -330,7 +322,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="290">
+          <el-table-column label="操作" align="center" width="220">
             <template #default="{ row }">
               <el-button
                 size="small"
@@ -389,13 +381,8 @@
         </template>
       </normal-table>
     </table-container>
-    <button-box v-if="typeValue !== 'add' && typeValue !== 'check'" :active="active" @changeCurrentButton="changeCurrentButton" />
+    <button-box :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>
 
diff --git a/src/views/device/receive/createOrCheck.vue b/src/views/device/receive/createOrCheck.vue
index d2667cd..5355408 100644
--- a/src/views/device/receive/createOrCheck.vue
+++ b/src/views/device/receive/createOrCheck.vue
@@ -1,16 +1,14 @@
 <script lang="ts" setup name="CreateOrCheck">
-import { reactive, ref } from 'vue'
+import { onMounted, reactive, ref } from 'vue'
 import type { Ref } from 'vue'
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage } from 'element-plus'
+import { useRoute, useRouter } from 'vue-router'
 import type { IdeviceListQuery, Iform } from './receive'
 import SelectDeviceDialog from './selectDeviceDialog.vue'
 import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
-
-const props = defineProps({
-  typeValue: String,
-})
-const emits = defineEmits(['close'])
+const $route = useRoute()
+const typeValue = ref()
 const isMulti = ref(false) // 是否批量添加(允许多选)
 const selectIndex = ref()
 const { proxy } = getCurrentInstance() as any
@@ -18,11 +16,12 @@
 const isShowDialog = ref(false) // 控制审批对话框显隐
 const total = ref(20)// 总数
 const approveOpinion = ref() // 审批意见：1同意2驳回0拒绝
-const type = {
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
   add: '新建',
+  detail: '详情',
   check: '查看',
-  normal: '正常',
-}
+}// 字典
 const haveApproveLimits = ref(true)// 是否有审批权限
 const isStart = ref(false)// 是否是发起人
 // 选中的内容
@@ -207,9 +206,10 @@
   dialogSelectDiviceVisible.value = true
   isMulti.value = true
 }
+const $router = useRouter()
 // 点击关闭
 const close = () => {
-  emits('close')
+  $router.push('/receive/applyList')
 }
 // 选择设备对话框关闭
 const closeDialog = () => {
@@ -227,38 +227,38 @@
     list.value.splice(selectIndex.value, 1, val[0])
   }
 }
+
+onMounted(() => {
+  typeValue.value = $route.query.typeValue
+})
 </script>
 
 <template>
   <app-container>
+    <detail-page :title="`设备领用申请-${textMap[typeValue]}`">
+      <template #btns>
+        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('1')">
+          同意
+        </el-button>
+        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('2')">
+          驳回
+        </el-button>
+        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('0')">
+          拒绝
+        </el-button>
+        <el-button v-if="isStart && typeValue === 'add'" type="primary" @click="handleClick('3')">
+          提交
+        </el-button>
+        <el-button v-if="isStart && typeValue === 'add'" type="primary" @click="handleClick('4')">
+          撤回
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
     <div class="create-check">
       <div class="top-info">
-        <div class="title-button">
-          <h4 class="title">
-            基本信息
-          </h4>
-          <div class="button-group">
-            <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" plain @click="handleClick('1')">
-              同意
-            </el-button>
-            <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" plain @click="handleClick('2')">
-              驳回
-            </el-button>
-            <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" plain @click="handleClick('0')">
-              拒绝
-            </el-button>
-            <el-button v-if="isStart && typeValue === 'add'" type="primary" plain @click="handleClick('3')">
-              提交
-            </el-button>
-            <el-button v-if="isStart && typeValue === 'add'" type="primary" plain @click="handleClick('4')">
-              撤回
-            </el-button>
-            <el-button type="primary" plain @click="close">
-              关闭
-            </el-button>
-          </div>
-        </div>
-
         <div class="form-area">
           <el-form
             ref="ruleFormRef"
@@ -269,10 +269,10 @@
             <el-row :gutter="20">
               <el-col :span="12">
                 <el-form-item label="申请单位" prop="company">
-                  <el-input v-model="form.company" clearable />
+                  <el-input v-model="form.company" clearable :disabled="typeValue === 'check'" />
                 </el-form-item>
                 <el-form-item label="申请人" prop="person">
-                  <el-input v-model="form.person" clearable />
+                  <el-input v-model="form.person" clearable :disabled="typeValue === 'check'" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
@@ -281,10 +281,11 @@
                     v-model="form.time"
                     type="datetime"
                     placeholder="请选择领用时间"
+                    :disabled="typeValue === 'check'"
                   />
                 </el-form-item>
                 <el-form-item label="申请说明">
-                  <el-input v-model="form.state" type="textarea" clearable />
+                  <el-input v-model="form.state" type="textarea" clearable :disabled="typeValue === 'check'" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -293,13 +294,13 @@
       </div>
       <table-container title="设备领用列表">
         <template #btns-right>
-          <el-button type="primary" @click="multiAdd">
+          <el-button v-if="typeValue !== 'check'" type="primary" @click="multiAdd">
             批量添加
           </el-button>
-          <el-button type="primary" @click="addRow">
+          <el-button v-if="typeValue !== 'check'" type="primary" @click="addRow">
             增加行
           </el-button>
-          <el-button type="primary" @click="delRow">
+          <el-button v-if="typeValue !== 'check'" type="primary" @click="delRow">
             删除行
           </el-button>
         </template>
@@ -315,7 +316,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="120">
+            <el-table-column label="操作" align="center" width="60">
               <template #default="scope">
                 <el-button
                   size="small"
@@ -332,7 +333,7 @@
       </table-container>
 
       <table-container title="审批流程">
-        <!-- <normal-table
+      <!-- <normal-table
           :data="list" :total="total" :columns="columns" :query="listQuery"
           is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
@@ -360,25 +361,27 @@
         </normal-table> -->
       </table-container>
     </div>
-  </app-container>
-  <select-device-dialog
-    :dialog-select-divice-visible="dialogSelectDiviceVisible"
-    :is-multi="isMulti"
-    @closeDialog="closeDialog"
-    @updateDeviceConfirm="updateDeviceConfirm"
-  />
+    <select-device-dialog
+      :dialog-select-divice-visible="dialogSelectDiviceVisible"
+      :is-multi="isMulti"
+      @closeDialog="closeDialog"
+      @updateDeviceConfirm="updateDeviceConfirm"
+    />
 
-  <!-- 同意、驳回、拒绝对话框显示 -->
-  <receive-dialog
-    :is-show-dialog="isShowDialog"
-    :approve-opinion="approveOpinion"
-    @closeDialog="closeDialog"
-  />
+    <!-- 同意、驳回、拒绝对话框显示 -->
+    <receive-dialog
+      :is-show-dialog="isShowDialog"
+      :approve-opinion="approveOpinion"
+      @closeDialog="closeDialog"
+    />
+  </app-container>
 </template>
 
 <style lang="scss" scoped>
 // 样式
 .create-check {
+  margin-top: 10px;
+
   .top-info {
     display: flex;
     flex-direction: column;
diff --git a/src/views/device/receive/solveComponent/detail.vue b/src/views/device/receive/solveComponent/detail.vue
index 6091fc5..aa6cb58 100644
--- a/src/views/device/receive/solveComponent/detail.vue
+++ b/src/views/device/receive/solveComponent/detail.vue
@@ -6,13 +6,8 @@
 const props = defineProps({
   typeValue: String,
 })
-const emits = defineEmits(['close'])
 const { proxy } = getCurrentInstance() as any
 const total = ref(20)// 总数
-const type = {
-  check: '查看',
-  normal: '正常',
-}
 
 // 表单数据
 const form = ref({
@@ -99,8 +94,9 @@
   // fetchData(true)
 }
 // 点击关闭
+const $router = useRouter()
 const close = () => {
-  emits('close')
+  $router.push('/receive/solveList')
 }
 // 打印
 const printObj = ref({
@@ -133,52 +129,51 @@
 
 <template>
   <app-container>
+    <detail-page title="设备领用处理-查看">
+      <template #btns>
+        <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
     <div id="lysq" class="lysq-create-check">
       <div class="top-info">
-        <div class="title-button">
-          <h4 class="title">
-            领用申请
-          </h4>
-          <div class="button-group">
-            <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
-              打印
-            </el-button>
-            <el-button type="primary" plain @click="close">
-              关闭
-            </el-button>
+        <detail-block title="领用申请">
+          <div class="form-area">
+            <el-form
+              ref="ruleFormRef"
+              :model="form"
+              label-width="120px"
+            >
+              <el-row :gutter="20">
+                <el-col :span="12">
+                  <el-form-item label="申请单位">
+                    <el-input v-model="form.company" clearable disabled />
+                  </el-form-item>
+                  <el-form-item label="申请人">
+                    <el-input v-model="form.person" clearable disabled />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="领用时间">
+                    <el-date-picker
+                      v-model="form.time"
+                      type="datetime"
+                      placeholder="请选择领用时间"
+                      disabled
+                    />
+                  </el-form-item>
+                  <el-form-item label="申请说明">
+                    <el-input v-model="form.state" type="textarea" clearable disabled />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
           </div>
-        </div>
-
-        <div class="form-area">
-          <el-form
-            ref="ruleFormRef"
-            :model="form"
-            label-width="120px"
-          >
-            <el-row :gutter="20">
-              <el-col :span="12">
-                <el-form-item label="申请单位">
-                  <el-input v-model="form.company" clearable />
-                </el-form-item>
-                <el-form-item label="申请人">
-                  <el-input v-model="form.person" clearable />
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="领用时间">
-                  <el-date-picker
-                    v-model="form.time"
-                    type="datetime"
-                    placeholder="请选择领用时间"
-                  />
-                </el-form-item>
-                <el-form-item label="申请说明">
-                  <el-input v-model="form.state" type="textarea" clearable />
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </el-form>
-        </div>
+        </detail-block>
       </div>
       <table-container title="设备领用列表">
         <normal-table
@@ -230,6 +225,8 @@
 <style lang="scss" scoped>
 // 样式
 .lysq-create-check {
+  margin-top: 10px;
+
   .top-info {
     display: flex;
     flex-direction: column;
diff --git a/src/views/device/receive/solveList.vue b/src/views/device/receive/solveList.vue
index 7c737d6..f1db533 100644
--- a/src/views/device/receive/solveList.vue
+++ b/src/views/device/receive/solveList.vue
@@ -2,11 +2,11 @@
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { useRoute, useRouter } from 'vue-router'
 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') // 选中的按钮
@@ -14,7 +14,6 @@
   check: '查看',
   normal: '正常',
 }
-const typeValue = ref('normal')
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
   number: '', // 编号
@@ -130,9 +129,6 @@
 const exportAll = () => {
   exportExcelBtn()
 }
-const close = () => {
-  typeValue.value = 'normal'
-}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -165,6 +161,7 @@
   extarCss: '',
 })
 // 操作
+const $router = useRouter()
 const handleEdit = (index: number, row: IsolveListType, val: string) => {
   if (val === '领用') {
     ElMessageBox.confirm(
@@ -221,7 +218,7 @@
       })
   }
   else if (val === '查看') {
-    typeValue.value = 'check'
+    $router.push('/receive/solveCheck')
   }
 }
 // 右上角按钮切换
@@ -245,7 +242,6 @@
 <template>
   <app-container>
     <search-area
-      v-if="typeValue !== 'check'"
       :need-clear="true"
       @search="searchList" @clear="clearList"
     >
@@ -286,7 +282,7 @@
       </search-item>
     </search-area>
 
-    <table-container v-if="typeValue !== 'check'">
+    <table-container>
       <template #btns-right>
         <el-button v-if="proxy.hasPerm('/measure/measureSource/add')" type="primary" @click="execTag">
           标签识别
@@ -306,7 +302,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="180">
+          <el-table-column label="操作" align="center" width="130">
             <template #default="{ row }">
               <el-button
                 size="small"
@@ -350,11 +346,9 @@
       </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>
 
diff --git a/src/views/setting.vue b/src/views/setting.vue
index 9910a0d..664598f 100644
--- a/src/views/setting.vue
+++ b/src/views/setting.vue
@@ -108,13 +108,13 @@
   }
 }
 // 退出流程编辑,退回上一页
-const closeSetting = () => {
-  router.go(-1)
-}
+// const closeSetting = () => {
+//   router.go(-1)
+// }
 </script>
 
 <template>
-  <div>
+  <div class="workFlow-setting">
     <!-- <div class="fd-nav">
       <div class="fd-nav-left">
         <div class="fd-nav-back" @click="toReturn">
@@ -135,7 +135,7 @@
         关 闭
       </el-button>
     </div> -->
-    <el-button>保存</el-button>
+    <!-- <el-button>保存</el-button> -->
     <div class="fd-nav-content">
       <section class="dingflow-design">
         <!-- <div class="zoom">
@@ -168,35 +168,40 @@
 </template>
 
 <style lang="scss" scoped>
-.close-button {
-  display: flex;
-  justify-content: flex-end;
-  margin: 20px;
-}
+.workFlow-setting {
+  margin-top: 10px;
 
-.box-scale {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-// .end-node-circle {
-.end-node {
-  justify-content: center;
-  flex-direction: column;
-  align-content: center;
+  .close-button {
+    display: flex;
+    justify-content: flex-end;
+    margin: 20px;
+  }
 
-  p {
-    width: 280px;
-    height: 40px;
-    line-height: 40px;
-    color: #fff;
-    text-align: center;
-    background-color: #8cafff;
-    border-radius: 4px;
-    font-size: 14px;
-    margin: 0;
+  .box-scale {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+  // .end-node-circle {
+  .end-node {
+    justify-content: center;
+    flex-direction: column;
+    align-content: center;
+
+    p {
+      width: 280px;
+      height: 40px;
+      line-height: 40px;
+      color: #fff;
+      text-align: center;
+      background-color: #8cafff;
+      border-radius: 4px;
+      font-size: 14px;
+      margin: 0;
+    }
   }
 }
+
 // }
 </style>
 
diff --git a/src/views/system/process/detailProcess.vue b/src/views/system/process/detailProcess.vue
index 69f92b6..9e83ba7 100644
--- a/src/views/system/process/detailProcess.vue
+++ b/src/views/system/process/detailProcess.vue
@@ -3,9 +3,11 @@
 import { reactive, ref } from 'vue'
 import type { FormInstance, FormRules } from 'element-plus'
 import type { Ref } from 'vue'
-import setting from '../../setting.vue'
+import { useRoute, useRouter } from 'vue-router'
+import Setting from '../../setting.vue'
 import type { Iform } from './process'
 // import WorkFlow from '@/components/workFlow/workFlow.vue'
+
 const emits = defineEmits(['close'])
 const ruleFormRef = ref<FormInstance>()
 const form: Ref<Iform> = ref({
@@ -62,23 +64,21 @@
     title: '否',
   },
 ]
+const $router = useRouter()
 // 关闭
 const close = () => {
-  emits('close')
+  $router.push('/process/list')
 }
 </script>
 
 <template>
   <div class="edit-process">
-    <h5 class="title">
-      流程编辑
-    </h5>
-    <div class="edit">
-      <div class="button-area">
-        <el-button type="primary" @click="close">
+    <detail-page title="流程管理-详情">
+      <template #btns>
+        <el-button type="info" @click="close">
           关闭
         </el-button>
-      </div>
+      </template>
       <el-form ref="ruleFormRef" :model="form" label-width="150px">
         <el-row :gutter="20">
           <el-col :span="8">
@@ -142,10 +142,8 @@
           </el-col>
         </el-row>
       </el-form>
-    </div>
-    <h5 class="title">
-      流程配置
-    </h5>
+    </detail-page>
+    <detail-block title="流程配置" />
     <setting :allow-edit-node="false" />
   </div>
 </template>
@@ -153,32 +151,11 @@
 <style lang="scss" scoped>
   .edit-process {
     width: 100%;
+    padding: 10px;
 
     .title {
       margin: 0 0 20px;
       font-weight: 600;
     }
-
-    .edit {
-      width: 100%;
-      padding: 12px;
-      background-color: #fff;
-      border-radius: 7px;
-      margin: 0 0 20px;
-
-      .button-area {
-        width: 100%;
-        display: flex;
-        justify-content: flex-end;
-        margin-bottom: 20px;
-      }
-    }
-
-    .set {
-      width: 100%;
-      background-color: #fff;
-      border-radius: 7px;
-      margin: 20px 0;
-    }
   }
 </style>

diff --git a/src/components/drawer/copyerDrawer.vue b/src/components/drawer/copyerDrawer.vue
index 2bcbacc..d97284d 100644
--- a/src/components/drawer/copyerDrawer.vue
+++ b/src/components/drawer/copyerDrawer.vue
@@ -59,7 +59,7 @@
 </script>
 
 <template>
-  <el-drawer v-model="visible" :append-to-body="true" title="抄送人设置" direction="rtl" custom-class="set_copyer" size="550px" :@close="closeDrawer">
+  <el-drawer v-model="visible" :append-to-body="true" title="抄送人设置" direction="rtl" custom-class="set_copyer" size="550px" @close="closeDrawer">
     <div class="demo-drawer__content">
       <div class="copyer_content drawer_content">
         <el-button type="primary" @click="addCopyer">
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 1644a80..23ac34d 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -303,6 +303,18 @@
         },
       },
       {
+        path: ':type',
+        name: 'ApplyListDetail',
+        component: () => import('@/views/device/receive/createOrCheck.vue'),
+        meta: {
+          title: '设备领用申请',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/receive/applyList',
+        },
+      },
+      {
         path: 'solveList',
         name: 'SolveList',
         component: () => import('@/views/device/receive/solveList.vue'),
@@ -312,6 +324,18 @@
           auth: '/device/receive/solveList',
         },
       },
+      {
+        path: 'solveCheck',
+        name: 'SolveListDetail',
+        component: () => import('@/views/device/receive/solveComponent/detail.vue'),
+        meta: {
+          title: '设备领用处理',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/receive/solveList',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 1f5cdcf..edac0e5 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -170,12 +170,38 @@
         component: () => import('@/views/system/process/process.vue'),
         meta: {
           title: '流程管理',
+          icon: 'ep:key',
           auth: '/sys/process',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/process',
         },
       },
+      {
+        path: 'edit',
+        name: 'ProcessListEdit',
+        component: () => import('@/views/system/process/editProcess.vue'),
+        meta: {
+          title: '流程管理',
+          icon: 'ep:key',
+          auth: '/sys/process',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/process/list',
+        },
+      },
+      {
+        path: 'detail',
+        name: 'ProcessListDetail',
+        component: () => import('@/views/system/process/detailProcess.vue'),
+        meta: {
+          title: '流程管理',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/process/list',
+        },
+      },
     ],
   },
   {
diff --git a/src/views/device/receive/applyList.vue b/src/views/device/receive/applyList.vue
index 34256c6..ee6107e 100644
--- a/src/views/device/receive/applyList.vue
+++ b/src/views/device/receive/applyList.vue
@@ -2,22 +2,16 @@
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { useRoute, useRouter } from 'vue-router'
 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: '', // 编号
@@ -115,9 +109,10 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
+const $router = useRouter()
 // 新建
 const add = () => {
-  typeValue.value = 'add'
+  $router.push({ path: '/receive/add', query: { typeValue: 'add' } })
 }
 // 导出
 const exportExcelBtn = () => {
@@ -147,9 +142,7 @@
 const exportAll = () => {
   exportExcelBtn()
 }
-const close = () => {
-  typeValue.value = 'normal'
-}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -232,7 +225,7 @@
     approveOpinion.value = '0'
   }
   else if (val === '查看') {
-    typeValue.value = 'check'
+    $router.push({ path: '/receive/check', query: { typeValue: 'check' } })
   }
 }
 // 按钮切换
@@ -271,7 +264,6 @@
 <template>
   <app-container>
     <search-area
-      v-if="typeValue !== 'add' && typeValue !== 'check'"
       :need-clear="true"
       @search="searchList" @clear="clearList"
     >
@@ -312,7 +304,7 @@
       </search-item>
     </search-area>
 
-    <table-container v-if="typeValue !== 'add' && typeValue !== 'check'">
+    <table-container>
       <template #btns-right>
         <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" />
@@ -330,7 +322,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="290">
+          <el-table-column label="操作" align="center" width="220">
             <template #default="{ row }">
               <el-button
                 size="small"
@@ -389,13 +381,8 @@
         </template>
       </normal-table>
     </table-container>
-    <button-box v-if="typeValue !== 'add' && typeValue !== 'check'" :active="active" @changeCurrentButton="changeCurrentButton" />
+    <button-box :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>
 
diff --git a/src/views/device/receive/createOrCheck.vue b/src/views/device/receive/createOrCheck.vue
index d2667cd..5355408 100644
--- a/src/views/device/receive/createOrCheck.vue
+++ b/src/views/device/receive/createOrCheck.vue
@@ -1,16 +1,14 @@
 <script lang="ts" setup name="CreateOrCheck">
-import { reactive, ref } from 'vue'
+import { onMounted, reactive, ref } from 'vue'
 import type { Ref } from 'vue'
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage } from 'element-plus'
+import { useRoute, useRouter } from 'vue-router'
 import type { IdeviceListQuery, Iform } from './receive'
 import SelectDeviceDialog from './selectDeviceDialog.vue'
 import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
-
-const props = defineProps({
-  typeValue: String,
-})
-const emits = defineEmits(['close'])
+const $route = useRoute()
+const typeValue = ref()
 const isMulti = ref(false) // 是否批量添加(允许多选)
 const selectIndex = ref()
 const { proxy } = getCurrentInstance() as any
@@ -18,11 +16,12 @@
 const isShowDialog = ref(false) // 控制审批对话框显隐
 const total = ref(20)// 总数
 const approveOpinion = ref() // 审批意见：1同意2驳回0拒绝
-const type = {
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
   add: '新建',
+  detail: '详情',
   check: '查看',
-  normal: '正常',
-}
+}// 字典
 const haveApproveLimits = ref(true)// 是否有审批权限
 const isStart = ref(false)// 是否是发起人
 // 选中的内容
@@ -207,9 +206,10 @@
   dialogSelectDiviceVisible.value = true
   isMulti.value = true
 }
+const $router = useRouter()
 // 点击关闭
 const close = () => {
-  emits('close')
+  $router.push('/receive/applyList')
 }
 // 选择设备对话框关闭
 const closeDialog = () => {
@@ -227,38 +227,38 @@
     list.value.splice(selectIndex.value, 1, val[0])
   }
 }
+
+onMounted(() => {
+  typeValue.value = $route.query.typeValue
+})
 </script>
 
 <template>
   <app-container>
+    <detail-page :title="`设备领用申请-${textMap[typeValue]}`">
+      <template #btns>
+        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('1')">
+          同意
+        </el-button>
+        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('2')">
+          驳回
+        </el-button>
+        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('0')">
+          拒绝
+        </el-button>
+        <el-button v-if="isStart && typeValue === 'add'" type="primary" @click="handleClick('3')">
+          提交
+        </el-button>
+        <el-button v-if="isStart && typeValue === 'add'" type="primary" @click="handleClick('4')">
+          撤回
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
     <div class="create-check">
       <div class="top-info">
-        <div class="title-button">
-          <h4 class="title">
-            基本信息
-          </h4>
-          <div class="button-group">
-            <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" plain @click="handleClick('1')">
-              同意
-            </el-button>
-            <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" plain @click="handleClick('2')">
-              驳回
-            </el-button>
-            <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" plain @click="handleClick('0')">
-              拒绝
-            </el-button>
-            <el-button v-if="isStart && typeValue === 'add'" type="primary" plain @click="handleClick('3')">
-              提交
-            </el-button>
-            <el-button v-if="isStart && typeValue === 'add'" type="primary" plain @click="handleClick('4')">
-              撤回
-            </el-button>
-            <el-button type="primary" plain @click="close">
-              关闭
-            </el-button>
-          </div>
-        </div>
-
         <div class="form-area">
           <el-form
             ref="ruleFormRef"
@@ -269,10 +269,10 @@
             <el-row :gutter="20">
               <el-col :span="12">
                 <el-form-item label="申请单位" prop="company">
-                  <el-input v-model="form.company" clearable />
+                  <el-input v-model="form.company" clearable :disabled="typeValue === 'check'" />
                 </el-form-item>
                 <el-form-item label="申请人" prop="person">
-                  <el-input v-model="form.person" clearable />
+                  <el-input v-model="form.person" clearable :disabled="typeValue === 'check'" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
@@ -281,10 +281,11 @@
                     v-model="form.time"
                     type="datetime"
                     placeholder="请选择领用时间"
+                    :disabled="typeValue === 'check'"
                   />
                 </el-form-item>
                 <el-form-item label="申请说明">
-                  <el-input v-model="form.state" type="textarea" clearable />
+                  <el-input v-model="form.state" type="textarea" clearable :disabled="typeValue === 'check'" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -293,13 +294,13 @@
       </div>
       <table-container title="设备领用列表">
         <template #btns-right>
-          <el-button type="primary" @click="multiAdd">
+          <el-button v-if="typeValue !== 'check'" type="primary" @click="multiAdd">
             批量添加
           </el-button>
-          <el-button type="primary" @click="addRow">
+          <el-button v-if="typeValue !== 'check'" type="primary" @click="addRow">
             增加行
           </el-button>
-          <el-button type="primary" @click="delRow">
+          <el-button v-if="typeValue !== 'check'" type="primary" @click="delRow">
             删除行
           </el-button>
         </template>
@@ -315,7 +316,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="120">
+            <el-table-column label="操作" align="center" width="60">
               <template #default="scope">
                 <el-button
                   size="small"
@@ -332,7 +333,7 @@
       </table-container>
 
       <table-container title="审批流程">
-        <!-- <normal-table
+      <!-- <normal-table
           :data="list" :total="total" :columns="columns" :query="listQuery"
           is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
@@ -360,25 +361,27 @@
         </normal-table> -->
       </table-container>
     </div>
-  </app-container>
-  <select-device-dialog
-    :dialog-select-divice-visible="dialogSelectDiviceVisible"
-    :is-multi="isMulti"
-    @closeDialog="closeDialog"
-    @updateDeviceConfirm="updateDeviceConfirm"
-  />
+    <select-device-dialog
+      :dialog-select-divice-visible="dialogSelectDiviceVisible"
+      :is-multi="isMulti"
+      @closeDialog="closeDialog"
+      @updateDeviceConfirm="updateDeviceConfirm"
+    />
 
-  <!-- 同意、驳回、拒绝对话框显示 -->
-  <receive-dialog
-    :is-show-dialog="isShowDialog"
-    :approve-opinion="approveOpinion"
-    @closeDialog="closeDialog"
-  />
+    <!-- 同意、驳回、拒绝对话框显示 -->
+    <receive-dialog
+      :is-show-dialog="isShowDialog"
+      :approve-opinion="approveOpinion"
+      @closeDialog="closeDialog"
+    />
+  </app-container>
 </template>
 
 <style lang="scss" scoped>
 // 样式
 .create-check {
+  margin-top: 10px;
+
   .top-info {
     display: flex;
     flex-direction: column;
diff --git a/src/views/device/receive/solveComponent/detail.vue b/src/views/device/receive/solveComponent/detail.vue
index 6091fc5..aa6cb58 100644
--- a/src/views/device/receive/solveComponent/detail.vue
+++ b/src/views/device/receive/solveComponent/detail.vue
@@ -6,13 +6,8 @@
 const props = defineProps({
   typeValue: String,
 })
-const emits = defineEmits(['close'])
 const { proxy } = getCurrentInstance() as any
 const total = ref(20)// 总数
-const type = {
-  check: '查看',
-  normal: '正常',
-}
 
 // 表单数据
 const form = ref({
@@ -99,8 +94,9 @@
   // fetchData(true)
 }
 // 点击关闭
+const $router = useRouter()
 const close = () => {
-  emits('close')
+  $router.push('/receive/solveList')
 }
 // 打印
 const printObj = ref({
@@ -133,52 +129,51 @@
 
 <template>
   <app-container>
+    <detail-page title="设备领用处理-查看">
+      <template #btns>
+        <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
     <div id="lysq" class="lysq-create-check">
       <div class="top-info">
-        <div class="title-button">
-          <h4 class="title">
-            领用申请
-          </h4>
-          <div class="button-group">
-            <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
-              打印
-            </el-button>
-            <el-button type="primary" plain @click="close">
-              关闭
-            </el-button>
+        <detail-block title="领用申请">
+          <div class="form-area">
+            <el-form
+              ref="ruleFormRef"
+              :model="form"
+              label-width="120px"
+            >
+              <el-row :gutter="20">
+                <el-col :span="12">
+                  <el-form-item label="申请单位">
+                    <el-input v-model="form.company" clearable disabled />
+                  </el-form-item>
+                  <el-form-item label="申请人">
+                    <el-input v-model="form.person" clearable disabled />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="领用时间">
+                    <el-date-picker
+                      v-model="form.time"
+                      type="datetime"
+                      placeholder="请选择领用时间"
+                      disabled
+                    />
+                  </el-form-item>
+                  <el-form-item label="申请说明">
+                    <el-input v-model="form.state" type="textarea" clearable disabled />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
           </div>
-        </div>
-
-        <div class="form-area">
-          <el-form
-            ref="ruleFormRef"
-            :model="form"
-            label-width="120px"
-          >
-            <el-row :gutter="20">
-              <el-col :span="12">
-                <el-form-item label="申请单位">
-                  <el-input v-model="form.company" clearable />
-                </el-form-item>
-                <el-form-item label="申请人">
-                  <el-input v-model="form.person" clearable />
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="领用时间">
-                  <el-date-picker
-                    v-model="form.time"
-                    type="datetime"
-                    placeholder="请选择领用时间"
-                  />
-                </el-form-item>
-                <el-form-item label="申请说明">
-                  <el-input v-model="form.state" type="textarea" clearable />
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </el-form>
-        </div>
+        </detail-block>
       </div>
       <table-container title="设备领用列表">
         <normal-table
@@ -230,6 +225,8 @@
 <style lang="scss" scoped>
 // 样式
 .lysq-create-check {
+  margin-top: 10px;
+
   .top-info {
     display: flex;
     flex-direction: column;
diff --git a/src/views/device/receive/solveList.vue b/src/views/device/receive/solveList.vue
index 7c737d6..f1db533 100644
--- a/src/views/device/receive/solveList.vue
+++ b/src/views/device/receive/solveList.vue
@@ -2,11 +2,11 @@
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { useRoute, useRouter } from 'vue-router'
 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') // 选中的按钮
@@ -14,7 +14,6 @@
   check: '查看',
   normal: '正常',
 }
-const typeValue = ref('normal')
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
   number: '', // 编号
@@ -130,9 +129,6 @@
 const exportAll = () => {
   exportExcelBtn()
 }
-const close = () => {
-  typeValue.value = 'normal'
-}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -165,6 +161,7 @@
   extarCss: '',
 })
 // 操作
+const $router = useRouter()
 const handleEdit = (index: number, row: IsolveListType, val: string) => {
   if (val === '领用') {
     ElMessageBox.confirm(
@@ -221,7 +218,7 @@
       })
   }
   else if (val === '查看') {
-    typeValue.value = 'check'
+    $router.push('/receive/solveCheck')
   }
 }
 // 右上角按钮切换
@@ -245,7 +242,6 @@
 <template>
   <app-container>
     <search-area
-      v-if="typeValue !== 'check'"
       :need-clear="true"
       @search="searchList" @clear="clearList"
     >
@@ -286,7 +282,7 @@
       </search-item>
     </search-area>
 
-    <table-container v-if="typeValue !== 'check'">
+    <table-container>
       <template #btns-right>
         <el-button v-if="proxy.hasPerm('/measure/measureSource/add')" type="primary" @click="execTag">
           标签识别
@@ -306,7 +302,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="180">
+          <el-table-column label="操作" align="center" width="130">
             <template #default="{ row }">
               <el-button
                 size="small"
@@ -350,11 +346,9 @@
       </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>
 
diff --git a/src/views/setting.vue b/src/views/setting.vue
index 9910a0d..664598f 100644
--- a/src/views/setting.vue
+++ b/src/views/setting.vue
@@ -108,13 +108,13 @@
   }
 }
 // 退出流程编辑,退回上一页
-const closeSetting = () => {
-  router.go(-1)
-}
+// const closeSetting = () => {
+//   router.go(-1)
+// }
 </script>
 
 <template>
-  <div>
+  <div class="workFlow-setting">
     <!-- <div class="fd-nav">
       <div class="fd-nav-left">
         <div class="fd-nav-back" @click="toReturn">
@@ -135,7 +135,7 @@
         关 闭
       </el-button>
     </div> -->
-    <el-button>保存</el-button>
+    <!-- <el-button>保存</el-button> -->
     <div class="fd-nav-content">
       <section class="dingflow-design">
         <!-- <div class="zoom">
@@ -168,35 +168,40 @@
 </template>
 
 <style lang="scss" scoped>
-.close-button {
-  display: flex;
-  justify-content: flex-end;
-  margin: 20px;
-}
+.workFlow-setting {
+  margin-top: 10px;
 
-.box-scale {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-// .end-node-circle {
-.end-node {
-  justify-content: center;
-  flex-direction: column;
-  align-content: center;
+  .close-button {
+    display: flex;
+    justify-content: flex-end;
+    margin: 20px;
+  }
 
-  p {
-    width: 280px;
-    height: 40px;
-    line-height: 40px;
-    color: #fff;
-    text-align: center;
-    background-color: #8cafff;
-    border-radius: 4px;
-    font-size: 14px;
-    margin: 0;
+  .box-scale {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+  // .end-node-circle {
+  .end-node {
+    justify-content: center;
+    flex-direction: column;
+    align-content: center;
+
+    p {
+      width: 280px;
+      height: 40px;
+      line-height: 40px;
+      color: #fff;
+      text-align: center;
+      background-color: #8cafff;
+      border-radius: 4px;
+      font-size: 14px;
+      margin: 0;
+    }
   }
 }
+
 // }
 </style>
 
diff --git a/src/views/system/process/detailProcess.vue b/src/views/system/process/detailProcess.vue
index 69f92b6..9e83ba7 100644
--- a/src/views/system/process/detailProcess.vue
+++ b/src/views/system/process/detailProcess.vue
@@ -3,9 +3,11 @@
 import { reactive, ref } from 'vue'
 import type { FormInstance, FormRules } from 'element-plus'
 import type { Ref } from 'vue'
-import setting from '../../setting.vue'
+import { useRoute, useRouter } from 'vue-router'
+import Setting from '../../setting.vue'
 import type { Iform } from './process'
 // import WorkFlow from '@/components/workFlow/workFlow.vue'
+
 const emits = defineEmits(['close'])
 const ruleFormRef = ref<FormInstance>()
 const form: Ref<Iform> = ref({
@@ -62,23 +64,21 @@
     title: '否',
   },
 ]
+const $router = useRouter()
 // 关闭
 const close = () => {
-  emits('close')
+  $router.push('/process/list')
 }
 </script>
 
 <template>
   <div class="edit-process">
-    <h5 class="title">
-      流程编辑
-    </h5>
-    <div class="edit">
-      <div class="button-area">
-        <el-button type="primary" @click="close">
+    <detail-page title="流程管理-详情">
+      <template #btns>
+        <el-button type="info" @click="close">
           关闭
         </el-button>
-      </div>
+      </template>
       <el-form ref="ruleFormRef" :model="form" label-width="150px">
         <el-row :gutter="20">
           <el-col :span="8">
@@ -142,10 +142,8 @@
           </el-col>
         </el-row>
       </el-form>
-    </div>
-    <h5 class="title">
-      流程配置
-    </h5>
+    </detail-page>
+    <detail-block title="流程配置" />
     <setting :allow-edit-node="false" />
   </div>
 </template>
@@ -153,32 +151,11 @@
 <style lang="scss" scoped>
   .edit-process {
     width: 100%;
+    padding: 10px;
 
     .title {
       margin: 0 0 20px;
       font-weight: 600;
     }
-
-    .edit {
-      width: 100%;
-      padding: 12px;
-      background-color: #fff;
-      border-radius: 7px;
-      margin: 0 0 20px;
-
-      .button-area {
-        width: 100%;
-        display: flex;
-        justify-content: flex-end;
-        margin-bottom: 20px;
-      }
-    }
-
-    .set {
-      width: 100%;
-      background-color: #fff;
-      border-radius: 7px;
-      margin: 20px 0;
-    }
   }
 </style>
diff --git a/src/views/system/process/editProcess.vue b/src/views/system/process/editProcess.vue
index 235a18a..c3c233d 100644
--- a/src/views/system/process/editProcess.vue
+++ b/src/views/system/process/editProcess.vue
@@ -3,9 +3,11 @@
 import { reactive, ref } from 'vue'
 import type { FormInstance, FormRules } from 'element-plus'
 import type { Ref } from 'vue'
+import { useRoute, useRouter } from 'vue-router'
 import setting from '../../setting.vue'
 import type { Iform } from './process'
 import WorkFlow from '@/components/workFlow/workFlow.vue'
+
 const emits = defineEmits(['close'])
 const ruleFormRef = ref<FormInstance>()
 const form: Ref<Iform> = ref({
@@ -93,9 +95,10 @@
   ],
 })
 
+const $router = useRouter()
 // 关闭
 const close = () => {
-  emits('close')
+  $router.push('/process/list')
 }
 // 保存
 const save = async (formEl: FormInstance | undefined) => {
@@ -127,91 +130,84 @@
 
 <template>
   <div class="edit-process">
-    <h5 class="title">
-      流程编辑
-    </h5>
-    <div class="edit">
-      <div class="button-area">
-        <el-button type="primary" @click="save(ruleFormRef)">
-          保存
-        </el-button>
-        <el-button type="primary" @click="close">
-          关闭
-        </el-button>
-      </div>
-      <el-form ref="ruleFormRef" :model="form" label-width="150px" :rules="rules">
-        <el-row :gutter="20">
-          <el-col :span="8">
-            <el-form-item label="流程编号">
-              {{ form.number }}
-            </el-form-item>
-            <el-form-item label="可选决策项" prop="selectDecision">
-              <el-select v-model="form.selectDecision" placeholder="请选择" @change="changeDecision">
-                <el-option
-                  v-for="item in decision"
-                  :key="item.id"
-                  :label="item.title"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-            <el-form-item label="流程描述">
-              <el-input v-model="form.desc" type="textarea" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="流程名称">
-              {{ form.name }}
-            </el-form-item>
+    <app-container>
+      <detail-page title="流程管理-编辑">
+        <template #btns>
+          <el-button type="primary" @click="save(ruleFormRef)">
+            保存
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <el-form ref="ruleFormRef" :model="form" label-width="150px" :rules="rules">
+          <el-row :gutter="20">
+            <el-col :span="8">
+              <el-form-item label="流程编号">
+                {{ form.number }}
+              </el-form-item>
+              <el-form-item label="可选决策项" prop="selectDecision">
+                <el-select v-model="form.selectDecision" placeholder="请选择" @change="changeDecision">
+                  <el-option
+                    v-for="item in decision"
+                    :key="item.id"
+                    :label="item.title"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-form-item>
+              <el-form-item label="流程描述">
+                <el-input v-model="form.desc" type="textarea" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="流程名称">
+                {{ form.name }}
+              </el-form-item>
 
-            <el-form-item v-if="form.selectDecision !== 'refuse'" label="可驳回至" prop="rejectTo">
-              <el-select v-model="form.rejectTo" placeholder="请选择" @change="changeRejectTo">
-                <el-option
-                  v-for="item in reject"
-                  :key="item.id"
-                  :label="item.title"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-            <el-form-item label="审批结果通知发起人" prop="isMessage">
-              <el-select v-model="form.isMessage" placeholder="请选择" @change="changeMessage">
-                <el-option
-                  v-for="item in messageData"
-                  :key="item.id"
-                  :label="item.title"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="关联业务">
-              {{ form.business }}
-            </el-form-item>
-            <el-form-item v-if="form.selectDecision !== 'refuse'" label="驳回修改数据" prop="changeData">
-              <el-select v-model="form.changeData" placeholder="请选择" @change="changeData">
-                <el-option
-                  v-for="item in rejectChangeData"
-                  :key="item.id"
-                  :label="item.title"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </div>
-    <!-- <button class="title" @click="goSetting">
-      流程配置
-    </button> -->
-    <!-- <div class="set"> -->
-    <h5 class="title">
-      流程配置
-    </h5>
-    <setting />
-    <!-- </div> -->
+              <el-form-item v-if="form.selectDecision !== 'refuse'" label="可驳回至" prop="rejectTo">
+                <el-select v-model="form.rejectTo" placeholder="请选择" @change="changeRejectTo">
+                  <el-option
+                    v-for="item in reject"
+                    :key="item.id"
+                    :label="item.title"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-form-item>
+              <el-form-item label="审批结果通知发起人" prop="isMessage">
+                <el-select v-model="form.isMessage" placeholder="请选择" @change="changeMessage">
+                  <el-option
+                    v-for="item in messageData"
+                    :key="item.id"
+                    :label="item.title"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="关联业务">
+                {{ form.business }}
+              </el-form-item>
+              <el-form-item v-if="form.selectDecision !== 'refuse'" label="驳回修改数据" prop="changeData">
+                <el-select v-model="form.changeData" placeholder="请选择" @change="changeData">
+                  <el-option
+                    v-for="item in rejectChangeData"
+                    :key="item.id"
+                    :label="item.title"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-page>
+
+      <detail-block title="流程配置" />
+      <setting />
+    </app-container>
   </div>
 </template>
 

diff --git a/src/components/drawer/copyerDrawer.vue b/src/components/drawer/copyerDrawer.vue
index 2bcbacc..d97284d 100644
--- a/src/components/drawer/copyerDrawer.vue
+++ b/src/components/drawer/copyerDrawer.vue
@@ -59,7 +59,7 @@
 </script>
 
 <template>
-  <el-drawer v-model="visible" :append-to-body="true" title="抄送人设置" direction="rtl" custom-class="set_copyer" size="550px" :@close="closeDrawer">
+  <el-drawer v-model="visible" :append-to-body="true" title="抄送人设置" direction="rtl" custom-class="set_copyer" size="550px" @close="closeDrawer">
     <div class="demo-drawer__content">
       <div class="copyer_content drawer_content">
         <el-button type="primary" @click="addCopyer">
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 1644a80..23ac34d 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -303,6 +303,18 @@
         },
       },
       {
+        path: ':type',
+        name: 'ApplyListDetail',
+        component: () => import('@/views/device/receive/createOrCheck.vue'),
+        meta: {
+          title: '设备领用申请',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/receive/applyList',
+        },
+      },
+      {
         path: 'solveList',
         name: 'SolveList',
         component: () => import('@/views/device/receive/solveList.vue'),
@@ -312,6 +324,18 @@
           auth: '/device/receive/solveList',
         },
       },
+      {
+        path: 'solveCheck',
+        name: 'SolveListDetail',
+        component: () => import('@/views/device/receive/solveComponent/detail.vue'),
+        meta: {
+          title: '设备领用处理',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/receive/solveList',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 1f5cdcf..edac0e5 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -170,12 +170,38 @@
         component: () => import('@/views/system/process/process.vue'),
         meta: {
           title: '流程管理',
+          icon: 'ep:key',
           auth: '/sys/process',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/process',
         },
       },
+      {
+        path: 'edit',
+        name: 'ProcessListEdit',
+        component: () => import('@/views/system/process/editProcess.vue'),
+        meta: {
+          title: '流程管理',
+          icon: 'ep:key',
+          auth: '/sys/process',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/process/list',
+        },
+      },
+      {
+        path: 'detail',
+        name: 'ProcessListDetail',
+        component: () => import('@/views/system/process/detailProcess.vue'),
+        meta: {
+          title: '流程管理',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/process/list',
+        },
+      },
     ],
   },
   {
diff --git a/src/views/device/receive/applyList.vue b/src/views/device/receive/applyList.vue
index 34256c6..ee6107e 100644
--- a/src/views/device/receive/applyList.vue
+++ b/src/views/device/receive/applyList.vue
@@ -2,22 +2,16 @@
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { useRoute, useRouter } from 'vue-router'
 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: '', // 编号
@@ -115,9 +109,10 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
+const $router = useRouter()
 // 新建
 const add = () => {
-  typeValue.value = 'add'
+  $router.push({ path: '/receive/add', query: { typeValue: 'add' } })
 }
 // 导出
 const exportExcelBtn = () => {
@@ -147,9 +142,7 @@
 const exportAll = () => {
   exportExcelBtn()
 }
-const close = () => {
-  typeValue.value = 'normal'
-}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -232,7 +225,7 @@
     approveOpinion.value = '0'
   }
   else if (val === '查看') {
-    typeValue.value = 'check'
+    $router.push({ path: '/receive/check', query: { typeValue: 'check' } })
   }
 }
 // 按钮切换
@@ -271,7 +264,6 @@
 <template>
   <app-container>
     <search-area
-      v-if="typeValue !== 'add' && typeValue !== 'check'"
       :need-clear="true"
       @search="searchList" @clear="clearList"
     >
@@ -312,7 +304,7 @@
       </search-item>
     </search-area>
 
-    <table-container v-if="typeValue !== 'add' && typeValue !== 'check'">
+    <table-container>
       <template #btns-right>
         <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" />
@@ -330,7 +322,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="290">
+          <el-table-column label="操作" align="center" width="220">
             <template #default="{ row }">
               <el-button
                 size="small"
@@ -389,13 +381,8 @@
         </template>
       </normal-table>
     </table-container>
-    <button-box v-if="typeValue !== 'add' && typeValue !== 'check'" :active="active" @changeCurrentButton="changeCurrentButton" />
+    <button-box :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>
 
diff --git a/src/views/device/receive/createOrCheck.vue b/src/views/device/receive/createOrCheck.vue
index d2667cd..5355408 100644
--- a/src/views/device/receive/createOrCheck.vue
+++ b/src/views/device/receive/createOrCheck.vue
@@ -1,16 +1,14 @@
 <script lang="ts" setup name="CreateOrCheck">
-import { reactive, ref } from 'vue'
+import { onMounted, reactive, ref } from 'vue'
 import type { Ref } from 'vue'
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage } from 'element-plus'
+import { useRoute, useRouter } from 'vue-router'
 import type { IdeviceListQuery, Iform } from './receive'
 import SelectDeviceDialog from './selectDeviceDialog.vue'
 import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
-
-const props = defineProps({
-  typeValue: String,
-})
-const emits = defineEmits(['close'])
+const $route = useRoute()
+const typeValue = ref()
 const isMulti = ref(false) // 是否批量添加(允许多选)
 const selectIndex = ref()
 const { proxy } = getCurrentInstance() as any
@@ -18,11 +16,12 @@
 const isShowDialog = ref(false) // 控制审批对话框显隐
 const total = ref(20)// 总数
 const approveOpinion = ref() // 审批意见：1同意2驳回0拒绝
-const type = {
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
   add: '新建',
+  detail: '详情',
   check: '查看',
-  normal: '正常',
-}
+}// 字典
 const haveApproveLimits = ref(true)// 是否有审批权限
 const isStart = ref(false)// 是否是发起人
 // 选中的内容
@@ -207,9 +206,10 @@
   dialogSelectDiviceVisible.value = true
   isMulti.value = true
 }
+const $router = useRouter()
 // 点击关闭
 const close = () => {
-  emits('close')
+  $router.push('/receive/applyList')
 }
 // 选择设备对话框关闭
 const closeDialog = () => {
@@ -227,38 +227,38 @@
     list.value.splice(selectIndex.value, 1, val[0])
   }
 }
+
+onMounted(() => {
+  typeValue.value = $route.query.typeValue
+})
 </script>
 
 <template>
   <app-container>
+    <detail-page :title="`设备领用申请-${textMap[typeValue]}`">
+      <template #btns>
+        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('1')">
+          同意
+        </el-button>
+        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('2')">
+          驳回
+        </el-button>
+        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('0')">
+          拒绝
+        </el-button>
+        <el-button v-if="isStart && typeValue === 'add'" type="primary" @click="handleClick('3')">
+          提交
+        </el-button>
+        <el-button v-if="isStart && typeValue === 'add'" type="primary" @click="handleClick('4')">
+          撤回
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
     <div class="create-check">
       <div class="top-info">
-        <div class="title-button">
-          <h4 class="title">
-            基本信息
-          </h4>
-          <div class="button-group">
-            <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" plain @click="handleClick('1')">
-              同意
-            </el-button>
-            <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" plain @click="handleClick('2')">
-              驳回
-            </el-button>
-            <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" plain @click="handleClick('0')">
-              拒绝
-            </el-button>
-            <el-button v-if="isStart && typeValue === 'add'" type="primary" plain @click="handleClick('3')">
-              提交
-            </el-button>
-            <el-button v-if="isStart && typeValue === 'add'" type="primary" plain @click="handleClick('4')">
-              撤回
-            </el-button>
-            <el-button type="primary" plain @click="close">
-              关闭
-            </el-button>
-          </div>
-        </div>
-
         <div class="form-area">
           <el-form
             ref="ruleFormRef"
@@ -269,10 +269,10 @@
             <el-row :gutter="20">
               <el-col :span="12">
                 <el-form-item label="申请单位" prop="company">
-                  <el-input v-model="form.company" clearable />
+                  <el-input v-model="form.company" clearable :disabled="typeValue === 'check'" />
                 </el-form-item>
                 <el-form-item label="申请人" prop="person">
-                  <el-input v-model="form.person" clearable />
+                  <el-input v-model="form.person" clearable :disabled="typeValue === 'check'" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
@@ -281,10 +281,11 @@
                     v-model="form.time"
                     type="datetime"
                     placeholder="请选择领用时间"
+                    :disabled="typeValue === 'check'"
                   />
                 </el-form-item>
                 <el-form-item label="申请说明">
-                  <el-input v-model="form.state" type="textarea" clearable />
+                  <el-input v-model="form.state" type="textarea" clearable :disabled="typeValue === 'check'" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -293,13 +294,13 @@
       </div>
       <table-container title="设备领用列表">
         <template #btns-right>
-          <el-button type="primary" @click="multiAdd">
+          <el-button v-if="typeValue !== 'check'" type="primary" @click="multiAdd">
             批量添加
           </el-button>
-          <el-button type="primary" @click="addRow">
+          <el-button v-if="typeValue !== 'check'" type="primary" @click="addRow">
             增加行
           </el-button>
-          <el-button type="primary" @click="delRow">
+          <el-button v-if="typeValue !== 'check'" type="primary" @click="delRow">
             删除行
           </el-button>
         </template>
@@ -315,7 +316,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="120">
+            <el-table-column label="操作" align="center" width="60">
               <template #default="scope">
                 <el-button
                   size="small"
@@ -332,7 +333,7 @@
       </table-container>
 
       <table-container title="审批流程">
-        <!-- <normal-table
+      <!-- <normal-table
           :data="list" :total="total" :columns="columns" :query="listQuery"
           is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
@@ -360,25 +361,27 @@
         </normal-table> -->
       </table-container>
     </div>
-  </app-container>
-  <select-device-dialog
-    :dialog-select-divice-visible="dialogSelectDiviceVisible"
-    :is-multi="isMulti"
-    @closeDialog="closeDialog"
-    @updateDeviceConfirm="updateDeviceConfirm"
-  />
+    <select-device-dialog
+      :dialog-select-divice-visible="dialogSelectDiviceVisible"
+      :is-multi="isMulti"
+      @closeDialog="closeDialog"
+      @updateDeviceConfirm="updateDeviceConfirm"
+    />
 
-  <!-- 同意、驳回、拒绝对话框显示 -->
-  <receive-dialog
-    :is-show-dialog="isShowDialog"
-    :approve-opinion="approveOpinion"
-    @closeDialog="closeDialog"
-  />
+    <!-- 同意、驳回、拒绝对话框显示 -->
+    <receive-dialog
+      :is-show-dialog="isShowDialog"
+      :approve-opinion="approveOpinion"
+      @closeDialog="closeDialog"
+    />
+  </app-container>
 </template>
 
 <style lang="scss" scoped>
 // 样式
 .create-check {
+  margin-top: 10px;
+
   .top-info {
     display: flex;
     flex-direction: column;
diff --git a/src/views/device/receive/solveComponent/detail.vue b/src/views/device/receive/solveComponent/detail.vue
index 6091fc5..aa6cb58 100644
--- a/src/views/device/receive/solveComponent/detail.vue
+++ b/src/views/device/receive/solveComponent/detail.vue
@@ -6,13 +6,8 @@
 const props = defineProps({
   typeValue: String,
 })
-const emits = defineEmits(['close'])
 const { proxy } = getCurrentInstance() as any
 const total = ref(20)// 总数
-const type = {
-  check: '查看',
-  normal: '正常',
-}
 
 // 表单数据
 const form = ref({
@@ -99,8 +94,9 @@
   // fetchData(true)
 }
 // 点击关闭
+const $router = useRouter()
 const close = () => {
-  emits('close')
+  $router.push('/receive/solveList')
 }
 // 打印
 const printObj = ref({
@@ -133,52 +129,51 @@
 
 <template>
   <app-container>
+    <detail-page title="设备领用处理-查看">
+      <template #btns>
+        <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
     <div id="lysq" class="lysq-create-check">
       <div class="top-info">
-        <div class="title-button">
-          <h4 class="title">
-            领用申请
-          </h4>
-          <div class="button-group">
-            <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
-              打印
-            </el-button>
-            <el-button type="primary" plain @click="close">
-              关闭
-            </el-button>
+        <detail-block title="领用申请">
+          <div class="form-area">
+            <el-form
+              ref="ruleFormRef"
+              :model="form"
+              label-width="120px"
+            >
+              <el-row :gutter="20">
+                <el-col :span="12">
+                  <el-form-item label="申请单位">
+                    <el-input v-model="form.company" clearable disabled />
+                  </el-form-item>
+                  <el-form-item label="申请人">
+                    <el-input v-model="form.person" clearable disabled />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="领用时间">
+                    <el-date-picker
+                      v-model="form.time"
+                      type="datetime"
+                      placeholder="请选择领用时间"
+                      disabled
+                    />
+                  </el-form-item>
+                  <el-form-item label="申请说明">
+                    <el-input v-model="form.state" type="textarea" clearable disabled />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
           </div>
-        </div>
-
-        <div class="form-area">
-          <el-form
-            ref="ruleFormRef"
-            :model="form"
-            label-width="120px"
-          >
-            <el-row :gutter="20">
-              <el-col :span="12">
-                <el-form-item label="申请单位">
-                  <el-input v-model="form.company" clearable />
-                </el-form-item>
-                <el-form-item label="申请人">
-                  <el-input v-model="form.person" clearable />
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="领用时间">
-                  <el-date-picker
-                    v-model="form.time"
-                    type="datetime"
-                    placeholder="请选择领用时间"
-                  />
-                </el-form-item>
-                <el-form-item label="申请说明">
-                  <el-input v-model="form.state" type="textarea" clearable />
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </el-form>
-        </div>
+        </detail-block>
       </div>
       <table-container title="设备领用列表">
         <normal-table
@@ -230,6 +225,8 @@
 <style lang="scss" scoped>
 // 样式
 .lysq-create-check {
+  margin-top: 10px;
+
   .top-info {
     display: flex;
     flex-direction: column;
diff --git a/src/views/device/receive/solveList.vue b/src/views/device/receive/solveList.vue
index 7c737d6..f1db533 100644
--- a/src/views/device/receive/solveList.vue
+++ b/src/views/device/receive/solveList.vue
@@ -2,11 +2,11 @@
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { useRoute, useRouter } from 'vue-router'
 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') // 选中的按钮
@@ -14,7 +14,6 @@
   check: '查看',
   normal: '正常',
 }
-const typeValue = ref('normal')
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
   number: '', // 编号
@@ -130,9 +129,6 @@
 const exportAll = () => {
   exportExcelBtn()
 }
-const close = () => {
-  typeValue.value = 'normal'
-}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -165,6 +161,7 @@
   extarCss: '',
 })
 // 操作
+const $router = useRouter()
 const handleEdit = (index: number, row: IsolveListType, val: string) => {
   if (val === '领用') {
     ElMessageBox.confirm(
@@ -221,7 +218,7 @@
       })
   }
   else if (val === '查看') {
-    typeValue.value = 'check'
+    $router.push('/receive/solveCheck')
   }
 }
 // 右上角按钮切换
@@ -245,7 +242,6 @@
 <template>
   <app-container>
     <search-area
-      v-if="typeValue !== 'check'"
       :need-clear="true"
       @search="searchList" @clear="clearList"
     >
@@ -286,7 +282,7 @@
       </search-item>
     </search-area>
 
-    <table-container v-if="typeValue !== 'check'">
+    <table-container>
       <template #btns-right>
         <el-button v-if="proxy.hasPerm('/measure/measureSource/add')" type="primary" @click="execTag">
           标签识别
@@ -306,7 +302,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="180">
+          <el-table-column label="操作" align="center" width="130">
             <template #default="{ row }">
               <el-button
                 size="small"
@@ -350,11 +346,9 @@
       </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>
 
diff --git a/src/views/setting.vue b/src/views/setting.vue
index 9910a0d..664598f 100644
--- a/src/views/setting.vue
+++ b/src/views/setting.vue
@@ -108,13 +108,13 @@
   }
 }
 // 退出流程编辑,退回上一页
-const closeSetting = () => {
-  router.go(-1)
-}
+// const closeSetting = () => {
+//   router.go(-1)
+// }
 </script>
 
 <template>
-  <div>
+  <div class="workFlow-setting">
     <!-- <div class="fd-nav">
       <div class="fd-nav-left">
         <div class="fd-nav-back" @click="toReturn">
@@ -135,7 +135,7 @@
         关 闭
       </el-button>
     </div> -->
-    <el-button>保存</el-button>
+    <!-- <el-button>保存</el-button> -->
     <div class="fd-nav-content">
       <section class="dingflow-design">
         <!-- <div class="zoom">
@@ -168,35 +168,40 @@
 </template>
 
 <style lang="scss" scoped>
-.close-button {
-  display: flex;
-  justify-content: flex-end;
-  margin: 20px;
-}
+.workFlow-setting {
+  margin-top: 10px;
 
-.box-scale {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-// .end-node-circle {
-.end-node {
-  justify-content: center;
-  flex-direction: column;
-  align-content: center;
+  .close-button {
+    display: flex;
+    justify-content: flex-end;
+    margin: 20px;
+  }
 
-  p {
-    width: 280px;
-    height: 40px;
-    line-height: 40px;
-    color: #fff;
-    text-align: center;
-    background-color: #8cafff;
-    border-radius: 4px;
-    font-size: 14px;
-    margin: 0;
+  .box-scale {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+  // .end-node-circle {
+  .end-node {
+    justify-content: center;
+    flex-direction: column;
+    align-content: center;
+
+    p {
+      width: 280px;
+      height: 40px;
+      line-height: 40px;
+      color: #fff;
+      text-align: center;
+      background-color: #8cafff;
+      border-radius: 4px;
+      font-size: 14px;
+      margin: 0;
+    }
   }
 }
+
 // }
 </style>
 
diff --git a/src/views/system/process/detailProcess.vue b/src/views/system/process/detailProcess.vue
index 69f92b6..9e83ba7 100644
--- a/src/views/system/process/detailProcess.vue
+++ b/src/views/system/process/detailProcess.vue
@@ -3,9 +3,11 @@
 import { reactive, ref } from 'vue'
 import type { FormInstance, FormRules } from 'element-plus'
 import type { Ref } from 'vue'
-import setting from '../../setting.vue'
+import { useRoute, useRouter } from 'vue-router'
+import Setting from '../../setting.vue'
 import type { Iform } from './process'
 // import WorkFlow from '@/components/workFlow/workFlow.vue'
+
 const emits = defineEmits(['close'])
 const ruleFormRef = ref<FormInstance>()
 const form: Ref<Iform> = ref({
@@ -62,23 +64,21 @@
     title: '否',
   },
 ]
+const $router = useRouter()
 // 关闭
 const close = () => {
-  emits('close')
+  $router.push('/process/list')
 }
 </script>
 
 <template>
   <div class="edit-process">
-    <h5 class="title">
-      流程编辑
-    </h5>
-    <div class="edit">
-      <div class="button-area">
-        <el-button type="primary" @click="close">
+    <detail-page title="流程管理-详情">
+      <template #btns>
+        <el-button type="info" @click="close">
           关闭
         </el-button>
-      </div>
+      </template>
       <el-form ref="ruleFormRef" :model="form" label-width="150px">
         <el-row :gutter="20">
           <el-col :span="8">
@@ -142,10 +142,8 @@
           </el-col>
         </el-row>
       </el-form>
-    </div>
-    <h5 class="title">
-      流程配置
-    </h5>
+    </detail-page>
+    <detail-block title="流程配置" />
     <setting :allow-edit-node="false" />
   </div>
 </template>
@@ -153,32 +151,11 @@
 <style lang="scss" scoped>
   .edit-process {
     width: 100%;
+    padding: 10px;
 
     .title {
       margin: 0 0 20px;
       font-weight: 600;
     }
-
-    .edit {
-      width: 100%;
-      padding: 12px;
-      background-color: #fff;
-      border-radius: 7px;
-      margin: 0 0 20px;
-
-      .button-area {
-        width: 100%;
-        display: flex;
-        justify-content: flex-end;
-        margin-bottom: 20px;
-      }
-    }
-
-    .set {
-      width: 100%;
-      background-color: #fff;
-      border-radius: 7px;
-      margin: 20px 0;
-    }
   }
 </style>
diff --git a/src/views/system/process/editProcess.vue b/src/views/system/process/editProcess.vue
index 235a18a..c3c233d 100644
--- a/src/views/system/process/editProcess.vue
+++ b/src/views/system/process/editProcess.vue
@@ -3,9 +3,11 @@
 import { reactive, ref } from 'vue'
 import type { FormInstance, FormRules } from 'element-plus'
 import type { Ref } from 'vue'
+import { useRoute, useRouter } from 'vue-router'
 import setting from '../../setting.vue'
 import type { Iform } from './process'
 import WorkFlow from '@/components/workFlow/workFlow.vue'
+
 const emits = defineEmits(['close'])
 const ruleFormRef = ref<FormInstance>()
 const form: Ref<Iform> = ref({
@@ -93,9 +95,10 @@
   ],
 })
 
+const $router = useRouter()
 // 关闭
 const close = () => {
-  emits('close')
+  $router.push('/process/list')
 }
 // 保存
 const save = async (formEl: FormInstance | undefined) => {
@@ -127,91 +130,84 @@
 
 <template>
   <div class="edit-process">
-    <h5 class="title">
-      流程编辑
-    </h5>
-    <div class="edit">
-      <div class="button-area">
-        <el-button type="primary" @click="save(ruleFormRef)">
-          保存
-        </el-button>
-        <el-button type="primary" @click="close">
-          关闭
-        </el-button>
-      </div>
-      <el-form ref="ruleFormRef" :model="form" label-width="150px" :rules="rules">
-        <el-row :gutter="20">
-          <el-col :span="8">
-            <el-form-item label="流程编号">
-              {{ form.number }}
-            </el-form-item>
-            <el-form-item label="可选决策项" prop="selectDecision">
-              <el-select v-model="form.selectDecision" placeholder="请选择" @change="changeDecision">
-                <el-option
-                  v-for="item in decision"
-                  :key="item.id"
-                  :label="item.title"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-            <el-form-item label="流程描述">
-              <el-input v-model="form.desc" type="textarea" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="流程名称">
-              {{ form.name }}
-            </el-form-item>
+    <app-container>
+      <detail-page title="流程管理-编辑">
+        <template #btns>
+          <el-button type="primary" @click="save(ruleFormRef)">
+            保存
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <el-form ref="ruleFormRef" :model="form" label-width="150px" :rules="rules">
+          <el-row :gutter="20">
+            <el-col :span="8">
+              <el-form-item label="流程编号">
+                {{ form.number }}
+              </el-form-item>
+              <el-form-item label="可选决策项" prop="selectDecision">
+                <el-select v-model="form.selectDecision" placeholder="请选择" @change="changeDecision">
+                  <el-option
+                    v-for="item in decision"
+                    :key="item.id"
+                    :label="item.title"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-form-item>
+              <el-form-item label="流程描述">
+                <el-input v-model="form.desc" type="textarea" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="流程名称">
+                {{ form.name }}
+              </el-form-item>
 
-            <el-form-item v-if="form.selectDecision !== 'refuse'" label="可驳回至" prop="rejectTo">
-              <el-select v-model="form.rejectTo" placeholder="请选择" @change="changeRejectTo">
-                <el-option
-                  v-for="item in reject"
-                  :key="item.id"
-                  :label="item.title"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-            <el-form-item label="审批结果通知发起人" prop="isMessage">
-              <el-select v-model="form.isMessage" placeholder="请选择" @change="changeMessage">
-                <el-option
-                  v-for="item in messageData"
-                  :key="item.id"
-                  :label="item.title"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="关联业务">
-              {{ form.business }}
-            </el-form-item>
-            <el-form-item v-if="form.selectDecision !== 'refuse'" label="驳回修改数据" prop="changeData">
-              <el-select v-model="form.changeData" placeholder="请选择" @change="changeData">
-                <el-option
-                  v-for="item in rejectChangeData"
-                  :key="item.id"
-                  :label="item.title"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </div>
-    <!-- <button class="title" @click="goSetting">
-      流程配置
-    </button> -->
-    <!-- <div class="set"> -->
-    <h5 class="title">
-      流程配置
-    </h5>
-    <setting />
-    <!-- </div> -->
+              <el-form-item v-if="form.selectDecision !== 'refuse'" label="可驳回至" prop="rejectTo">
+                <el-select v-model="form.rejectTo" placeholder="请选择" @change="changeRejectTo">
+                  <el-option
+                    v-for="item in reject"
+                    :key="item.id"
+                    :label="item.title"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-form-item>
+              <el-form-item label="审批结果通知发起人" prop="isMessage">
+                <el-select v-model="form.isMessage" placeholder="请选择" @change="changeMessage">
+                  <el-option
+                    v-for="item in messageData"
+                    :key="item.id"
+                    :label="item.title"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="关联业务">
+                {{ form.business }}
+              </el-form-item>
+              <el-form-item v-if="form.selectDecision !== 'refuse'" label="驳回修改数据" prop="changeData">
+                <el-select v-model="form.changeData" placeholder="请选择" @change="changeData">
+                  <el-option
+                    v-for="item in rejectChangeData"
+                    :key="item.id"
+                    :label="item.title"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-page>
+
+      <detail-block title="流程配置" />
+      <setting />
+    </app-container>
   </div>
 </template>
 
diff --git a/src/views/system/process/process.vue b/src/views/system/process/process.vue
index 962131e..feccf08 100644
--- a/src/views/system/process/process.vue
+++ b/src/views/system/process/process.vue
@@ -2,6 +2,7 @@
 import { reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { Delete } from '@element-plus/icons-vue'
+import { useRoute, useRouter } from 'vue-router'
 import type { IlistQuery } from './process'
 import EditProcess from './editProcess.vue'
 import DetailProcess from './detailProcess.vue'
@@ -11,12 +12,12 @@
 const { proxy } = getCurrentInstance() as any
 const active = ref('main')
 const listQuery: IlistQuery = reactive({
-  // number: '', // 编号
-  // name: '', // 名称
-  // business: '', // 关联业务
-  // person: '', // 负责人
-  // time: '', // 创建时间
-  // status: '', // 当前流程状态,
+  number: '', // 编号
+  name: '', // 名称
+  business: '', // 关联业务
+  person: '', // 负责人
+  time: '', // 创建时间
+  status: '', // 当前流程状态,
   offset: 1,
   limit: 10,
 })
@@ -77,7 +78,7 @@
 ])
 const total = ref(20)
 const logTypeList = ref(null)
-const listLoading = ref(true)
+const listLoading = ref(false)
 const dialogFormVisible = ref(false)
 const dialogStatus = ref('')
 
@@ -95,7 +96,7 @@
   })
 }
 
-fetchData(true)
+// fetchData(true)
 
 // 查询数据
 const search = () => {
@@ -122,15 +123,20 @@
   listQuery.time = '' // 创建时间
   listQuery.status = '' // 当前流程状态,
 }
-// 编辑
-const edit = (row: IlistQuery) => {
-  console.log('编辑')
-  active.value = 'edit'
-}
-// 详情
-const detail = (row: IlistQuery) => {
-  console.log('查看详情')
-  active.value = 'detail'
+// // 编辑
+// const edit = (row: IlistQuery) => {
+//   console.log('编辑')
+//   active.value = 'edit'
+// }
+// // 详情
+// const detail = (row: IlistQuery) => {
+//   console.log('查看详情')
+//   active.value = 'detail'
+// }
+const $router = useRouter()
+// 点击编辑/详情
+const handleEdit = (row: IlistQuery, pageType: 'edit' | 'detail') => {
+  $router.push(`/process/${pageType}`)
 }
 // 废止
 const abolish = (row: IlistQuery) => {
@@ -281,18 +287,18 @@
                 </el-table-column>
               </template>
               <template #columns>
-                <el-table-column label="操作" width="200" align="center">
+                <el-table-column label="操作" width="160" align="center">
                   <template #default="scope">
-                    <el-button type="primary" link size="small" class="table-text-button" @click="edit(scope.row)">
+                    <el-button type="primary" link size="small" class="table-text-button" @click="handleEdit(scope.row, 'edit')">
                       编辑
                     </el-button>
-                    <el-button type="primary" link size="small" class="table-text-button" @click="detail(scope.row)">
+                    <el-button type="primary" link size="small" class="table-text-button" @click="handleEdit(scope.row, 'detail')">
                       详情
                     </el-button>
                     <el-button type="primary" link size="small" class="table-text-button" @click="abolish(scope.row)">
                       废止
                     </el-button>
-                    <el-button type="primary" link size="small" class="table-text-button" @click="del(scope.row)">
+                    <el-button type="danger" link size="small" class="table-text-button" @click="del(scope.row)">
                       删除
                     </el-button>
                   </template>
@@ -302,14 +308,6 @@
           </div>
         </table-container>
       </div>
-      <!-- 编辑 -->
-      <div v-if="active === 'edit'">
-        <edit-process @close="close" />
-      </div>
-      <!-- 详情 -->
-      <div v-if="active === 'detail'">
-        <detail-process @close="close" />
-      </div>
     </app-container>
   </div>
 </template>