diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index ed11f7e..026fd77 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -87,7 +87,7 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '附件说明', value: 'appendixDescn', align: 'center' },
   { text: '外观', value: 'appearance', align: 'center' },
-  { text: '检定要求', value: 'measureRequire', align: 'center' },
+  { text: '检定要求', value: 'specialRequire', align: 'center' },
 ])
 
 // 签章查询数据
@@ -238,6 +238,10 @@
 // ------------------------样品-----------------------------
 // 点击批量增加
 const multiAdd = () => {
+  if (!dataForm.value.customerNo) {
+    ElMessage.warning('请先选择委托方')
+    return
+  }
   sampleVisible.value = true
 }
 // 修改委托方对话框显隐
@@ -318,6 +322,11 @@
   getAutographList()
 }
 
+// 表格双击行
+const rowDblclick = (row: ISampleList) => {
+  row.isEdit = true
+}
+
 onMounted(async () => {
   if (pageType.value === 'add') {
     dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
@@ -592,7 +601,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="24" class="marg">
+            <!-- <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="样品外观:">
                   <el-input
@@ -605,7 +614,7 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
+            </el-row> -->
             <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="依据文件:">
@@ -642,6 +651,7 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
+          @row-dblclick="rowDblclick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -653,7 +663,17 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          />
+          >
+            <template v-if="item.value === 'specialRequire' && (pageType === 'add' || pageType === 'edit')" #default="scope">
+              <el-input
+                v-if="scope.row.isEdit"
+                v-model="scope.row.specialRequire"
+                placeholder="请输入检定要求"
+                class="input"
+              />
+              <span v-else>{{ scope.row.specialRequire }}</span>
+            </template>
+          </el-table-column>
         </el-table>
       </detail-block>
       <!-- 签章部分 -->

diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index ed11f7e..026fd77 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -87,7 +87,7 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '附件说明', value: 'appendixDescn', align: 'center' },
   { text: '外观', value: 'appearance', align: 'center' },
-  { text: '检定要求', value: 'measureRequire', align: 'center' },
+  { text: '检定要求', value: 'specialRequire', align: 'center' },
 ])
 
 // 签章查询数据
@@ -238,6 +238,10 @@
 // ------------------------样品-----------------------------
 // 点击批量增加
 const multiAdd = () => {
+  if (!dataForm.value.customerNo) {
+    ElMessage.warning('请先选择委托方')
+    return
+  }
   sampleVisible.value = true
 }
 // 修改委托方对话框显隐
@@ -318,6 +322,11 @@
   getAutographList()
 }
 
+// 表格双击行
+const rowDblclick = (row: ISampleList) => {
+  row.isEdit = true
+}
+
 onMounted(async () => {
   if (pageType.value === 'add') {
     dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
@@ -592,7 +601,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="24" class="marg">
+            <!-- <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="样品外观:">
                   <el-input
@@ -605,7 +614,7 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
+            </el-row> -->
             <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="依据文件:">
@@ -642,6 +651,7 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
+          @row-dblclick="rowDblclick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -653,7 +663,17 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          />
+          >
+            <template v-if="item.value === 'specialRequire' && (pageType === 'add' || pageType === 'edit')" #default="scope">
+              <el-input
+                v-if="scope.row.isEdit"
+                v-model="scope.row.specialRequire"
+                placeholder="请输入检定要求"
+                class="input"
+              />
+              <span v-else>{{ scope.row.specialRequire }}</span>
+            </template>
+          </el-table-column>
         </el-table>
       </detail-block>
       <!-- 签章部分 -->
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index 3decec5..2d1c1ff 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -60,6 +60,7 @@
   appendixDescn: string // 附件说明
   appearance: string // 外观
   measureRequire: string // 检定要求
+  isEdit?: boolean // 是否可编辑
 }
 
 // 字典

diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index ed11f7e..026fd77 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -87,7 +87,7 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '附件说明', value: 'appendixDescn', align: 'center' },
   { text: '外观', value: 'appearance', align: 'center' },
-  { text: '检定要求', value: 'measureRequire', align: 'center' },
+  { text: '检定要求', value: 'specialRequire', align: 'center' },
 ])
 
 // 签章查询数据
@@ -238,6 +238,10 @@
 // ------------------------样品-----------------------------
 // 点击批量增加
 const multiAdd = () => {
+  if (!dataForm.value.customerNo) {
+    ElMessage.warning('请先选择委托方')
+    return
+  }
   sampleVisible.value = true
 }
 // 修改委托方对话框显隐
@@ -318,6 +322,11 @@
   getAutographList()
 }
 
+// 表格双击行
+const rowDblclick = (row: ISampleList) => {
+  row.isEdit = true
+}
+
 onMounted(async () => {
   if (pageType.value === 'add') {
     dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
@@ -592,7 +601,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="24" class="marg">
+            <!-- <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="样品外观:">
                   <el-input
@@ -605,7 +614,7 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
+            </el-row> -->
             <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="依据文件:">
@@ -642,6 +651,7 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
+          @row-dblclick="rowDblclick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -653,7 +663,17 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          />
+          >
+            <template v-if="item.value === 'specialRequire' && (pageType === 'add' || pageType === 'edit')" #default="scope">
+              <el-input
+                v-if="scope.row.isEdit"
+                v-model="scope.row.specialRequire"
+                placeholder="请输入检定要求"
+                class="input"
+              />
+              <span v-else>{{ scope.row.specialRequire }}</span>
+            </template>
+          </el-table-column>
         </el-table>
       </detail-block>
       <!-- 签章部分 -->
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index 3decec5..2d1c1ff 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -60,6 +60,7 @@
   appendixDescn: string // 附件说明
   appearance: string // 外观
   measureRequire: string // 检定要求
+  isEdit?: boolean // 是否可编辑
 }
 
 // 字典
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 612b3b4..71c8ed8 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -4,8 +4,7 @@
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { useRouter } from 'vue-router'
-import type { IMenu } from '../receive'
-import type { IlistQuery, IlistType } from '@/views/device/receive/receive'
+import type { IlistQuery, IlistType, dictType } from '@/views/device/receive/receive'
 import ButtonBox from '@/components/buttonBox/buttonBox.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { exportFile } from '@/utils/exportUtils'
@@ -24,24 +23,19 @@
 import type { userType } from '@/views/system/user/user-interface'
 import type { deptType } from '@/views/device/standingBook/standingBook-interface'
 import { getUserList } from '@/api/system/user'
+import { getDictByCode } from '@/api/system/dict'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
 
+const { proxy } = getCurrentInstance() as any
 const loadingTable = ref(false) // 表格loading
 const active = ref('') // 选中的按钮
+const activeTitle = ref('') // active对应的审批状态名字
 const approvalDialog = ref() // 审批对话框显隐
 const useDeptList = ref<deptType[]>([]) // 部门列表
 const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
 const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
 const applyPersonLoading = ref(false) // 申请人模糊搜索框loading
-
-const menu = ref<IMenu[]>([
-  { name: '全部', id: '0' },
-  { name: '草稿箱', id: '1' },
-  { name: '待审批', id: '2' },
-  { name: '审批中', id: '3' },
-  { name: '已通过', id: '4' },
-  { name: '未通过', id: '5' },
-  { name: '已取消', id: '6' },
-])
+const menu = ref<IMenu[]>([]) // 右上角审批状态按钮组合
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
   applyNo: '', // 申请编号
@@ -60,40 +54,17 @@
   offset: 1,
   limit: 20,
 })
-// 审批状态字典
-const approvalStatusMap: { [key: string]: string } = {
-  1: '草稿箱',
-  2: '待审批',
-  3: '审批中',
-  4: '已通过',
-  5: '未通过',
-  6: '已取消',
-  7: '非草稿',
-  8: '未通过-驳回',
-}
-// 审批状态字典
-const approvalStatusReserveMap: { [key: string]: string } = {
-  '草稿箱': '1',
-  '待审批': '2',
-  '审批中': '3',
-  '已通过': '4',
-  '未通过': '5',
-  '已取消': '6',
-  '非草稿': '7',
-  '未通过-驳回': '8',
-}
-// 表格数据
-const list = ref<IlistType[]>([])
-const { proxy } = getCurrentInstance() as any
-// 总数
-const total = ref(20)
+const approvalStatusMap = ref({}) as any// 审批状态字典{1：草稿箱}
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
+const list = ref<IlistType[]>([])// 表格数据
+const total = ref(20)// 页码总数
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '申请编号', value: 'applyNo', align: 'center' },
+  { text: '申请编号', value: 'applyNo', align: 'center', width: '180' },
   { text: '申请名称', value: 'applyName', align: 'center' },
   { text: '申请部门', value: 'applyUnitName', align: 'center' },
   { text: '申请人', value: 'applyPersonName', align: 'center' },
-  { text: '领用时间', value: 'time', align: 'center' },
+  { text: '领用时间', value: 'time', align: 'center', width: '160' },
   { text: '申请说明', value: 'applyDesc', align: 'center' },
   { text: '审批状态', value: 'approvalStatus', align: 'center' },
 ])
@@ -102,6 +73,33 @@
 // 筛选时间段数据
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {1：草稿箱}
+  res.data.forEach((item: any) => {
+    approvalStatusMap.value[`${item.value}`] = item.name
+  })
+
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+}
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -116,7 +114,7 @@
     list.value = response.data.rows.map((item: IlistType) => {
       return {
         ...item,
-        approvalStatus: approvalStatusMap[item.approvalStatus],
+        approvalStatus: approvalStatusMap.value[item.approvalStatus],
       }
     })
     total.value = parseInt(response.data.total)
@@ -317,9 +315,11 @@
     })
   }
 }
+
 // 按钮切换
 const changeCurrentButton = (val: string) => {
   active.value = val
+  activeTitle.value = menu.value.find(item => item.id === val)!.name
   window.sessionStorage.setItem('buttonBoxActive', val)
   clearList()
 }
@@ -362,20 +362,24 @@
   })
 }
 
-onMounted(() => {
-  if (window.sessionStorage.getItem('buttonBoxActive')) {
+onMounted(async () => {
+  await getDict() // 获取字典-审批状态
+  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
     active.value = window.sessionStorage.getItem('buttonBoxActive')!
   }
   else {
-    active.value = '0' // 全部
+    active.value = menu.value.find(item => item.name === '全部')!.id // 全部
+    activeTitle.value === '全部'
   }
   nextTick(() => {
     fetchData(true) // 获取表格数据
-    // 获取使用部门
     fetchDeptTreeList() // 获取使用部门
     fetchUserList() // 获取人员列表
   })
 })
+onUnmounted(() => {
+  window.sessionStorage.setItem('buttonBoxActive', '') // 清除
+})
 </script>
 
 <template>
@@ -446,7 +450,12 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="220" fixed="right">
+          <el-table-column
+            label="操作"
+            align="center"
+            :width="(activeTitle === '全部') ? 220 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 70 : 200"
+            fixed="right"
+          >
             <template #default="{ row }">
               <el-button
                 size="small"
@@ -457,37 +466,37 @@
                 查看
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (active === '0' || active === '2')"
+                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (activeTitle === '全部' || activeTitle === '待审批')"
                 size="small"
                 link
                 type="primary"
-                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                :disabled="(row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中') || row.decisionItem === 3"
                 @click="handleEdit(row, '同意')"
               >
                 同意
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (active === '0' || active === '2')"
+                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (activeTitle === '全部' || activeTitle === '待审批')"
                 size="small"
                 link
                 type="primary"
-                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                :disabled="(row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中') || row.decisionItem === 3"
                 @click="handleEdit(row, '驳回')"
               >
                 驳回
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (active === '0' || active === '2')"
+                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (activeTitle === '全部' || activeTitle === '待审批')"
                 size="small"
                 link
                 type="danger"
-                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                :disabled="(row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中') || row.decisionItem === 1 || row.decisionItem === 2"
                 @click="handleEdit(row, '拒绝')"
               >
                 拒绝
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (activeTitle === '草稿箱' || activeTitle === '已取消')"
                 size="small"
                 link
                 type="primary"
@@ -496,7 +505,7 @@
                 编辑
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (activeTitle === '草稿箱' || activeTitle === '已取消')"
                 size="small"
                 link
                 type="primary"
@@ -506,7 +515,7 @@
               </el-button>
               <!-- 是发起者且审批中可以取消 -->
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (active === '0' || active === '3')"
+                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (activeTitle === '全部' || activeTitle === '审批中')"
                 size="small"
                 link
                 type="info"
@@ -517,7 +526,7 @@
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (active !== '4' && active !== '5')"
+                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (activeTitle !== '已通过' && activeTitle !== '未通过')"
                 size="small"
                 link
                 type="danger"

diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index ed11f7e..026fd77 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -87,7 +87,7 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '附件说明', value: 'appendixDescn', align: 'center' },
   { text: '外观', value: 'appearance', align: 'center' },
-  { text: '检定要求', value: 'measureRequire', align: 'center' },
+  { text: '检定要求', value: 'specialRequire', align: 'center' },
 ])
 
 // 签章查询数据
@@ -238,6 +238,10 @@
 // ------------------------样品-----------------------------
 // 点击批量增加
 const multiAdd = () => {
+  if (!dataForm.value.customerNo) {
+    ElMessage.warning('请先选择委托方')
+    return
+  }
   sampleVisible.value = true
 }
 // 修改委托方对话框显隐
@@ -318,6 +322,11 @@
   getAutographList()
 }
 
+// 表格双击行
+const rowDblclick = (row: ISampleList) => {
+  row.isEdit = true
+}
+
 onMounted(async () => {
   if (pageType.value === 'add') {
     dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
@@ -592,7 +601,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="24" class="marg">
+            <!-- <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="样品外观:">
                   <el-input
@@ -605,7 +614,7 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
+            </el-row> -->
             <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="依据文件:">
@@ -642,6 +651,7 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
+          @row-dblclick="rowDblclick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -653,7 +663,17 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          />
+          >
+            <template v-if="item.value === 'specialRequire' && (pageType === 'add' || pageType === 'edit')" #default="scope">
+              <el-input
+                v-if="scope.row.isEdit"
+                v-model="scope.row.specialRequire"
+                placeholder="请输入检定要求"
+                class="input"
+              />
+              <span v-else>{{ scope.row.specialRequire }}</span>
+            </template>
+          </el-table-column>
         </el-table>
       </detail-block>
       <!-- 签章部分 -->
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index 3decec5..2d1c1ff 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -60,6 +60,7 @@
   appendixDescn: string // 附件说明
   appearance: string // 外观
   measureRequire: string // 检定要求
+  isEdit?: boolean // 是否可编辑
 }
 
 // 字典
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 612b3b4..71c8ed8 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -4,8 +4,7 @@
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { useRouter } from 'vue-router'
-import type { IMenu } from '../receive'
-import type { IlistQuery, IlistType } from '@/views/device/receive/receive'
+import type { IlistQuery, IlistType, dictType } from '@/views/device/receive/receive'
 import ButtonBox from '@/components/buttonBox/buttonBox.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { exportFile } from '@/utils/exportUtils'
@@ -24,24 +23,19 @@
 import type { userType } from '@/views/system/user/user-interface'
 import type { deptType } from '@/views/device/standingBook/standingBook-interface'
 import { getUserList } from '@/api/system/user'
+import { getDictByCode } from '@/api/system/dict'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
 
+const { proxy } = getCurrentInstance() as any
 const loadingTable = ref(false) // 表格loading
 const active = ref('') // 选中的按钮
+const activeTitle = ref('') // active对应的审批状态名字
 const approvalDialog = ref() // 审批对话框显隐
 const useDeptList = ref<deptType[]>([]) // 部门列表
 const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
 const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
 const applyPersonLoading = ref(false) // 申请人模糊搜索框loading
-
-const menu = ref<IMenu[]>([
-  { name: '全部', id: '0' },
-  { name: '草稿箱', id: '1' },
-  { name: '待审批', id: '2' },
-  { name: '审批中', id: '3' },
-  { name: '已通过', id: '4' },
-  { name: '未通过', id: '5' },
-  { name: '已取消', id: '6' },
-])
+const menu = ref<IMenu[]>([]) // 右上角审批状态按钮组合
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
   applyNo: '', // 申请编号
@@ -60,40 +54,17 @@
   offset: 1,
   limit: 20,
 })
-// 审批状态字典
-const approvalStatusMap: { [key: string]: string } = {
-  1: '草稿箱',
-  2: '待审批',
-  3: '审批中',
-  4: '已通过',
-  5: '未通过',
-  6: '已取消',
-  7: '非草稿',
-  8: '未通过-驳回',
-}
-// 审批状态字典
-const approvalStatusReserveMap: { [key: string]: string } = {
-  '草稿箱': '1',
-  '待审批': '2',
-  '审批中': '3',
-  '已通过': '4',
-  '未通过': '5',
-  '已取消': '6',
-  '非草稿': '7',
-  '未通过-驳回': '8',
-}
-// 表格数据
-const list = ref<IlistType[]>([])
-const { proxy } = getCurrentInstance() as any
-// 总数
-const total = ref(20)
+const approvalStatusMap = ref({}) as any// 审批状态字典{1：草稿箱}
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
+const list = ref<IlistType[]>([])// 表格数据
+const total = ref(20)// 页码总数
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '申请编号', value: 'applyNo', align: 'center' },
+  { text: '申请编号', value: 'applyNo', align: 'center', width: '180' },
   { text: '申请名称', value: 'applyName', align: 'center' },
   { text: '申请部门', value: 'applyUnitName', align: 'center' },
   { text: '申请人', value: 'applyPersonName', align: 'center' },
-  { text: '领用时间', value: 'time', align: 'center' },
+  { text: '领用时间', value: 'time', align: 'center', width: '160' },
   { text: '申请说明', value: 'applyDesc', align: 'center' },
   { text: '审批状态', value: 'approvalStatus', align: 'center' },
 ])
@@ -102,6 +73,33 @@
 // 筛选时间段数据
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {1：草稿箱}
+  res.data.forEach((item: any) => {
+    approvalStatusMap.value[`${item.value}`] = item.name
+  })
+
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+}
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -116,7 +114,7 @@
     list.value = response.data.rows.map((item: IlistType) => {
       return {
         ...item,
-        approvalStatus: approvalStatusMap[item.approvalStatus],
+        approvalStatus: approvalStatusMap.value[item.approvalStatus],
       }
     })
     total.value = parseInt(response.data.total)
@@ -317,9 +315,11 @@
     })
   }
 }
+
 // 按钮切换
 const changeCurrentButton = (val: string) => {
   active.value = val
+  activeTitle.value = menu.value.find(item => item.id === val)!.name
   window.sessionStorage.setItem('buttonBoxActive', val)
   clearList()
 }
@@ -362,20 +362,24 @@
   })
 }
 
-onMounted(() => {
-  if (window.sessionStorage.getItem('buttonBoxActive')) {
+onMounted(async () => {
+  await getDict() // 获取字典-审批状态
+  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
     active.value = window.sessionStorage.getItem('buttonBoxActive')!
   }
   else {
-    active.value = '0' // 全部
+    active.value = menu.value.find(item => item.name === '全部')!.id // 全部
+    activeTitle.value === '全部'
   }
   nextTick(() => {
     fetchData(true) // 获取表格数据
-    // 获取使用部门
     fetchDeptTreeList() // 获取使用部门
     fetchUserList() // 获取人员列表
   })
 })
+onUnmounted(() => {
+  window.sessionStorage.setItem('buttonBoxActive', '') // 清除
+})
 </script>
 
 <template>
@@ -446,7 +450,12 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="220" fixed="right">
+          <el-table-column
+            label="操作"
+            align="center"
+            :width="(activeTitle === '全部') ? 220 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 70 : 200"
+            fixed="right"
+          >
             <template #default="{ row }">
               <el-button
                 size="small"
@@ -457,37 +466,37 @@
                 查看
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (active === '0' || active === '2')"
+                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (activeTitle === '全部' || activeTitle === '待审批')"
                 size="small"
                 link
                 type="primary"
-                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                :disabled="(row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中') || row.decisionItem === 3"
                 @click="handleEdit(row, '同意')"
               >
                 同意
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (active === '0' || active === '2')"
+                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (activeTitle === '全部' || activeTitle === '待审批')"
                 size="small"
                 link
                 type="primary"
-                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                :disabled="(row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中') || row.decisionItem === 3"
                 @click="handleEdit(row, '驳回')"
               >
                 驳回
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (active === '0' || active === '2')"
+                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (activeTitle === '全部' || activeTitle === '待审批')"
                 size="small"
                 link
                 type="danger"
-                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                :disabled="(row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中') || row.decisionItem === 1 || row.decisionItem === 2"
                 @click="handleEdit(row, '拒绝')"
               >
                 拒绝
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (activeTitle === '草稿箱' || activeTitle === '已取消')"
                 size="small"
                 link
                 type="primary"
@@ -496,7 +505,7 @@
                 编辑
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (activeTitle === '草稿箱' || activeTitle === '已取消')"
                 size="small"
                 link
                 type="primary"
@@ -506,7 +515,7 @@
               </el-button>
               <!-- 是发起者且审批中可以取消 -->
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (active === '0' || active === '3')"
+                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (activeTitle === '全部' || activeTitle === '审批中')"
                 size="small"
                 link
                 type="info"
@@ -517,7 +526,7 @@
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (active !== '4' && active !== '5')"
+                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (activeTitle !== '已通过' && activeTitle !== '未通过')"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/receive/receive.ts b/src/views/device/receive/receive.ts
index ce3b533..d4ac6a6 100644
--- a/src/views/device/receive/receive.ts
+++ b/src/views/device/receive/receive.ts
@@ -83,3 +83,11 @@
   validDate: string // 有效日期
 }
 
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
+

diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index ed11f7e..026fd77 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -87,7 +87,7 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '附件说明', value: 'appendixDescn', align: 'center' },
   { text: '外观', value: 'appearance', align: 'center' },
-  { text: '检定要求', value: 'measureRequire', align: 'center' },
+  { text: '检定要求', value: 'specialRequire', align: 'center' },
 ])
 
 // 签章查询数据
@@ -238,6 +238,10 @@
 // ------------------------样品-----------------------------
 // 点击批量增加
 const multiAdd = () => {
+  if (!dataForm.value.customerNo) {
+    ElMessage.warning('请先选择委托方')
+    return
+  }
   sampleVisible.value = true
 }
 // 修改委托方对话框显隐
@@ -318,6 +322,11 @@
   getAutographList()
 }
 
+// 表格双击行
+const rowDblclick = (row: ISampleList) => {
+  row.isEdit = true
+}
+
 onMounted(async () => {
   if (pageType.value === 'add') {
     dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
@@ -592,7 +601,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="24" class="marg">
+            <!-- <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="样品外观:">
                   <el-input
@@ -605,7 +614,7 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
+            </el-row> -->
             <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="依据文件:">
@@ -642,6 +651,7 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
+          @row-dblclick="rowDblclick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -653,7 +663,17 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          />
+          >
+            <template v-if="item.value === 'specialRequire' && (pageType === 'add' || pageType === 'edit')" #default="scope">
+              <el-input
+                v-if="scope.row.isEdit"
+                v-model="scope.row.specialRequire"
+                placeholder="请输入检定要求"
+                class="input"
+              />
+              <span v-else>{{ scope.row.specialRequire }}</span>
+            </template>
+          </el-table-column>
         </el-table>
       </detail-block>
       <!-- 签章部分 -->
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index 3decec5..2d1c1ff 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -60,6 +60,7 @@
   appendixDescn: string // 附件说明
   appearance: string // 外观
   measureRequire: string // 检定要求
+  isEdit?: boolean // 是否可编辑
 }
 
 // 字典
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 612b3b4..71c8ed8 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -4,8 +4,7 @@
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { useRouter } from 'vue-router'
-import type { IMenu } from '../receive'
-import type { IlistQuery, IlistType } from '@/views/device/receive/receive'
+import type { IlistQuery, IlistType, dictType } from '@/views/device/receive/receive'
 import ButtonBox from '@/components/buttonBox/buttonBox.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { exportFile } from '@/utils/exportUtils'
@@ -24,24 +23,19 @@
 import type { userType } from '@/views/system/user/user-interface'
 import type { deptType } from '@/views/device/standingBook/standingBook-interface'
 import { getUserList } from '@/api/system/user'
+import { getDictByCode } from '@/api/system/dict'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
 
+const { proxy } = getCurrentInstance() as any
 const loadingTable = ref(false) // 表格loading
 const active = ref('') // 选中的按钮
+const activeTitle = ref('') // active对应的审批状态名字
 const approvalDialog = ref() // 审批对话框显隐
 const useDeptList = ref<deptType[]>([]) // 部门列表
 const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
 const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
 const applyPersonLoading = ref(false) // 申请人模糊搜索框loading
-
-const menu = ref<IMenu[]>([
-  { name: '全部', id: '0' },
-  { name: '草稿箱', id: '1' },
-  { name: '待审批', id: '2' },
-  { name: '审批中', id: '3' },
-  { name: '已通过', id: '4' },
-  { name: '未通过', id: '5' },
-  { name: '已取消', id: '6' },
-])
+const menu = ref<IMenu[]>([]) // 右上角审批状态按钮组合
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
   applyNo: '', // 申请编号
@@ -60,40 +54,17 @@
   offset: 1,
   limit: 20,
 })
-// 审批状态字典
-const approvalStatusMap: { [key: string]: string } = {
-  1: '草稿箱',
-  2: '待审批',
-  3: '审批中',
-  4: '已通过',
-  5: '未通过',
-  6: '已取消',
-  7: '非草稿',
-  8: '未通过-驳回',
-}
-// 审批状态字典
-const approvalStatusReserveMap: { [key: string]: string } = {
-  '草稿箱': '1',
-  '待审批': '2',
-  '审批中': '3',
-  '已通过': '4',
-  '未通过': '5',
-  '已取消': '6',
-  '非草稿': '7',
-  '未通过-驳回': '8',
-}
-// 表格数据
-const list = ref<IlistType[]>([])
-const { proxy } = getCurrentInstance() as any
-// 总数
-const total = ref(20)
+const approvalStatusMap = ref({}) as any// 审批状态字典{1：草稿箱}
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
+const list = ref<IlistType[]>([])// 表格数据
+const total = ref(20)// 页码总数
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '申请编号', value: 'applyNo', align: 'center' },
+  { text: '申请编号', value: 'applyNo', align: 'center', width: '180' },
   { text: '申请名称', value: 'applyName', align: 'center' },
   { text: '申请部门', value: 'applyUnitName', align: 'center' },
   { text: '申请人', value: 'applyPersonName', align: 'center' },
-  { text: '领用时间', value: 'time', align: 'center' },
+  { text: '领用时间', value: 'time', align: 'center', width: '160' },
   { text: '申请说明', value: 'applyDesc', align: 'center' },
   { text: '审批状态', value: 'approvalStatus', align: 'center' },
 ])
@@ -102,6 +73,33 @@
 // 筛选时间段数据
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {1：草稿箱}
+  res.data.forEach((item: any) => {
+    approvalStatusMap.value[`${item.value}`] = item.name
+  })
+
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+}
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -116,7 +114,7 @@
     list.value = response.data.rows.map((item: IlistType) => {
       return {
         ...item,
-        approvalStatus: approvalStatusMap[item.approvalStatus],
+        approvalStatus: approvalStatusMap.value[item.approvalStatus],
       }
     })
     total.value = parseInt(response.data.total)
@@ -317,9 +315,11 @@
     })
   }
 }
+
 // 按钮切换
 const changeCurrentButton = (val: string) => {
   active.value = val
+  activeTitle.value = menu.value.find(item => item.id === val)!.name
   window.sessionStorage.setItem('buttonBoxActive', val)
   clearList()
 }
@@ -362,20 +362,24 @@
   })
 }
 
-onMounted(() => {
-  if (window.sessionStorage.getItem('buttonBoxActive')) {
+onMounted(async () => {
+  await getDict() // 获取字典-审批状态
+  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
     active.value = window.sessionStorage.getItem('buttonBoxActive')!
   }
   else {
-    active.value = '0' // 全部
+    active.value = menu.value.find(item => item.name === '全部')!.id // 全部
+    activeTitle.value === '全部'
   }
   nextTick(() => {
     fetchData(true) // 获取表格数据
-    // 获取使用部门
     fetchDeptTreeList() // 获取使用部门
     fetchUserList() // 获取人员列表
   })
 })
+onUnmounted(() => {
+  window.sessionStorage.setItem('buttonBoxActive', '') // 清除
+})
 </script>
 
 <template>
@@ -446,7 +450,12 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="220" fixed="right">
+          <el-table-column
+            label="操作"
+            align="center"
+            :width="(activeTitle === '全部') ? 220 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 70 : 200"
+            fixed="right"
+          >
             <template #default="{ row }">
               <el-button
                 size="small"
@@ -457,37 +466,37 @@
                 查看
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (active === '0' || active === '2')"
+                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (activeTitle === '全部' || activeTitle === '待审批')"
                 size="small"
                 link
                 type="primary"
-                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                :disabled="(row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中') || row.decisionItem === 3"
                 @click="handleEdit(row, '同意')"
               >
                 同意
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (active === '0' || active === '2')"
+                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (activeTitle === '全部' || activeTitle === '待审批')"
                 size="small"
                 link
                 type="primary"
-                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                :disabled="(row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中') || row.decisionItem === 3"
                 @click="handleEdit(row, '驳回')"
               >
                 驳回
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (active === '0' || active === '2')"
+                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (activeTitle === '全部' || activeTitle === '待审批')"
                 size="small"
                 link
                 type="danger"
-                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                :disabled="(row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中') || row.decisionItem === 1 || row.decisionItem === 2"
                 @click="handleEdit(row, '拒绝')"
               >
                 拒绝
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (activeTitle === '草稿箱' || activeTitle === '已取消')"
                 size="small"
                 link
                 type="primary"
@@ -496,7 +505,7 @@
                 编辑
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (activeTitle === '草稿箱' || activeTitle === '已取消')"
                 size="small"
                 link
                 type="primary"
@@ -506,7 +515,7 @@
               </el-button>
               <!-- 是发起者且审批中可以取消 -->
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (active === '0' || active === '3')"
+                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (activeTitle === '全部' || activeTitle === '审批中')"
                 size="small"
                 link
                 type="info"
@@ -517,7 +526,7 @@
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (active !== '4' && active !== '5')"
+                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (activeTitle !== '已通过' && activeTitle !== '未通过')"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/receive/receive.ts b/src/views/device/receive/receive.ts
index ce3b533..d4ac6a6 100644
--- a/src/views/device/receive/receive.ts
+++ b/src/views/device/receive/receive.ts
@@ -83,3 +83,11 @@
   validDate: string // 有效日期
 }
 
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
+
diff --git a/src/views/device/receive/solve/solveList.vue b/src/views/device/receive/solve/solveList.vue
index b541f35..cb4dba8 100644
--- a/src/views/device/receive/solve/solveList.vue
+++ b/src/views/device/receive/solve/solveList.vue
@@ -5,7 +5,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { useRouter } from 'vue-router'
 import ButtonBox from '@/components/buttonBox/buttonBox.vue'
-import type { IMenu, IlistQuery, IsolveListType } from '@/views/device/receive/receive'
+import type { IlistQuery, IsolveListType, dictType } from '@/views/device/receive/receive'
 import { exportFile } from '@/utils/exportUtils'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -21,6 +21,8 @@
   getReceiveApplyList,
   updateProcessResult,
 } from '@/api/device/receive'
+import { getDictByCode } from '@/api/system/dict'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
 
 const useDeptList = ref<deptType[]>([]) // 部门列表
 const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
@@ -28,22 +30,9 @@
 const applyPersonLoading = ref(false) // 申请人模糊搜索框loading
 const loadingTable = ref(false) // 表格loading
 const active = ref('') // 选中的按钮
-
-// 审批状态字典
-const approvalStatusMap: { [key: string]: string } = {
-  1: '草稿箱',
-  2: '待审批',
-  3: '审批中',
-  4: '已通过',
-  5: '未通过',
-  6: '已取消',
-  7: '非草稿',
-  8: '未通过-驳回',
-}
-const menu = ref<IMenu[]>([
-  { name: '未领用', id: '4' },
-  { name: '已领用', id: '5' },
-])
+const approvalStatusMap = ref({}) as any// 审批状态字典{1：草稿箱}
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
+const menu = ref<IMenu[]>([]) // 右上角按钮
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
   applyNo: '', // 申请编号
@@ -72,17 +61,44 @@
 const total = ref(20)
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '申请编号', value: 'applyNo', align: 'center' },
+  { text: '申请编号', value: 'applyNo', align: 'center', width: '180' },
   { text: '申请名称', value: 'applyName', align: 'center' },
   { text: '申请部门', value: 'applyUnitName', align: 'center' },
   { text: '申请人', value: 'applyPersonName', align: 'center' },
-  { text: '领用时间', value: 'time', align: 'center' },
+  { text: '领用时间', value: 'time', align: 'center', width: '160' },
   { text: '申请说明', value: 'applyDesc', align: 'center' },
   { text: '审批状态', value: 'approvalStatus', align: 'center' },
 ])
 // 选中的内容
 const checkoutList = ref<string[]>([])
 
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {1：草稿箱}
+  res.data.forEach((item: any) => {
+    approvalStatusMap.value[`${item.value}`] = item.name
+  })
+
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+
+  // 设备申请处理结果
+  const equipmentApplyProcessResultRes = await getDictByCode('equipmentApplyProcessResult')
+  // 制作右上角的菜单
+  equipmentApplyProcessResultRes.data.forEach((item: dictType) => {
+    if (item.name === '待领用' || item.name === '已领用') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+}
+
 // 重置
 const clearList = () => {
   listQuery.value = {
@@ -118,7 +134,7 @@
     list.value = response.data.rows.map((item: IsolveListType) => {
       return {
         ...item,
-        approvalStatus: approvalStatusMap[item.approvalStatus],
+        approvalStatus: approvalStatusMap.value[item.approvalStatus],
       }
     })
     total.value = parseInt(response.data.total)
@@ -288,12 +304,13 @@
   }
 }
 
-onMounted(() => {
-  if (window.sessionStorage.getItem('solveButtonBoxActive')) {
+onMounted(async () => {
+  await getDict()
+  if (window.sessionStorage.getItem('solveButtonBoxActive') !== 'undefined' && window.sessionStorage.getItem('solveButtonBoxActive') !== '') {
     active.value = window.sessionStorage.getItem('solveButtonBoxActive')!
   }
   else {
-    active.value = '4' // 未领用
+    active.value = menu.value.find(item => item.name === '待领用')!.id // 未领用
   }
   nextTick(() => {
     // 获取表格数据
@@ -380,12 +397,12 @@
         </template>
         <template #columns>
           <el-table-column label="操作" align="center" width="130" fixed="right">
-            <template #default="scope">
+            <template #default="{ row }">
               <el-button
                 size="small"
                 type="primary"
                 link
-                @click="handleEdit(scope.row, '查看')"
+                @click="handleEdit(row, '查看')"
               >
                 查看
               </el-button>
@@ -394,26 +411,26 @@
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(scope.row, '领用')"
+                @click="handleEdit(row, '领用')"
               >
                 领用
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                v-if="active === '4'"
+                v-if="row.approvalStatus === '已通过'"
                 size="small"
                 link
                 type="danger"
-                @click="handleEdit(scope.row, '删除')"
+                @click="handleEdit(row, '删除')"
               >
                 删除
               </el-button>
               <el-button
-                v-if="active === '5'"
+                v-if="row.approvalStatus === '未通过'"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(scope.row, '退领')"
+                @click="handleEdit(row, '退领')"
               >
                 退领
               </el-button>