diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index 1c3ae09..cb7dee6 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -64,7 +64,7 @@
   })
 }
 // 驳回后编辑接口
-export function updateSourceApproval(data: object) {
+export function failUpdateSourceApproval(data: object) {
   return request({
     url: '/meter/supplier/failUpdate',
     method: 'post',

diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index 1c3ae09..cb7dee6 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -64,7 +64,7 @@
   })
 }
 // 驳回后编辑接口
-export function updateSourceApproval(data: object) {
+export function failUpdateSourceApproval(data: object) {
   return request({
     url: '/meter/supplier/failUpdate',
     method: 'post',
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 64a02ff..3911d5b 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -411,7 +411,7 @@
         },
       },
       {
-        path: ':type/:id?',
+        path: ':type/:id?/:processId?',
         name: 'ListSourceAdd',
         component: () => import('@/views/measure/source/listAdd.vue'),
         meta: {

diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index 1c3ae09..cb7dee6 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -64,7 +64,7 @@
   })
 }
 // 驳回后编辑接口
-export function updateSourceApproval(data: object) {
+export function failUpdateSourceApproval(data: object) {
   return request({
     url: '/meter/supplier/failUpdate',
     method: 'post',
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 64a02ff..3911d5b 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -411,7 +411,7 @@
         },
       },
       {
-        path: ':type/:id?',
+        path: ':type/:id?/:processId?',
         name: 'ListSourceAdd',
         component: () => import('@/views/measure/source/listAdd.vue'),
         meta: {
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 5d7fc0f..7d13e1b 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -369,7 +369,7 @@
 
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
-  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
+  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '' && window.sessionStorage.getItem('buttonBoxActive') !== null) {
     active.value = window.sessionStorage.getItem('buttonBoxActive')!
   }
   else {

diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index 1c3ae09..cb7dee6 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -64,7 +64,7 @@
   })
 }
 // 驳回后编辑接口
-export function updateSourceApproval(data: object) {
+export function failUpdateSourceApproval(data: object) {
   return request({
     url: '/meter/supplier/failUpdate',
     method: 'post',
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 64a02ff..3911d5b 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -411,7 +411,7 @@
         },
       },
       {
-        path: ':type/:id?',
+        path: ':type/:id?/:processId?',
         name: 'ListSourceAdd',
         component: () => import('@/views/measure/source/listAdd.vue'),
         meta: {
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 5d7fc0f..7d13e1b 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -369,7 +369,7 @@
 
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
-  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
+  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '' && window.sessionStorage.getItem('buttonBoxActive') !== null) {
     active.value = window.sessionStorage.getItem('buttonBoxActive')!
   }
   else {
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 0a4cf0a..2916278 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -417,7 +417,7 @@
 }
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
-  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
+  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '' && window.sessionStorage.getItem('buttonBoxActive') !== null) {
     active.value = window.sessionStorage.getItem('buttonBoxActive')!
   }
   else {

diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index 1c3ae09..cb7dee6 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -64,7 +64,7 @@
   })
 }
 // 驳回后编辑接口
-export function updateSourceApproval(data: object) {
+export function failUpdateSourceApproval(data: object) {
   return request({
     url: '/meter/supplier/failUpdate',
     method: 'post',
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 64a02ff..3911d5b 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -411,7 +411,7 @@
         },
       },
       {
-        path: ':type/:id?',
+        path: ':type/:id?/:processId?',
         name: 'ListSourceAdd',
         component: () => import('@/views/measure/source/listAdd.vue'),
         meta: {
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 5d7fc0f..7d13e1b 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -369,7 +369,7 @@
 
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
-  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
+  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '' && window.sessionStorage.getItem('buttonBoxActive') !== null) {
     active.value = window.sessionStorage.getItem('buttonBoxActive')!
   }
   else {
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 0a4cf0a..2916278 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -417,7 +417,7 @@
 }
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
-  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
+  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '' && window.sessionStorage.getItem('buttonBoxActive') !== null) {
     active.value = window.sessionStorage.getItem('buttonBoxActive')!
   }
   else {
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 2d86a98..62da755 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -17,7 +17,7 @@
 const props = defineProps({
   status: {
     type: String,
-    default: '0',
+    default: '',
   },
   buttons: {
     type: Array as PropType<IButton[]>,
@@ -139,7 +139,6 @@
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
 
-const buttonTypeMap = ref('')
 // 点击删除
 const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
@@ -243,12 +242,10 @@
 }
 // 驳回后编辑
 const editAgain = (row: IlistApproval) => {
-  $router.push(`/maintenance/maintenanceList/edit/${row.id}?from=reject`)
+  $router.push(`/maintenance/maintenanceList/edit/${row.id}/${row.approvalStatusName}/${row.processId}?from=reject`)
 }
 // 跳转到详情
 const goDetail = (row: IlistApproval, type: string) => {
-  console.log('-----')
-
   $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.approvalStatusName}/${row.processId}`)
 }
 // 获取到组织信息
@@ -297,7 +294,12 @@
       approvalSubmit(row)
       break
     case '编辑':
-      goDetail(row, 'edit')
+      if (row.approvalStatusName === '未通过-驳回') {
+        editAgain(row)
+      }
+      else {
+        goDetail(row, 'edit')
+      }
       break
     case '同意':
       approvalDialog.value.initDialog('agree', row.taskId)
@@ -322,9 +324,10 @@
   () => props.status,
   (newVal: string) => {
     listQuery.value.approvalStatus = newVal
+    window.sessionStorage.setItem('maintenceListApprovalStatus', newVal)
     fetchData(false)
   },
-  { immediate: true })
+)
 
 // 打印列表
 function printList() {
@@ -347,19 +350,14 @@
   }
 }
 onMounted(async () => {
-  console.log(sessionStorage.getItem('maintenceListApprovalStatus'))
-
-  // await getDict()
-  // if (sessionStorage.getItem('maintenceListApprovalStatus')) {
-  //   listQuery.value.approvalStatus = sessionStorage.getItem('maintenceListApprovalStatus')!
-  //   console.log(approvalStatusReserveMap.value[sessionStorage.getItem('maintenceListMenu')!])
-  // }
-  // else {
-  //   console.log('没有')
-
-  //   listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部']
-  // }
-  // fetchData(true)
+  await getDict()
+  if (window.sessionStorage.getItem('maintenceListApprovalStatus')) {
+    listQuery.value.approvalStatus = window.sessionStorage.getItem('maintenceListApprovalStatus')!
+  }
+  else {
+    listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部']
+  }
+  fetchData(true)
 })
 </script>
 

diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index 1c3ae09..cb7dee6 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -64,7 +64,7 @@
   })
 }
 // 驳回后编辑接口
-export function updateSourceApproval(data: object) {
+export function failUpdateSourceApproval(data: object) {
   return request({
     url: '/meter/supplier/failUpdate',
     method: 'post',
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 64a02ff..3911d5b 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -411,7 +411,7 @@
         },
       },
       {
-        path: ':type/:id?',
+        path: ':type/:id?/:processId?',
         name: 'ListSourceAdd',
         component: () => import('@/views/measure/source/listAdd.vue'),
         meta: {
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 5d7fc0f..7d13e1b 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -369,7 +369,7 @@
 
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
-  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
+  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '' && window.sessionStorage.getItem('buttonBoxActive') !== null) {
     active.value = window.sessionStorage.getItem('buttonBoxActive')!
   }
   else {
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 0a4cf0a..2916278 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -417,7 +417,7 @@
 }
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
-  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
+  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '' && window.sessionStorage.getItem('buttonBoxActive') !== null) {
     active.value = window.sessionStorage.getItem('buttonBoxActive')!
   }
   else {
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 2d86a98..62da755 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -17,7 +17,7 @@
 const props = defineProps({
   status: {
     type: String,
-    default: '0',
+    default: '',
   },
   buttons: {
     type: Array as PropType<IButton[]>,
@@ -139,7 +139,6 @@
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
 
-const buttonTypeMap = ref('')
 // 点击删除
 const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
@@ -243,12 +242,10 @@
 }
 // 驳回后编辑
 const editAgain = (row: IlistApproval) => {
-  $router.push(`/maintenance/maintenanceList/edit/${row.id}?from=reject`)
+  $router.push(`/maintenance/maintenanceList/edit/${row.id}/${row.approvalStatusName}/${row.processId}?from=reject`)
 }
 // 跳转到详情
 const goDetail = (row: IlistApproval, type: string) => {
-  console.log('-----')
-
   $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.approvalStatusName}/${row.processId}`)
 }
 // 获取到组织信息
@@ -297,7 +294,12 @@
       approvalSubmit(row)
       break
     case '编辑':
-      goDetail(row, 'edit')
+      if (row.approvalStatusName === '未通过-驳回') {
+        editAgain(row)
+      }
+      else {
+        goDetail(row, 'edit')
+      }
       break
     case '同意':
       approvalDialog.value.initDialog('agree', row.taskId)
@@ -322,9 +324,10 @@
   () => props.status,
   (newVal: string) => {
     listQuery.value.approvalStatus = newVal
+    window.sessionStorage.setItem('maintenceListApprovalStatus', newVal)
     fetchData(false)
   },
-  { immediate: true })
+)
 
 // 打印列表
 function printList() {
@@ -347,19 +350,14 @@
   }
 }
 onMounted(async () => {
-  console.log(sessionStorage.getItem('maintenceListApprovalStatus'))
-
-  // await getDict()
-  // if (sessionStorage.getItem('maintenceListApprovalStatus')) {
-  //   listQuery.value.approvalStatus = sessionStorage.getItem('maintenceListApprovalStatus')!
-  //   console.log(approvalStatusReserveMap.value[sessionStorage.getItem('maintenceListMenu')!])
-  // }
-  // else {
-  //   console.log('没有')
-
-  //   listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部']
-  // }
-  // fetchData(true)
+  await getDict()
+  if (window.sessionStorage.getItem('maintenceListApprovalStatus')) {
+    listQuery.value.approvalStatus = window.sessionStorage.getItem('maintenceListApprovalStatus')!
+  }
+  else {
+    listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部']
+  }
+  fetchData(true)
 })
 </script>
 
diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
index 860d610..3e0498c 100644
--- a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
+++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
@@ -227,6 +227,10 @@
 const addId = ref('')
 // 提交、保存
 const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  if (!formInline.value.equipmentInfoList.length) {
+    ElMessage.warning('要求设备检修列表不能为空')
+    return
+  }
   if (item === '保存' && pageType.value === 'add') {
     if (!formEl) { return }
     await formEl.validate((valid, fields) => {
@@ -270,6 +274,9 @@
               }
             })
           }
+          else {
+            formInline.value.equipmentList = []
+          }
           if (from.value === 'reject') { // 未通过-驳回的编辑
             failUpdateEquipmentApply(formInline.value).then((res) => {
               if (res.code === 200) {
@@ -408,13 +415,15 @@
 const approvalRecordData = ref([]) // 审批流程数据
 // 查询审批记录
 function getApprovalRecord(processId: string) {
-  if (processId) {
-    fetchApproval(processId).then((res) => {
-      approvalRecordData.value = res.data
-    })
-  }
-  else {
-    ElMessage.warning('流程实例id为空')
+  if (pageType.value !== 'add') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
   }
 }
 // 审批结束回调
@@ -570,7 +579,7 @@
         </el-table-column>
       </el-table>
     </detail-block>
-    <detail-block v-if="formInline.approvalStatusName !== '草稿箱'" title="审批流程">
+    <detail-block v-if="formInline.approvalStatusName !== '草稿箱' && pageType !== 'add'" title="审批流程">
       <!-- 审批流程 -->
       <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
     </detail-block>

diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index 1c3ae09..cb7dee6 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -64,7 +64,7 @@
   })
 }
 // 驳回后编辑接口
-export function updateSourceApproval(data: object) {
+export function failUpdateSourceApproval(data: object) {
   return request({
     url: '/meter/supplier/failUpdate',
     method: 'post',
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 64a02ff..3911d5b 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -411,7 +411,7 @@
         },
       },
       {
-        path: ':type/:id?',
+        path: ':type/:id?/:processId?',
         name: 'ListSourceAdd',
         component: () => import('@/views/measure/source/listAdd.vue'),
         meta: {
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 5d7fc0f..7d13e1b 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -369,7 +369,7 @@
 
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
-  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
+  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '' && window.sessionStorage.getItem('buttonBoxActive') !== null) {
     active.value = window.sessionStorage.getItem('buttonBoxActive')!
   }
   else {
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 0a4cf0a..2916278 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -417,7 +417,7 @@
 }
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
-  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
+  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '' && window.sessionStorage.getItem('buttonBoxActive') !== null) {
     active.value = window.sessionStorage.getItem('buttonBoxActive')!
   }
   else {
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 2d86a98..62da755 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -17,7 +17,7 @@
 const props = defineProps({
   status: {
     type: String,
-    default: '0',
+    default: '',
   },
   buttons: {
     type: Array as PropType<IButton[]>,
@@ -139,7 +139,6 @@
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
 
-const buttonTypeMap = ref('')
 // 点击删除
 const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
@@ -243,12 +242,10 @@
 }
 // 驳回后编辑
 const editAgain = (row: IlistApproval) => {
-  $router.push(`/maintenance/maintenanceList/edit/${row.id}?from=reject`)
+  $router.push(`/maintenance/maintenanceList/edit/${row.id}/${row.approvalStatusName}/${row.processId}?from=reject`)
 }
 // 跳转到详情
 const goDetail = (row: IlistApproval, type: string) => {
-  console.log('-----')
-
   $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.approvalStatusName}/${row.processId}`)
 }
 // 获取到组织信息
@@ -297,7 +294,12 @@
       approvalSubmit(row)
       break
     case '编辑':
-      goDetail(row, 'edit')
+      if (row.approvalStatusName === '未通过-驳回') {
+        editAgain(row)
+      }
+      else {
+        goDetail(row, 'edit')
+      }
       break
     case '同意':
       approvalDialog.value.initDialog('agree', row.taskId)
@@ -322,9 +324,10 @@
   () => props.status,
   (newVal: string) => {
     listQuery.value.approvalStatus = newVal
+    window.sessionStorage.setItem('maintenceListApprovalStatus', newVal)
     fetchData(false)
   },
-  { immediate: true })
+)
 
 // 打印列表
 function printList() {
@@ -347,19 +350,14 @@
   }
 }
 onMounted(async () => {
-  console.log(sessionStorage.getItem('maintenceListApprovalStatus'))
-
-  // await getDict()
-  // if (sessionStorage.getItem('maintenceListApprovalStatus')) {
-  //   listQuery.value.approvalStatus = sessionStorage.getItem('maintenceListApprovalStatus')!
-  //   console.log(approvalStatusReserveMap.value[sessionStorage.getItem('maintenceListMenu')!])
-  // }
-  // else {
-  //   console.log('没有')
-
-  //   listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部']
-  // }
-  // fetchData(true)
+  await getDict()
+  if (window.sessionStorage.getItem('maintenceListApprovalStatus')) {
+    listQuery.value.approvalStatus = window.sessionStorage.getItem('maintenceListApprovalStatus')!
+  }
+  else {
+    listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部']
+  }
+  fetchData(true)
 })
 </script>
 
diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
index 860d610..3e0498c 100644
--- a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
+++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
@@ -227,6 +227,10 @@
 const addId = ref('')
 // 提交、保存
 const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  if (!formInline.value.equipmentInfoList.length) {
+    ElMessage.warning('要求设备检修列表不能为空')
+    return
+  }
   if (item === '保存' && pageType.value === 'add') {
     if (!formEl) { return }
     await formEl.validate((valid, fields) => {
@@ -270,6 +274,9 @@
               }
             })
           }
+          else {
+            formInline.value.equipmentList = []
+          }
           if (from.value === 'reject') { // 未通过-驳回的编辑
             failUpdateEquipmentApply(formInline.value).then((res) => {
               if (res.code === 200) {
@@ -408,13 +415,15 @@
 const approvalRecordData = ref([]) // 审批流程数据
 // 查询审批记录
 function getApprovalRecord(processId: string) {
-  if (processId) {
-    fetchApproval(processId).then((res) => {
-      approvalRecordData.value = res.data
-    })
-  }
-  else {
-    ElMessage.warning('流程实例id为空')
+  if (pageType.value !== 'add') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
   }
 }
 // 审批结束回调
@@ -570,7 +579,7 @@
         </el-table-column>
       </el-table>
     </detail-block>
-    <detail-block v-if="formInline.approvalStatusName !== '草稿箱'" title="审批流程">
+    <detail-block v-if="formInline.approvalStatusName !== '草稿箱' && pageType !== 'add'" title="审批流程">
       <!-- 审批流程 -->
       <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
     </detail-block>
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index dc748fb..2e4bfe4 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -85,21 +85,23 @@
     }
   })
 }
-getDict()
+
 // 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
 onUnmounted(() => {
-  sessionStorage.setItem('maintenceListMenu', currentTab.value)
+  // sessionStorage.setItem('maintenceListMenu', currentTab.value)
 })
 // 挂载的时候找到之前存过的审批类型
-onMounted(() => {
-  currentTab.value = sessionStorage.getItem('maintenceListMenu') || '全部'
-  sessionStorage.getItem('maintenceListMenu') ? sessionStorage.removeItem('maintenceListMenu') : ''
+onMounted(async () => {
+  await getDict()
+  currentTab.value = window.sessionStorage.getItem('maintenceListMenu') || '全部'
+  currentApprovalStatus.value = approvalStatusReserveMap.value[currentTab.value]
 })
 
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
+  window.sessionStorage.setItem('maintenceListMenu', newValue)
   currentButtons.value = buttonsSet[newValue]
-}, { deep: true, immediate: true })
+}, { deep: true })
 </script>
 
 <template>

diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index 1c3ae09..cb7dee6 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -64,7 +64,7 @@
   })
 }
 // 驳回后编辑接口
-export function updateSourceApproval(data: object) {
+export function failUpdateSourceApproval(data: object) {
   return request({
     url: '/meter/supplier/failUpdate',
     method: 'post',
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 64a02ff..3911d5b 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -411,7 +411,7 @@
         },
       },
       {
-        path: ':type/:id?',
+        path: ':type/:id?/:processId?',
         name: 'ListSourceAdd',
         component: () => import('@/views/measure/source/listAdd.vue'),
         meta: {
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 5d7fc0f..7d13e1b 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -369,7 +369,7 @@
 
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
-  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
+  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '' && window.sessionStorage.getItem('buttonBoxActive') !== null) {
     active.value = window.sessionStorage.getItem('buttonBoxActive')!
   }
   else {
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 0a4cf0a..2916278 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -417,7 +417,7 @@
 }
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
-  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
+  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '' && window.sessionStorage.getItem('buttonBoxActive') !== null) {
     active.value = window.sessionStorage.getItem('buttonBoxActive')!
   }
   else {
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 2d86a98..62da755 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -17,7 +17,7 @@
 const props = defineProps({
   status: {
     type: String,
-    default: '0',
+    default: '',
   },
   buttons: {
     type: Array as PropType<IButton[]>,
@@ -139,7 +139,6 @@
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
 
-const buttonTypeMap = ref('')
 // 点击删除
 const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
@@ -243,12 +242,10 @@
 }
 // 驳回后编辑
 const editAgain = (row: IlistApproval) => {
-  $router.push(`/maintenance/maintenanceList/edit/${row.id}?from=reject`)
+  $router.push(`/maintenance/maintenanceList/edit/${row.id}/${row.approvalStatusName}/${row.processId}?from=reject`)
 }
 // 跳转到详情
 const goDetail = (row: IlistApproval, type: string) => {
-  console.log('-----')
-
   $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.approvalStatusName}/${row.processId}`)
 }
 // 获取到组织信息
@@ -297,7 +294,12 @@
       approvalSubmit(row)
       break
     case '编辑':
-      goDetail(row, 'edit')
+      if (row.approvalStatusName === '未通过-驳回') {
+        editAgain(row)
+      }
+      else {
+        goDetail(row, 'edit')
+      }
       break
     case '同意':
       approvalDialog.value.initDialog('agree', row.taskId)
@@ -322,9 +324,10 @@
   () => props.status,
   (newVal: string) => {
     listQuery.value.approvalStatus = newVal
+    window.sessionStorage.setItem('maintenceListApprovalStatus', newVal)
     fetchData(false)
   },
-  { immediate: true })
+)
 
 // 打印列表
 function printList() {
@@ -347,19 +350,14 @@
   }
 }
 onMounted(async () => {
-  console.log(sessionStorage.getItem('maintenceListApprovalStatus'))
-
-  // await getDict()
-  // if (sessionStorage.getItem('maintenceListApprovalStatus')) {
-  //   listQuery.value.approvalStatus = sessionStorage.getItem('maintenceListApprovalStatus')!
-  //   console.log(approvalStatusReserveMap.value[sessionStorage.getItem('maintenceListMenu')!])
-  // }
-  // else {
-  //   console.log('没有')
-
-  //   listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部']
-  // }
-  // fetchData(true)
+  await getDict()
+  if (window.sessionStorage.getItem('maintenceListApprovalStatus')) {
+    listQuery.value.approvalStatus = window.sessionStorage.getItem('maintenceListApprovalStatus')!
+  }
+  else {
+    listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部']
+  }
+  fetchData(true)
 })
 </script>
 
diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
index 860d610..3e0498c 100644
--- a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
+++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
@@ -227,6 +227,10 @@
 const addId = ref('')
 // 提交、保存
 const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  if (!formInline.value.equipmentInfoList.length) {
+    ElMessage.warning('要求设备检修列表不能为空')
+    return
+  }
   if (item === '保存' && pageType.value === 'add') {
     if (!formEl) { return }
     await formEl.validate((valid, fields) => {
@@ -270,6 +274,9 @@
               }
             })
           }
+          else {
+            formInline.value.equipmentList = []
+          }
           if (from.value === 'reject') { // 未通过-驳回的编辑
             failUpdateEquipmentApply(formInline.value).then((res) => {
               if (res.code === 200) {
@@ -408,13 +415,15 @@
 const approvalRecordData = ref([]) // 审批流程数据
 // 查询审批记录
 function getApprovalRecord(processId: string) {
-  if (processId) {
-    fetchApproval(processId).then((res) => {
-      approvalRecordData.value = res.data
-    })
-  }
-  else {
-    ElMessage.warning('流程实例id为空')
+  if (pageType.value !== 'add') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
   }
 }
 // 审批结束回调
@@ -570,7 +579,7 @@
         </el-table-column>
       </el-table>
     </detail-block>
-    <detail-block v-if="formInline.approvalStatusName !== '草稿箱'" title="审批流程">
+    <detail-block v-if="formInline.approvalStatusName !== '草稿箱' && pageType !== 'add'" title="审批流程">
       <!-- 审批流程 -->
       <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
     </detail-block>
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index dc748fb..2e4bfe4 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -85,21 +85,23 @@
     }
   })
 }
-getDict()
+
 // 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
 onUnmounted(() => {
-  sessionStorage.setItem('maintenceListMenu', currentTab.value)
+  // sessionStorage.setItem('maintenceListMenu', currentTab.value)
 })
 // 挂载的时候找到之前存过的审批类型
-onMounted(() => {
-  currentTab.value = sessionStorage.getItem('maintenceListMenu') || '全部'
-  sessionStorage.getItem('maintenceListMenu') ? sessionStorage.removeItem('maintenceListMenu') : ''
+onMounted(async () => {
+  await getDict()
+  currentTab.value = window.sessionStorage.getItem('maintenceListMenu') || '全部'
+  currentApprovalStatus.value = approvalStatusReserveMap.value[currentTab.value]
 })
 
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
+  window.sessionStorage.setItem('maintenceListMenu', newValue)
   currentButtons.value = buttonsSet[newValue]
-}, { deep: true, immediate: true })
+}, { deep: true })
 </script>
 
 <template>
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 11abf8f..d1c0538 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -320,7 +320,7 @@
 const changeCurrentButton = (val: string) => {
   active.value = val
   activeTitle.value = menu.value.find(item => item.id === val)!.name
-  window.sessionStorage.setItem('buttonBoxActive', val)
+  window.sessionStorage.setItem('receiveButtonBoxActive', val)
   clearList()
 }
 
@@ -365,9 +365,9 @@
 onMounted(async () => {
   // 获取字典-审批状态
   getDict().then(() => {
-    if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '' && window.sessionStorage.getItem('buttonBoxActive') !== null) {
-      active.value = window.sessionStorage.getItem('buttonBoxActive')!
-      console.log(window.sessionStorage.getItem('buttonBoxActive'))
+    if (window.sessionStorage.getItem('receiveButtonBoxActive') !== 'undefined' && window.sessionStorage.getItem('receiveButtonBoxActive') !== '' && window.sessionStorage.getItem('receiveButtonBoxActive') !== null) {
+      active.value = window.sessionStorage.getItem('receiveButtonBoxActive')!
+      console.log(window.sessionStorage.getItem('receiveButtonBoxActive'))
     }
     else {
       active.value = menu.value.find(item => item.name === '全部')!.id // 全部
@@ -381,7 +381,7 @@
   })
 })
 onUnmounted(() => {
-  window.sessionStorage.setItem('buttonBoxActive', '') // 清除
+  window.sessionStorage.setItem('receiveButtonBoxActive', '') // 清除
 })
 </script>
 

diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index 1c3ae09..cb7dee6 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -64,7 +64,7 @@
   })
 }
 // 驳回后编辑接口
-export function updateSourceApproval(data: object) {
+export function failUpdateSourceApproval(data: object) {
   return request({
     url: '/meter/supplier/failUpdate',
     method: 'post',
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 64a02ff..3911d5b 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -411,7 +411,7 @@
         },
       },
       {
-        path: ':type/:id?',
+        path: ':type/:id?/:processId?',
         name: 'ListSourceAdd',
         component: () => import('@/views/measure/source/listAdd.vue'),
         meta: {
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 5d7fc0f..7d13e1b 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -369,7 +369,7 @@
 
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
-  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
+  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '' && window.sessionStorage.getItem('buttonBoxActive') !== null) {
     active.value = window.sessionStorage.getItem('buttonBoxActive')!
   }
   else {
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 0a4cf0a..2916278 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -417,7 +417,7 @@
 }
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
-  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
+  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '' && window.sessionStorage.getItem('buttonBoxActive') !== null) {
     active.value = window.sessionStorage.getItem('buttonBoxActive')!
   }
   else {
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 2d86a98..62da755 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -17,7 +17,7 @@
 const props = defineProps({
   status: {
     type: String,
-    default: '0',
+    default: '',
   },
   buttons: {
     type: Array as PropType<IButton[]>,
@@ -139,7 +139,6 @@
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
 
-const buttonTypeMap = ref('')
 // 点击删除
 const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
@@ -243,12 +242,10 @@
 }
 // 驳回后编辑
 const editAgain = (row: IlistApproval) => {
-  $router.push(`/maintenance/maintenanceList/edit/${row.id}?from=reject`)
+  $router.push(`/maintenance/maintenanceList/edit/${row.id}/${row.approvalStatusName}/${row.processId}?from=reject`)
 }
 // 跳转到详情
 const goDetail = (row: IlistApproval, type: string) => {
-  console.log('-----')
-
   $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.approvalStatusName}/${row.processId}`)
 }
 // 获取到组织信息
@@ -297,7 +294,12 @@
       approvalSubmit(row)
       break
     case '编辑':
-      goDetail(row, 'edit')
+      if (row.approvalStatusName === '未通过-驳回') {
+        editAgain(row)
+      }
+      else {
+        goDetail(row, 'edit')
+      }
       break
     case '同意':
       approvalDialog.value.initDialog('agree', row.taskId)
@@ -322,9 +324,10 @@
   () => props.status,
   (newVal: string) => {
     listQuery.value.approvalStatus = newVal
+    window.sessionStorage.setItem('maintenceListApprovalStatus', newVal)
     fetchData(false)
   },
-  { immediate: true })
+)
 
 // 打印列表
 function printList() {
@@ -347,19 +350,14 @@
   }
 }
 onMounted(async () => {
-  console.log(sessionStorage.getItem('maintenceListApprovalStatus'))
-
-  // await getDict()
-  // if (sessionStorage.getItem('maintenceListApprovalStatus')) {
-  //   listQuery.value.approvalStatus = sessionStorage.getItem('maintenceListApprovalStatus')!
-  //   console.log(approvalStatusReserveMap.value[sessionStorage.getItem('maintenceListMenu')!])
-  // }
-  // else {
-  //   console.log('没有')
-
-  //   listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部']
-  // }
-  // fetchData(true)
+  await getDict()
+  if (window.sessionStorage.getItem('maintenceListApprovalStatus')) {
+    listQuery.value.approvalStatus = window.sessionStorage.getItem('maintenceListApprovalStatus')!
+  }
+  else {
+    listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部']
+  }
+  fetchData(true)
 })
 </script>
 
diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
index 860d610..3e0498c 100644
--- a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
+++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
@@ -227,6 +227,10 @@
 const addId = ref('')
 // 提交、保存
 const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  if (!formInline.value.equipmentInfoList.length) {
+    ElMessage.warning('要求设备检修列表不能为空')
+    return
+  }
   if (item === '保存' && pageType.value === 'add') {
     if (!formEl) { return }
     await formEl.validate((valid, fields) => {
@@ -270,6 +274,9 @@
               }
             })
           }
+          else {
+            formInline.value.equipmentList = []
+          }
           if (from.value === 'reject') { // 未通过-驳回的编辑
             failUpdateEquipmentApply(formInline.value).then((res) => {
               if (res.code === 200) {
@@ -408,13 +415,15 @@
 const approvalRecordData = ref([]) // 审批流程数据
 // 查询审批记录
 function getApprovalRecord(processId: string) {
-  if (processId) {
-    fetchApproval(processId).then((res) => {
-      approvalRecordData.value = res.data
-    })
-  }
-  else {
-    ElMessage.warning('流程实例id为空')
+  if (pageType.value !== 'add') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
   }
 }
 // 审批结束回调
@@ -570,7 +579,7 @@
         </el-table-column>
       </el-table>
     </detail-block>
-    <detail-block v-if="formInline.approvalStatusName !== '草稿箱'" title="审批流程">
+    <detail-block v-if="formInline.approvalStatusName !== '草稿箱' && pageType !== 'add'" title="审批流程">
       <!-- 审批流程 -->
       <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
     </detail-block>
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index dc748fb..2e4bfe4 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -85,21 +85,23 @@
     }
   })
 }
-getDict()
+
 // 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
 onUnmounted(() => {
-  sessionStorage.setItem('maintenceListMenu', currentTab.value)
+  // sessionStorage.setItem('maintenceListMenu', currentTab.value)
 })
 // 挂载的时候找到之前存过的审批类型
-onMounted(() => {
-  currentTab.value = sessionStorage.getItem('maintenceListMenu') || '全部'
-  sessionStorage.getItem('maintenceListMenu') ? sessionStorage.removeItem('maintenceListMenu') : ''
+onMounted(async () => {
+  await getDict()
+  currentTab.value = window.sessionStorage.getItem('maintenceListMenu') || '全部'
+  currentApprovalStatus.value = approvalStatusReserveMap.value[currentTab.value]
 })
 
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
+  window.sessionStorage.setItem('maintenceListMenu', newValue)
   currentButtons.value = buttonsSet[newValue]
-}, { deep: true, immediate: true })
+}, { deep: true })
 </script>
 
 <template>
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 11abf8f..d1c0538 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -320,7 +320,7 @@
 const changeCurrentButton = (val: string) => {
   active.value = val
   activeTitle.value = menu.value.find(item => item.id === val)!.name
-  window.sessionStorage.setItem('buttonBoxActive', val)
+  window.sessionStorage.setItem('receiveButtonBoxActive', val)
   clearList()
 }
 
@@ -365,9 +365,9 @@
 onMounted(async () => {
   // 获取字典-审批状态
   getDict().then(() => {
-    if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '' && window.sessionStorage.getItem('buttonBoxActive') !== null) {
-      active.value = window.sessionStorage.getItem('buttonBoxActive')!
-      console.log(window.sessionStorage.getItem('buttonBoxActive'))
+    if (window.sessionStorage.getItem('receiveButtonBoxActive') !== 'undefined' && window.sessionStorage.getItem('receiveButtonBoxActive') !== '' && window.sessionStorage.getItem('receiveButtonBoxActive') !== null) {
+      active.value = window.sessionStorage.getItem('receiveButtonBoxActive')!
+      console.log(window.sessionStorage.getItem('receiveButtonBoxActive'))
     }
     else {
       active.value = menu.value.find(item => item.name === '全部')!.id // 全部
@@ -381,7 +381,7 @@
   })
 })
 onUnmounted(() => {
-  window.sessionStorage.setItem('buttonBoxActive', '') // 清除
+  window.sessionStorage.setItem('receiveButtonBoxActive', '') // 清除
 })
 </script>
 
diff --git a/src/views/device/receive/solve/solveList.vue b/src/views/device/receive/solve/solveList.vue
index 2eda82d..6fc0cc5 100644
--- a/src/views/device/receive/solve/solveList.vue
+++ b/src/views/device/receive/solve/solveList.vue
@@ -264,7 +264,7 @@
 // 右上角按钮切换
 const changeCurrentButton = (val: string) => {
   active.value = val
-  window.sessionStorage.setItem('solveButtonBoxActive', val)
+  window.sessionStorage.setItem('receiveSolveButtonBoxActive', val)
   clearList()
 }
 
@@ -306,8 +306,8 @@
 
 onMounted(async () => {
   await getDict()
-  if (window.sessionStorage.getItem('solveButtonBoxActive') !== 'undefined' && window.sessionStorage.getItem('solveButtonBoxActive') !== '' && window.sessionStorage.getItem('buttonBoxActive') !== null) {
-    active.value = window.sessionStorage.getItem('solveButtonBoxActive')!
+  if (window.sessionStorage.getItem('receiveSolveButtonBoxActive') !== 'undefined' && window.sessionStorage.getItem('receiveSolveButtonBoxActive') !== '' && window.sessionStorage.getItem('buttonBoxActive') !== null) {
+    active.value = window.sessionStorage.getItem('receiveSolveButtonBoxActive')!
   }
   else {
     active.value = menu.value.find(item => item.name === '待领用')!.id // 未领用
@@ -322,7 +322,7 @@
   })
 })
 onUnmounted(() => {
-  window.sessionStorage.setItem('solveButtonBoxActive', '')
+  window.sessionStorage.setItem('receiveSolveButtonBoxActive', '')
 })
 </script>
 

diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index 1c3ae09..cb7dee6 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -64,7 +64,7 @@
   })
 }
 // 驳回后编辑接口
-export function updateSourceApproval(data: object) {
+export function failUpdateSourceApproval(data: object) {
   return request({
     url: '/meter/supplier/failUpdate',
     method: 'post',
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 64a02ff..3911d5b 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -411,7 +411,7 @@
         },
       },
       {
-        path: ':type/:id?',
+        path: ':type/:id?/:processId?',
         name: 'ListSourceAdd',
         component: () => import('@/views/measure/source/listAdd.vue'),
         meta: {
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 5d7fc0f..7d13e1b 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -369,7 +369,7 @@
 
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
-  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
+  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '' && window.sessionStorage.getItem('buttonBoxActive') !== null) {
     active.value = window.sessionStorage.getItem('buttonBoxActive')!
   }
   else {
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 0a4cf0a..2916278 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -417,7 +417,7 @@
 }
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
-  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
+  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '' && window.sessionStorage.getItem('buttonBoxActive') !== null) {
     active.value = window.sessionStorage.getItem('buttonBoxActive')!
   }
   else {
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 2d86a98..62da755 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -17,7 +17,7 @@
 const props = defineProps({
   status: {
     type: String,
-    default: '0',
+    default: '',
   },
   buttons: {
     type: Array as PropType<IButton[]>,
@@ -139,7 +139,6 @@
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
 
-const buttonTypeMap = ref('')
 // 点击删除
 const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
@@ -243,12 +242,10 @@
 }
 // 驳回后编辑
 const editAgain = (row: IlistApproval) => {
-  $router.push(`/maintenance/maintenanceList/edit/${row.id}?from=reject`)
+  $router.push(`/maintenance/maintenanceList/edit/${row.id}/${row.approvalStatusName}/${row.processId}?from=reject`)
 }
 // 跳转到详情
 const goDetail = (row: IlistApproval, type: string) => {
-  console.log('-----')
-
   $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.approvalStatusName}/${row.processId}`)
 }
 // 获取到组织信息
@@ -297,7 +294,12 @@
       approvalSubmit(row)
       break
     case '编辑':
-      goDetail(row, 'edit')
+      if (row.approvalStatusName === '未通过-驳回') {
+        editAgain(row)
+      }
+      else {
+        goDetail(row, 'edit')
+      }
       break
     case '同意':
       approvalDialog.value.initDialog('agree', row.taskId)
@@ -322,9 +324,10 @@
   () => props.status,
   (newVal: string) => {
     listQuery.value.approvalStatus = newVal
+    window.sessionStorage.setItem('maintenceListApprovalStatus', newVal)
     fetchData(false)
   },
-  { immediate: true })
+)
 
 // 打印列表
 function printList() {
@@ -347,19 +350,14 @@
   }
 }
 onMounted(async () => {
-  console.log(sessionStorage.getItem('maintenceListApprovalStatus'))
-
-  // await getDict()
-  // if (sessionStorage.getItem('maintenceListApprovalStatus')) {
-  //   listQuery.value.approvalStatus = sessionStorage.getItem('maintenceListApprovalStatus')!
-  //   console.log(approvalStatusReserveMap.value[sessionStorage.getItem('maintenceListMenu')!])
-  // }
-  // else {
-  //   console.log('没有')
-
-  //   listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部']
-  // }
-  // fetchData(true)
+  await getDict()
+  if (window.sessionStorage.getItem('maintenceListApprovalStatus')) {
+    listQuery.value.approvalStatus = window.sessionStorage.getItem('maintenceListApprovalStatus')!
+  }
+  else {
+    listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部']
+  }
+  fetchData(true)
 })
 </script>
 
diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
index 860d610..3e0498c 100644
--- a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
+++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
@@ -227,6 +227,10 @@
 const addId = ref('')
 // 提交、保存
 const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  if (!formInline.value.equipmentInfoList.length) {
+    ElMessage.warning('要求设备检修列表不能为空')
+    return
+  }
   if (item === '保存' && pageType.value === 'add') {
     if (!formEl) { return }
     await formEl.validate((valid, fields) => {
@@ -270,6 +274,9 @@
               }
             })
           }
+          else {
+            formInline.value.equipmentList = []
+          }
           if (from.value === 'reject') { // 未通过-驳回的编辑
             failUpdateEquipmentApply(formInline.value).then((res) => {
               if (res.code === 200) {
@@ -408,13 +415,15 @@
 const approvalRecordData = ref([]) // 审批流程数据
 // 查询审批记录
 function getApprovalRecord(processId: string) {
-  if (processId) {
-    fetchApproval(processId).then((res) => {
-      approvalRecordData.value = res.data
-    })
-  }
-  else {
-    ElMessage.warning('流程实例id为空')
+  if (pageType.value !== 'add') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
   }
 }
 // 审批结束回调
@@ -570,7 +579,7 @@
         </el-table-column>
       </el-table>
     </detail-block>
-    <detail-block v-if="formInline.approvalStatusName !== '草稿箱'" title="审批流程">
+    <detail-block v-if="formInline.approvalStatusName !== '草稿箱' && pageType !== 'add'" title="审批流程">
       <!-- 审批流程 -->
       <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
     </detail-block>
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index dc748fb..2e4bfe4 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -85,21 +85,23 @@
     }
   })
 }
-getDict()
+
 // 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
 onUnmounted(() => {
-  sessionStorage.setItem('maintenceListMenu', currentTab.value)
+  // sessionStorage.setItem('maintenceListMenu', currentTab.value)
 })
 // 挂载的时候找到之前存过的审批类型
-onMounted(() => {
-  currentTab.value = sessionStorage.getItem('maintenceListMenu') || '全部'
-  sessionStorage.getItem('maintenceListMenu') ? sessionStorage.removeItem('maintenceListMenu') : ''
+onMounted(async () => {
+  await getDict()
+  currentTab.value = window.sessionStorage.getItem('maintenceListMenu') || '全部'
+  currentApprovalStatus.value = approvalStatusReserveMap.value[currentTab.value]
 })
 
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
+  window.sessionStorage.setItem('maintenceListMenu', newValue)
   currentButtons.value = buttonsSet[newValue]
-}, { deep: true, immediate: true })
+}, { deep: true })
 </script>
 
 <template>
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 11abf8f..d1c0538 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -320,7 +320,7 @@
 const changeCurrentButton = (val: string) => {
   active.value = val
   activeTitle.value = menu.value.find(item => item.id === val)!.name
-  window.sessionStorage.setItem('buttonBoxActive', val)
+  window.sessionStorage.setItem('receiveButtonBoxActive', val)
   clearList()
 }
 
@@ -365,9 +365,9 @@
 onMounted(async () => {
   // 获取字典-审批状态
   getDict().then(() => {
-    if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '' && window.sessionStorage.getItem('buttonBoxActive') !== null) {
-      active.value = window.sessionStorage.getItem('buttonBoxActive')!
-      console.log(window.sessionStorage.getItem('buttonBoxActive'))
+    if (window.sessionStorage.getItem('receiveButtonBoxActive') !== 'undefined' && window.sessionStorage.getItem('receiveButtonBoxActive') !== '' && window.sessionStorage.getItem('receiveButtonBoxActive') !== null) {
+      active.value = window.sessionStorage.getItem('receiveButtonBoxActive')!
+      console.log(window.sessionStorage.getItem('receiveButtonBoxActive'))
     }
     else {
       active.value = menu.value.find(item => item.name === '全部')!.id // 全部
@@ -381,7 +381,7 @@
   })
 })
 onUnmounted(() => {
-  window.sessionStorage.setItem('buttonBoxActive', '') // 清除
+  window.sessionStorage.setItem('receiveButtonBoxActive', '') // 清除
 })
 </script>
 
diff --git a/src/views/device/receive/solve/solveList.vue b/src/views/device/receive/solve/solveList.vue
index 2eda82d..6fc0cc5 100644
--- a/src/views/device/receive/solve/solveList.vue
+++ b/src/views/device/receive/solve/solveList.vue
@@ -264,7 +264,7 @@
 // 右上角按钮切换
 const changeCurrentButton = (val: string) => {
   active.value = val
-  window.sessionStorage.setItem('solveButtonBoxActive', val)
+  window.sessionStorage.setItem('receiveSolveButtonBoxActive', val)
   clearList()
 }
 
@@ -306,8 +306,8 @@
 
 onMounted(async () => {
   await getDict()
-  if (window.sessionStorage.getItem('solveButtonBoxActive') !== 'undefined' && window.sessionStorage.getItem('solveButtonBoxActive') !== '' && window.sessionStorage.getItem('buttonBoxActive') !== null) {
-    active.value = window.sessionStorage.getItem('solveButtonBoxActive')!
+  if (window.sessionStorage.getItem('receiveSolveButtonBoxActive') !== 'undefined' && window.sessionStorage.getItem('receiveSolveButtonBoxActive') !== '' && window.sessionStorage.getItem('buttonBoxActive') !== null) {
+    active.value = window.sessionStorage.getItem('receiveSolveButtonBoxActive')!
   }
   else {
     active.value = menu.value.find(item => item.name === '待领用')!.id // 未领用
@@ -322,7 +322,7 @@
   })
 })
 onUnmounted(() => {
-  window.sessionStorage.setItem('solveButtonBoxActive', '')
+  window.sessionStorage.setItem('receiveSolveButtonBoxActive', '')
 })
 </script>
 
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index c0c3744..5000903 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -47,6 +47,7 @@
   companyCityName: '', // 市
   companyCountryName: '', // 国家
   companyProvinceName: '', // 省
+  companyAddress: '',
   formId: SCHEDULE.SUPPLIER_APPROVAL,
   supplierName: '',
   supplierNo: '',
@@ -78,7 +79,7 @@
 const loadingTable = ref(false)
 
 // 获取数据
-const fetchData = (isNowPage: boolean) => {
+const fetchData = (isNowPage: boolean, isReset?: false) => {
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -86,7 +87,12 @@
   }
   getapprovalListPage(listQuery.value).then((response) => {
     list.value = response.data.rows
-    companyAddress.value = [response.data.rows[0].companyCountry, response.data.rows[0].companyProvince, response.data.rows[0].companyCity, response.data.rows[0].companyArea, response.data.rows[0].companyAddress]
+    if (!companyAddress.value) {
+      companyAddress.value = [response.data.rows[0].companyCountry, response.data.rows[0].companyProvince, response.data.rows[0].companyCity, response.data.rows[0].companyArea, response.data.rows[0].companyAddress]
+    }
+    else if (isReset) {
+      companyAddress.value = [response.data.rows[0].companyCountry, response.data.rows[0].companyProvince, response.data.rows[0].companyCity, response.data.rows[0].companyArea, response.data.rows[0].companyAddress]
+    }
     total.value = parseInt(response.data.total)
     console.log(companyAddress.value)
     loadingTable.value = false
@@ -109,6 +115,7 @@
   listQuery.value.companyProvinceName = addressObj.provinceName
   listQuery.value.companyCityName = addressObj.cityName
   listQuery.value.companyAreaName = addressObj.areaName
+  listQuery.value.companyAddress = addressObj.address
 }
 // 点击删除或者取消
 const handleDelete = (row: rowReturn) => {
@@ -175,13 +182,14 @@
     companyCityName: '', // 市
     companyCountryName: '', // 国家
     companyProvinceName: '', // 省
+    companyAddress: '',
     formId: SCHEDULE.SUPPLIER_APPROVAL,
     supplierName: '',
     supplierNo: '',
     offset: 1,
     limit: 20,
   }
-  fetchData(true)
+  fetchData(true, true)
 }
 // 导出
 const exportExcelBtn = () => {
@@ -237,6 +245,12 @@
 const approvalSuccess = () => {
   fetchData(true)
 }
+// 驳回后编辑
+function editAgain(row: Omit<ISupplier, 'traceSupplierPersonList'>) {
+  console.log('999', row.processId)
+
+  $router.push(`/source/edit/${row.id}/${row.processId}?from=reject`)
+}
 
 // 提交
 const approvalSubmit = (row: ISupplier) => {
@@ -266,7 +280,12 @@
       approvalSubmit(row)
       break
     case '编辑':
-      $router.push(`/source/edit/${row.id}`)
+      if (row.approvalStatusName === '未通过-驳回') {
+        editAgain(row)
+      }
+      else {
+        $router.push(`/source/edit/${row.id}`)
+      }
       break
     case '同意':
       approvalDialog.value.initDialog('agree', row.taskId)
@@ -286,11 +305,6 @@
   }
 }
 
-// 驳回后编辑
-function editAgain(row: ISupplier) {
-  $router.push(`/source/edit/${row.id}?from=reject`)
-}
-
 // 监听status变化，更新approvalStatus
 watch (
   () => props.status,

diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index 1c3ae09..cb7dee6 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -64,7 +64,7 @@
   })
 }
 // 驳回后编辑接口
-export function updateSourceApproval(data: object) {
+export function failUpdateSourceApproval(data: object) {
   return request({
     url: '/meter/supplier/failUpdate',
     method: 'post',
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 64a02ff..3911d5b 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -411,7 +411,7 @@
         },
       },
       {
-        path: ':type/:id?',
+        path: ':type/:id?/:processId?',
         name: 'ListSourceAdd',
         component: () => import('@/views/measure/source/listAdd.vue'),
         meta: {
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 5d7fc0f..7d13e1b 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -369,7 +369,7 @@
 
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
-  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
+  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '' && window.sessionStorage.getItem('buttonBoxActive') !== null) {
     active.value = window.sessionStorage.getItem('buttonBoxActive')!
   }
   else {
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 0a4cf0a..2916278 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -417,7 +417,7 @@
 }
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
-  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
+  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '' && window.sessionStorage.getItem('buttonBoxActive') !== null) {
     active.value = window.sessionStorage.getItem('buttonBoxActive')!
   }
   else {
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 2d86a98..62da755 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -17,7 +17,7 @@
 const props = defineProps({
   status: {
     type: String,
-    default: '0',
+    default: '',
   },
   buttons: {
     type: Array as PropType<IButton[]>,
@@ -139,7 +139,6 @@
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
 
-const buttonTypeMap = ref('')
 // 点击删除
 const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
@@ -243,12 +242,10 @@
 }
 // 驳回后编辑
 const editAgain = (row: IlistApproval) => {
-  $router.push(`/maintenance/maintenanceList/edit/${row.id}?from=reject`)
+  $router.push(`/maintenance/maintenanceList/edit/${row.id}/${row.approvalStatusName}/${row.processId}?from=reject`)
 }
 // 跳转到详情
 const goDetail = (row: IlistApproval, type: string) => {
-  console.log('-----')
-
   $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.approvalStatusName}/${row.processId}`)
 }
 // 获取到组织信息
@@ -297,7 +294,12 @@
       approvalSubmit(row)
       break
     case '编辑':
-      goDetail(row, 'edit')
+      if (row.approvalStatusName === '未通过-驳回') {
+        editAgain(row)
+      }
+      else {
+        goDetail(row, 'edit')
+      }
       break
     case '同意':
       approvalDialog.value.initDialog('agree', row.taskId)
@@ -322,9 +324,10 @@
   () => props.status,
   (newVal: string) => {
     listQuery.value.approvalStatus = newVal
+    window.sessionStorage.setItem('maintenceListApprovalStatus', newVal)
     fetchData(false)
   },
-  { immediate: true })
+)
 
 // 打印列表
 function printList() {
@@ -347,19 +350,14 @@
   }
 }
 onMounted(async () => {
-  console.log(sessionStorage.getItem('maintenceListApprovalStatus'))
-
-  // await getDict()
-  // if (sessionStorage.getItem('maintenceListApprovalStatus')) {
-  //   listQuery.value.approvalStatus = sessionStorage.getItem('maintenceListApprovalStatus')!
-  //   console.log(approvalStatusReserveMap.value[sessionStorage.getItem('maintenceListMenu')!])
-  // }
-  // else {
-  //   console.log('没有')
-
-  //   listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部']
-  // }
-  // fetchData(true)
+  await getDict()
+  if (window.sessionStorage.getItem('maintenceListApprovalStatus')) {
+    listQuery.value.approvalStatus = window.sessionStorage.getItem('maintenceListApprovalStatus')!
+  }
+  else {
+    listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部']
+  }
+  fetchData(true)
 })
 </script>
 
diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
index 860d610..3e0498c 100644
--- a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
+++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
@@ -227,6 +227,10 @@
 const addId = ref('')
 // 提交、保存
 const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  if (!formInline.value.equipmentInfoList.length) {
+    ElMessage.warning('要求设备检修列表不能为空')
+    return
+  }
   if (item === '保存' && pageType.value === 'add') {
     if (!formEl) { return }
     await formEl.validate((valid, fields) => {
@@ -270,6 +274,9 @@
               }
             })
           }
+          else {
+            formInline.value.equipmentList = []
+          }
           if (from.value === 'reject') { // 未通过-驳回的编辑
             failUpdateEquipmentApply(formInline.value).then((res) => {
               if (res.code === 200) {
@@ -408,13 +415,15 @@
 const approvalRecordData = ref([]) // 审批流程数据
 // 查询审批记录
 function getApprovalRecord(processId: string) {
-  if (processId) {
-    fetchApproval(processId).then((res) => {
-      approvalRecordData.value = res.data
-    })
-  }
-  else {
-    ElMessage.warning('流程实例id为空')
+  if (pageType.value !== 'add') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
   }
 }
 // 审批结束回调
@@ -570,7 +579,7 @@
         </el-table-column>
       </el-table>
     </detail-block>
-    <detail-block v-if="formInline.approvalStatusName !== '草稿箱'" title="审批流程">
+    <detail-block v-if="formInline.approvalStatusName !== '草稿箱' && pageType !== 'add'" title="审批流程">
       <!-- 审批流程 -->
       <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
     </detail-block>
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index dc748fb..2e4bfe4 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -85,21 +85,23 @@
     }
   })
 }
-getDict()
+
 // 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
 onUnmounted(() => {
-  sessionStorage.setItem('maintenceListMenu', currentTab.value)
+  // sessionStorage.setItem('maintenceListMenu', currentTab.value)
 })
 // 挂载的时候找到之前存过的审批类型
-onMounted(() => {
-  currentTab.value = sessionStorage.getItem('maintenceListMenu') || '全部'
-  sessionStorage.getItem('maintenceListMenu') ? sessionStorage.removeItem('maintenceListMenu') : ''
+onMounted(async () => {
+  await getDict()
+  currentTab.value = window.sessionStorage.getItem('maintenceListMenu') || '全部'
+  currentApprovalStatus.value = approvalStatusReserveMap.value[currentTab.value]
 })
 
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
+  window.sessionStorage.setItem('maintenceListMenu', newValue)
   currentButtons.value = buttonsSet[newValue]
-}, { deep: true, immediate: true })
+}, { deep: true })
 </script>
 
 <template>
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 11abf8f..d1c0538 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -320,7 +320,7 @@
 const changeCurrentButton = (val: string) => {
   active.value = val
   activeTitle.value = menu.value.find(item => item.id === val)!.name
-  window.sessionStorage.setItem('buttonBoxActive', val)
+  window.sessionStorage.setItem('receiveButtonBoxActive', val)
   clearList()
 }
 
@@ -365,9 +365,9 @@
 onMounted(async () => {
   // 获取字典-审批状态
   getDict().then(() => {
-    if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '' && window.sessionStorage.getItem('buttonBoxActive') !== null) {
-      active.value = window.sessionStorage.getItem('buttonBoxActive')!
-      console.log(window.sessionStorage.getItem('buttonBoxActive'))
+    if (window.sessionStorage.getItem('receiveButtonBoxActive') !== 'undefined' && window.sessionStorage.getItem('receiveButtonBoxActive') !== '' && window.sessionStorage.getItem('receiveButtonBoxActive') !== null) {
+      active.value = window.sessionStorage.getItem('receiveButtonBoxActive')!
+      console.log(window.sessionStorage.getItem('receiveButtonBoxActive'))
     }
     else {
       active.value = menu.value.find(item => item.name === '全部')!.id // 全部
@@ -381,7 +381,7 @@
   })
 })
 onUnmounted(() => {
-  window.sessionStorage.setItem('buttonBoxActive', '') // 清除
+  window.sessionStorage.setItem('receiveButtonBoxActive', '') // 清除
 })
 </script>
 
diff --git a/src/views/device/receive/solve/solveList.vue b/src/views/device/receive/solve/solveList.vue
index 2eda82d..6fc0cc5 100644
--- a/src/views/device/receive/solve/solveList.vue
+++ b/src/views/device/receive/solve/solveList.vue
@@ -264,7 +264,7 @@
 // 右上角按钮切换
 const changeCurrentButton = (val: string) => {
   active.value = val
-  window.sessionStorage.setItem('solveButtonBoxActive', val)
+  window.sessionStorage.setItem('receiveSolveButtonBoxActive', val)
   clearList()
 }
 
@@ -306,8 +306,8 @@
 
 onMounted(async () => {
   await getDict()
-  if (window.sessionStorage.getItem('solveButtonBoxActive') !== 'undefined' && window.sessionStorage.getItem('solveButtonBoxActive') !== '' && window.sessionStorage.getItem('buttonBoxActive') !== null) {
-    active.value = window.sessionStorage.getItem('solveButtonBoxActive')!
+  if (window.sessionStorage.getItem('receiveSolveButtonBoxActive') !== 'undefined' && window.sessionStorage.getItem('receiveSolveButtonBoxActive') !== '' && window.sessionStorage.getItem('buttonBoxActive') !== null) {
+    active.value = window.sessionStorage.getItem('receiveSolveButtonBoxActive')!
   }
   else {
     active.value = menu.value.find(item => item.name === '待领用')!.id // 未领用
@@ -322,7 +322,7 @@
   })
 })
 onUnmounted(() => {
-  window.sessionStorage.setItem('solveButtonBoxActive', '')
+  window.sessionStorage.setItem('receiveSolveButtonBoxActive', '')
 })
 </script>
 
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index c0c3744..5000903 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -47,6 +47,7 @@
   companyCityName: '', // 市
   companyCountryName: '', // 国家
   companyProvinceName: '', // 省
+  companyAddress: '',
   formId: SCHEDULE.SUPPLIER_APPROVAL,
   supplierName: '',
   supplierNo: '',
@@ -78,7 +79,7 @@
 const loadingTable = ref(false)
 
 // 获取数据
-const fetchData = (isNowPage: boolean) => {
+const fetchData = (isNowPage: boolean, isReset?: false) => {
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -86,7 +87,12 @@
   }
   getapprovalListPage(listQuery.value).then((response) => {
     list.value = response.data.rows
-    companyAddress.value = [response.data.rows[0].companyCountry, response.data.rows[0].companyProvince, response.data.rows[0].companyCity, response.data.rows[0].companyArea, response.data.rows[0].companyAddress]
+    if (!companyAddress.value) {
+      companyAddress.value = [response.data.rows[0].companyCountry, response.data.rows[0].companyProvince, response.data.rows[0].companyCity, response.data.rows[0].companyArea, response.data.rows[0].companyAddress]
+    }
+    else if (isReset) {
+      companyAddress.value = [response.data.rows[0].companyCountry, response.data.rows[0].companyProvince, response.data.rows[0].companyCity, response.data.rows[0].companyArea, response.data.rows[0].companyAddress]
+    }
     total.value = parseInt(response.data.total)
     console.log(companyAddress.value)
     loadingTable.value = false
@@ -109,6 +115,7 @@
   listQuery.value.companyProvinceName = addressObj.provinceName
   listQuery.value.companyCityName = addressObj.cityName
   listQuery.value.companyAreaName = addressObj.areaName
+  listQuery.value.companyAddress = addressObj.address
 }
 // 点击删除或者取消
 const handleDelete = (row: rowReturn) => {
@@ -175,13 +182,14 @@
     companyCityName: '', // 市
     companyCountryName: '', // 国家
     companyProvinceName: '', // 省
+    companyAddress: '',
     formId: SCHEDULE.SUPPLIER_APPROVAL,
     supplierName: '',
     supplierNo: '',
     offset: 1,
     limit: 20,
   }
-  fetchData(true)
+  fetchData(true, true)
 }
 // 导出
 const exportExcelBtn = () => {
@@ -237,6 +245,12 @@
 const approvalSuccess = () => {
   fetchData(true)
 }
+// 驳回后编辑
+function editAgain(row: Omit<ISupplier, 'traceSupplierPersonList'>) {
+  console.log('999', row.processId)
+
+  $router.push(`/source/edit/${row.id}/${row.processId}?from=reject`)
+}
 
 // 提交
 const approvalSubmit = (row: ISupplier) => {
@@ -266,7 +280,12 @@
       approvalSubmit(row)
       break
     case '编辑':
-      $router.push(`/source/edit/${row.id}`)
+      if (row.approvalStatusName === '未通过-驳回') {
+        editAgain(row)
+      }
+      else {
+        $router.push(`/source/edit/${row.id}`)
+      }
       break
     case '同意':
       approvalDialog.value.initDialog('agree', row.taskId)
@@ -286,11 +305,6 @@
   }
 }
 
-// 驳回后编辑
-function editAgain(row: ISupplier) {
-  $router.push(`/source/edit/${row.id}?from=reject`)
-}
-
 // 监听status变化，更新approvalStatus
 watch (
   () => props.status,
diff --git a/src/views/measure/source/components/sourceApprovalDetail.vue b/src/views/measure/source/components/sourceApprovalDetail.vue
index 8d9d22d..c507032 100644
--- a/src/views/measure/source/components/sourceApprovalDetail.vue
+++ b/src/views/measure/source/components/sourceApprovalDetail.vue
@@ -70,13 +70,6 @@
   approvalStatus: '', // 审批状态
   approvalStatusName: '', // 审批状态名称
 })
-// 获取表单详情
-const getInfo = () => {
-  getSoucreListDetail({ id: infoId.value }).then((res) => {
-    dataForm.value = res.data
-  })
-}
-getInfo()
 
 const traceSupplierPersonList: Ref<traceSupplierPerson[]> = ref([])
 const columns = [
@@ -86,7 +79,13 @@
   { text: '职务', value: 'job' },
   { text: '联系方式', value: 'phone' },
 ]
-
+// 获取表单详情
+const getInfo = () => {
+  getSoucreListDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data
+  })
+}
+getInfo()
 // 初始化router
 const $router = useRouter()
 // 关闭新增页面的回调

diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index 1c3ae09..cb7dee6 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -64,7 +64,7 @@
   })
 }
 // 驳回后编辑接口
-export function updateSourceApproval(data: object) {
+export function failUpdateSourceApproval(data: object) {
   return request({
     url: '/meter/supplier/failUpdate',
     method: 'post',
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 64a02ff..3911d5b 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -411,7 +411,7 @@
         },
       },
       {
-        path: ':type/:id?',
+        path: ':type/:id?/:processId?',
         name: 'ListSourceAdd',
         component: () => import('@/views/measure/source/listAdd.vue'),
         meta: {
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 5d7fc0f..7d13e1b 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -369,7 +369,7 @@
 
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
-  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
+  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '' && window.sessionStorage.getItem('buttonBoxActive') !== null) {
     active.value = window.sessionStorage.getItem('buttonBoxActive')!
   }
   else {
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 0a4cf0a..2916278 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -417,7 +417,7 @@
 }
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
-  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
+  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '' && window.sessionStorage.getItem('buttonBoxActive') !== null) {
     active.value = window.sessionStorage.getItem('buttonBoxActive')!
   }
   else {
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 2d86a98..62da755 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -17,7 +17,7 @@
 const props = defineProps({
   status: {
     type: String,
-    default: '0',
+    default: '',
   },
   buttons: {
     type: Array as PropType<IButton[]>,
@@ -139,7 +139,6 @@
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
 
-const buttonTypeMap = ref('')
 // 点击删除
 const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
@@ -243,12 +242,10 @@
 }
 // 驳回后编辑
 const editAgain = (row: IlistApproval) => {
-  $router.push(`/maintenance/maintenanceList/edit/${row.id}?from=reject`)
+  $router.push(`/maintenance/maintenanceList/edit/${row.id}/${row.approvalStatusName}/${row.processId}?from=reject`)
 }
 // 跳转到详情
 const goDetail = (row: IlistApproval, type: string) => {
-  console.log('-----')
-
   $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.approvalStatusName}/${row.processId}`)
 }
 // 获取到组织信息
@@ -297,7 +294,12 @@
       approvalSubmit(row)
       break
     case '编辑':
-      goDetail(row, 'edit')
+      if (row.approvalStatusName === '未通过-驳回') {
+        editAgain(row)
+      }
+      else {
+        goDetail(row, 'edit')
+      }
       break
     case '同意':
       approvalDialog.value.initDialog('agree', row.taskId)
@@ -322,9 +324,10 @@
   () => props.status,
   (newVal: string) => {
     listQuery.value.approvalStatus = newVal
+    window.sessionStorage.setItem('maintenceListApprovalStatus', newVal)
     fetchData(false)
   },
-  { immediate: true })
+)
 
 // 打印列表
 function printList() {
@@ -347,19 +350,14 @@
   }
 }
 onMounted(async () => {
-  console.log(sessionStorage.getItem('maintenceListApprovalStatus'))
-
-  // await getDict()
-  // if (sessionStorage.getItem('maintenceListApprovalStatus')) {
-  //   listQuery.value.approvalStatus = sessionStorage.getItem('maintenceListApprovalStatus')!
-  //   console.log(approvalStatusReserveMap.value[sessionStorage.getItem('maintenceListMenu')!])
-  // }
-  // else {
-  //   console.log('没有')
-
-  //   listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部']
-  // }
-  // fetchData(true)
+  await getDict()
+  if (window.sessionStorage.getItem('maintenceListApprovalStatus')) {
+    listQuery.value.approvalStatus = window.sessionStorage.getItem('maintenceListApprovalStatus')!
+  }
+  else {
+    listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部']
+  }
+  fetchData(true)
 })
 </script>
 
diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
index 860d610..3e0498c 100644
--- a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
+++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
@@ -227,6 +227,10 @@
 const addId = ref('')
 // 提交、保存
 const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  if (!formInline.value.equipmentInfoList.length) {
+    ElMessage.warning('要求设备检修列表不能为空')
+    return
+  }
   if (item === '保存' && pageType.value === 'add') {
     if (!formEl) { return }
     await formEl.validate((valid, fields) => {
@@ -270,6 +274,9 @@
               }
             })
           }
+          else {
+            formInline.value.equipmentList = []
+          }
           if (from.value === 'reject') { // 未通过-驳回的编辑
             failUpdateEquipmentApply(formInline.value).then((res) => {
               if (res.code === 200) {
@@ -408,13 +415,15 @@
 const approvalRecordData = ref([]) // 审批流程数据
 // 查询审批记录
 function getApprovalRecord(processId: string) {
-  if (processId) {
-    fetchApproval(processId).then((res) => {
-      approvalRecordData.value = res.data
-    })
-  }
-  else {
-    ElMessage.warning('流程实例id为空')
+  if (pageType.value !== 'add') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
   }
 }
 // 审批结束回调
@@ -570,7 +579,7 @@
         </el-table-column>
       </el-table>
     </detail-block>
-    <detail-block v-if="formInline.approvalStatusName !== '草稿箱'" title="审批流程">
+    <detail-block v-if="formInline.approvalStatusName !== '草稿箱' && pageType !== 'add'" title="审批流程">
       <!-- 审批流程 -->
       <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
     </detail-block>
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index dc748fb..2e4bfe4 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -85,21 +85,23 @@
     }
   })
 }
-getDict()
+
 // 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
 onUnmounted(() => {
-  sessionStorage.setItem('maintenceListMenu', currentTab.value)
+  // sessionStorage.setItem('maintenceListMenu', currentTab.value)
 })
 // 挂载的时候找到之前存过的审批类型
-onMounted(() => {
-  currentTab.value = sessionStorage.getItem('maintenceListMenu') || '全部'
-  sessionStorage.getItem('maintenceListMenu') ? sessionStorage.removeItem('maintenceListMenu') : ''
+onMounted(async () => {
+  await getDict()
+  currentTab.value = window.sessionStorage.getItem('maintenceListMenu') || '全部'
+  currentApprovalStatus.value = approvalStatusReserveMap.value[currentTab.value]
 })
 
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
+  window.sessionStorage.setItem('maintenceListMenu', newValue)
   currentButtons.value = buttonsSet[newValue]
-}, { deep: true, immediate: true })
+}, { deep: true })
 </script>
 
 <template>
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 11abf8f..d1c0538 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -320,7 +320,7 @@
 const changeCurrentButton = (val: string) => {
   active.value = val
   activeTitle.value = menu.value.find(item => item.id === val)!.name
-  window.sessionStorage.setItem('buttonBoxActive', val)
+  window.sessionStorage.setItem('receiveButtonBoxActive', val)
   clearList()
 }
 
@@ -365,9 +365,9 @@
 onMounted(async () => {
   // 获取字典-审批状态
   getDict().then(() => {
-    if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '' && window.sessionStorage.getItem('buttonBoxActive') !== null) {
-      active.value = window.sessionStorage.getItem('buttonBoxActive')!
-      console.log(window.sessionStorage.getItem('buttonBoxActive'))
+    if (window.sessionStorage.getItem('receiveButtonBoxActive') !== 'undefined' && window.sessionStorage.getItem('receiveButtonBoxActive') !== '' && window.sessionStorage.getItem('receiveButtonBoxActive') !== null) {
+      active.value = window.sessionStorage.getItem('receiveButtonBoxActive')!
+      console.log(window.sessionStorage.getItem('receiveButtonBoxActive'))
     }
     else {
       active.value = menu.value.find(item => item.name === '全部')!.id // 全部
@@ -381,7 +381,7 @@
   })
 })
 onUnmounted(() => {
-  window.sessionStorage.setItem('buttonBoxActive', '') // 清除
+  window.sessionStorage.setItem('receiveButtonBoxActive', '') // 清除
 })
 </script>
 
diff --git a/src/views/device/receive/solve/solveList.vue b/src/views/device/receive/solve/solveList.vue
index 2eda82d..6fc0cc5 100644
--- a/src/views/device/receive/solve/solveList.vue
+++ b/src/views/device/receive/solve/solveList.vue
@@ -264,7 +264,7 @@
 // 右上角按钮切换
 const changeCurrentButton = (val: string) => {
   active.value = val
-  window.sessionStorage.setItem('solveButtonBoxActive', val)
+  window.sessionStorage.setItem('receiveSolveButtonBoxActive', val)
   clearList()
 }
 
@@ -306,8 +306,8 @@
 
 onMounted(async () => {
   await getDict()
-  if (window.sessionStorage.getItem('solveButtonBoxActive') !== 'undefined' && window.sessionStorage.getItem('solveButtonBoxActive') !== '' && window.sessionStorage.getItem('buttonBoxActive') !== null) {
-    active.value = window.sessionStorage.getItem('solveButtonBoxActive')!
+  if (window.sessionStorage.getItem('receiveSolveButtonBoxActive') !== 'undefined' && window.sessionStorage.getItem('receiveSolveButtonBoxActive') !== '' && window.sessionStorage.getItem('buttonBoxActive') !== null) {
+    active.value = window.sessionStorage.getItem('receiveSolveButtonBoxActive')!
   }
   else {
     active.value = menu.value.find(item => item.name === '待领用')!.id // 未领用
@@ -322,7 +322,7 @@
   })
 })
 onUnmounted(() => {
-  window.sessionStorage.setItem('solveButtonBoxActive', '')
+  window.sessionStorage.setItem('receiveSolveButtonBoxActive', '')
 })
 </script>
 
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index c0c3744..5000903 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -47,6 +47,7 @@
   companyCityName: '', // 市
   companyCountryName: '', // 国家
   companyProvinceName: '', // 省
+  companyAddress: '',
   formId: SCHEDULE.SUPPLIER_APPROVAL,
   supplierName: '',
   supplierNo: '',
@@ -78,7 +79,7 @@
 const loadingTable = ref(false)
 
 // 获取数据
-const fetchData = (isNowPage: boolean) => {
+const fetchData = (isNowPage: boolean, isReset?: false) => {
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -86,7 +87,12 @@
   }
   getapprovalListPage(listQuery.value).then((response) => {
     list.value = response.data.rows
-    companyAddress.value = [response.data.rows[0].companyCountry, response.data.rows[0].companyProvince, response.data.rows[0].companyCity, response.data.rows[0].companyArea, response.data.rows[0].companyAddress]
+    if (!companyAddress.value) {
+      companyAddress.value = [response.data.rows[0].companyCountry, response.data.rows[0].companyProvince, response.data.rows[0].companyCity, response.data.rows[0].companyArea, response.data.rows[0].companyAddress]
+    }
+    else if (isReset) {
+      companyAddress.value = [response.data.rows[0].companyCountry, response.data.rows[0].companyProvince, response.data.rows[0].companyCity, response.data.rows[0].companyArea, response.data.rows[0].companyAddress]
+    }
     total.value = parseInt(response.data.total)
     console.log(companyAddress.value)
     loadingTable.value = false
@@ -109,6 +115,7 @@
   listQuery.value.companyProvinceName = addressObj.provinceName
   listQuery.value.companyCityName = addressObj.cityName
   listQuery.value.companyAreaName = addressObj.areaName
+  listQuery.value.companyAddress = addressObj.address
 }
 // 点击删除或者取消
 const handleDelete = (row: rowReturn) => {
@@ -175,13 +182,14 @@
     companyCityName: '', // 市
     companyCountryName: '', // 国家
     companyProvinceName: '', // 省
+    companyAddress: '',
     formId: SCHEDULE.SUPPLIER_APPROVAL,
     supplierName: '',
     supplierNo: '',
     offset: 1,
     limit: 20,
   }
-  fetchData(true)
+  fetchData(true, true)
 }
 // 导出
 const exportExcelBtn = () => {
@@ -237,6 +245,12 @@
 const approvalSuccess = () => {
   fetchData(true)
 }
+// 驳回后编辑
+function editAgain(row: Omit<ISupplier, 'traceSupplierPersonList'>) {
+  console.log('999', row.processId)
+
+  $router.push(`/source/edit/${row.id}/${row.processId}?from=reject`)
+}
 
 // 提交
 const approvalSubmit = (row: ISupplier) => {
@@ -266,7 +280,12 @@
       approvalSubmit(row)
       break
     case '编辑':
-      $router.push(`/source/edit/${row.id}`)
+      if (row.approvalStatusName === '未通过-驳回') {
+        editAgain(row)
+      }
+      else {
+        $router.push(`/source/edit/${row.id}`)
+      }
       break
     case '同意':
       approvalDialog.value.initDialog('agree', row.taskId)
@@ -286,11 +305,6 @@
   }
 }
 
-// 驳回后编辑
-function editAgain(row: ISupplier) {
-  $router.push(`/source/edit/${row.id}?from=reject`)
-}
-
 // 监听status变化，更新approvalStatus
 watch (
   () => props.status,
diff --git a/src/views/measure/source/components/sourceApprovalDetail.vue b/src/views/measure/source/components/sourceApprovalDetail.vue
index 8d9d22d..c507032 100644
--- a/src/views/measure/source/components/sourceApprovalDetail.vue
+++ b/src/views/measure/source/components/sourceApprovalDetail.vue
@@ -70,13 +70,6 @@
   approvalStatus: '', // 审批状态
   approvalStatusName: '', // 审批状态名称
 })
-// 获取表单详情
-const getInfo = () => {
-  getSoucreListDetail({ id: infoId.value }).then((res) => {
-    dataForm.value = res.data
-  })
-}
-getInfo()
 
 const traceSupplierPersonList: Ref<traceSupplierPerson[]> = ref([])
 const columns = [
@@ -86,7 +79,13 @@
   { text: '职务', value: 'job' },
   { text: '联系方式', value: 'phone' },
 ]
-
+// 获取表单详情
+const getInfo = () => {
+  getSoucreListDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data
+  })
+}
+getInfo()
 // 初始化router
 const $router = useRouter()
 // 关闭新增页面的回调
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index e2778fe..e352e61 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -18,8 +18,6 @@
   offset: 1,
   limit: 20,
 })
-// 控制是否显示新增页面
-const show = ref(true)
 // 表格数据
 const list = ref<ISupplier[]>([])
 const { proxy } = getCurrentInstance() as any
@@ -81,12 +79,6 @@
 const checkoutList = ref<string[]>([])
 // 文件上传input
 const fileRef = ref()
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true

diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index 1c3ae09..cb7dee6 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -64,7 +64,7 @@
   })
 }
 // 驳回后编辑接口
-export function updateSourceApproval(data: object) {
+export function failUpdateSourceApproval(data: object) {
   return request({
     url: '/meter/supplier/failUpdate',
     method: 'post',
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 64a02ff..3911d5b 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -411,7 +411,7 @@
         },
       },
       {
-        path: ':type/:id?',
+        path: ':type/:id?/:processId?',
         name: 'ListSourceAdd',
         component: () => import('@/views/measure/source/listAdd.vue'),
         meta: {
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 5d7fc0f..7d13e1b 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -369,7 +369,7 @@
 
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
-  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
+  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '' && window.sessionStorage.getItem('buttonBoxActive') !== null) {
     active.value = window.sessionStorage.getItem('buttonBoxActive')!
   }
   else {
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 0a4cf0a..2916278 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -417,7 +417,7 @@
 }
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
-  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
+  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '' && window.sessionStorage.getItem('buttonBoxActive') !== null) {
     active.value = window.sessionStorage.getItem('buttonBoxActive')!
   }
   else {
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 2d86a98..62da755 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -17,7 +17,7 @@
 const props = defineProps({
   status: {
     type: String,
-    default: '0',
+    default: '',
   },
   buttons: {
     type: Array as PropType<IButton[]>,
@@ -139,7 +139,6 @@
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
 
-const buttonTypeMap = ref('')
 // 点击删除
 const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
@@ -243,12 +242,10 @@
 }
 // 驳回后编辑
 const editAgain = (row: IlistApproval) => {
-  $router.push(`/maintenance/maintenanceList/edit/${row.id}?from=reject`)
+  $router.push(`/maintenance/maintenanceList/edit/${row.id}/${row.approvalStatusName}/${row.processId}?from=reject`)
 }
 // 跳转到详情
 const goDetail = (row: IlistApproval, type: string) => {
-  console.log('-----')
-
   $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.approvalStatusName}/${row.processId}`)
 }
 // 获取到组织信息
@@ -297,7 +294,12 @@
       approvalSubmit(row)
       break
     case '编辑':
-      goDetail(row, 'edit')
+      if (row.approvalStatusName === '未通过-驳回') {
+        editAgain(row)
+      }
+      else {
+        goDetail(row, 'edit')
+      }
       break
     case '同意':
       approvalDialog.value.initDialog('agree', row.taskId)
@@ -322,9 +324,10 @@
   () => props.status,
   (newVal: string) => {
     listQuery.value.approvalStatus = newVal
+    window.sessionStorage.setItem('maintenceListApprovalStatus', newVal)
     fetchData(false)
   },
-  { immediate: true })
+)
 
 // 打印列表
 function printList() {
@@ -347,19 +350,14 @@
   }
 }
 onMounted(async () => {
-  console.log(sessionStorage.getItem('maintenceListApprovalStatus'))
-
-  // await getDict()
-  // if (sessionStorage.getItem('maintenceListApprovalStatus')) {
-  //   listQuery.value.approvalStatus = sessionStorage.getItem('maintenceListApprovalStatus')!
-  //   console.log(approvalStatusReserveMap.value[sessionStorage.getItem('maintenceListMenu')!])
-  // }
-  // else {
-  //   console.log('没有')
-
-  //   listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部']
-  // }
-  // fetchData(true)
+  await getDict()
+  if (window.sessionStorage.getItem('maintenceListApprovalStatus')) {
+    listQuery.value.approvalStatus = window.sessionStorage.getItem('maintenceListApprovalStatus')!
+  }
+  else {
+    listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部']
+  }
+  fetchData(true)
 })
 </script>
 
diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
index 860d610..3e0498c 100644
--- a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
+++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
@@ -227,6 +227,10 @@
 const addId = ref('')
 // 提交、保存
 const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  if (!formInline.value.equipmentInfoList.length) {
+    ElMessage.warning('要求设备检修列表不能为空')
+    return
+  }
   if (item === '保存' && pageType.value === 'add') {
     if (!formEl) { return }
     await formEl.validate((valid, fields) => {
@@ -270,6 +274,9 @@
               }
             })
           }
+          else {
+            formInline.value.equipmentList = []
+          }
           if (from.value === 'reject') { // 未通过-驳回的编辑
             failUpdateEquipmentApply(formInline.value).then((res) => {
               if (res.code === 200) {
@@ -408,13 +415,15 @@
 const approvalRecordData = ref([]) // 审批流程数据
 // 查询审批记录
 function getApprovalRecord(processId: string) {
-  if (processId) {
-    fetchApproval(processId).then((res) => {
-      approvalRecordData.value = res.data
-    })
-  }
-  else {
-    ElMessage.warning('流程实例id为空')
+  if (pageType.value !== 'add') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
   }
 }
 // 审批结束回调
@@ -570,7 +579,7 @@
         </el-table-column>
       </el-table>
     </detail-block>
-    <detail-block v-if="formInline.approvalStatusName !== '草稿箱'" title="审批流程">
+    <detail-block v-if="formInline.approvalStatusName !== '草稿箱' && pageType !== 'add'" title="审批流程">
       <!-- 审批流程 -->
       <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
     </detail-block>
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index dc748fb..2e4bfe4 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -85,21 +85,23 @@
     }
   })
 }
-getDict()
+
 // 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
 onUnmounted(() => {
-  sessionStorage.setItem('maintenceListMenu', currentTab.value)
+  // sessionStorage.setItem('maintenceListMenu', currentTab.value)
 })
 // 挂载的时候找到之前存过的审批类型
-onMounted(() => {
-  currentTab.value = sessionStorage.getItem('maintenceListMenu') || '全部'
-  sessionStorage.getItem('maintenceListMenu') ? sessionStorage.removeItem('maintenceListMenu') : ''
+onMounted(async () => {
+  await getDict()
+  currentTab.value = window.sessionStorage.getItem('maintenceListMenu') || '全部'
+  currentApprovalStatus.value = approvalStatusReserveMap.value[currentTab.value]
 })
 
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
+  window.sessionStorage.setItem('maintenceListMenu', newValue)
   currentButtons.value = buttonsSet[newValue]
-}, { deep: true, immediate: true })
+}, { deep: true })
 </script>
 
 <template>
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 11abf8f..d1c0538 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -320,7 +320,7 @@
 const changeCurrentButton = (val: string) => {
   active.value = val
   activeTitle.value = menu.value.find(item => item.id === val)!.name
-  window.sessionStorage.setItem('buttonBoxActive', val)
+  window.sessionStorage.setItem('receiveButtonBoxActive', val)
   clearList()
 }
 
@@ -365,9 +365,9 @@
 onMounted(async () => {
   // 获取字典-审批状态
   getDict().then(() => {
-    if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '' && window.sessionStorage.getItem('buttonBoxActive') !== null) {
-      active.value = window.sessionStorage.getItem('buttonBoxActive')!
-      console.log(window.sessionStorage.getItem('buttonBoxActive'))
+    if (window.sessionStorage.getItem('receiveButtonBoxActive') !== 'undefined' && window.sessionStorage.getItem('receiveButtonBoxActive') !== '' && window.sessionStorage.getItem('receiveButtonBoxActive') !== null) {
+      active.value = window.sessionStorage.getItem('receiveButtonBoxActive')!
+      console.log(window.sessionStorage.getItem('receiveButtonBoxActive'))
     }
     else {
       active.value = menu.value.find(item => item.name === '全部')!.id // 全部
@@ -381,7 +381,7 @@
   })
 })
 onUnmounted(() => {
-  window.sessionStorage.setItem('buttonBoxActive', '') // 清除
+  window.sessionStorage.setItem('receiveButtonBoxActive', '') // 清除
 })
 </script>
 
diff --git a/src/views/device/receive/solve/solveList.vue b/src/views/device/receive/solve/solveList.vue
index 2eda82d..6fc0cc5 100644
--- a/src/views/device/receive/solve/solveList.vue
+++ b/src/views/device/receive/solve/solveList.vue
@@ -264,7 +264,7 @@
 // 右上角按钮切换
 const changeCurrentButton = (val: string) => {
   active.value = val
-  window.sessionStorage.setItem('solveButtonBoxActive', val)
+  window.sessionStorage.setItem('receiveSolveButtonBoxActive', val)
   clearList()
 }
 
@@ -306,8 +306,8 @@
 
 onMounted(async () => {
   await getDict()
-  if (window.sessionStorage.getItem('solveButtonBoxActive') !== 'undefined' && window.sessionStorage.getItem('solveButtonBoxActive') !== '' && window.sessionStorage.getItem('buttonBoxActive') !== null) {
-    active.value = window.sessionStorage.getItem('solveButtonBoxActive')!
+  if (window.sessionStorage.getItem('receiveSolveButtonBoxActive') !== 'undefined' && window.sessionStorage.getItem('receiveSolveButtonBoxActive') !== '' && window.sessionStorage.getItem('buttonBoxActive') !== null) {
+    active.value = window.sessionStorage.getItem('receiveSolveButtonBoxActive')!
   }
   else {
     active.value = menu.value.find(item => item.name === '待领用')!.id // 未领用
@@ -322,7 +322,7 @@
   })
 })
 onUnmounted(() => {
-  window.sessionStorage.setItem('solveButtonBoxActive', '')
+  window.sessionStorage.setItem('receiveSolveButtonBoxActive', '')
 })
 </script>
 
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index c0c3744..5000903 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -47,6 +47,7 @@
   companyCityName: '', // 市
   companyCountryName: '', // 国家
   companyProvinceName: '', // 省
+  companyAddress: '',
   formId: SCHEDULE.SUPPLIER_APPROVAL,
   supplierName: '',
   supplierNo: '',
@@ -78,7 +79,7 @@
 const loadingTable = ref(false)
 
 // 获取数据
-const fetchData = (isNowPage: boolean) => {
+const fetchData = (isNowPage: boolean, isReset?: false) => {
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -86,7 +87,12 @@
   }
   getapprovalListPage(listQuery.value).then((response) => {
     list.value = response.data.rows
-    companyAddress.value = [response.data.rows[0].companyCountry, response.data.rows[0].companyProvince, response.data.rows[0].companyCity, response.data.rows[0].companyArea, response.data.rows[0].companyAddress]
+    if (!companyAddress.value) {
+      companyAddress.value = [response.data.rows[0].companyCountry, response.data.rows[0].companyProvince, response.data.rows[0].companyCity, response.data.rows[0].companyArea, response.data.rows[0].companyAddress]
+    }
+    else if (isReset) {
+      companyAddress.value = [response.data.rows[0].companyCountry, response.data.rows[0].companyProvince, response.data.rows[0].companyCity, response.data.rows[0].companyArea, response.data.rows[0].companyAddress]
+    }
     total.value = parseInt(response.data.total)
     console.log(companyAddress.value)
     loadingTable.value = false
@@ -109,6 +115,7 @@
   listQuery.value.companyProvinceName = addressObj.provinceName
   listQuery.value.companyCityName = addressObj.cityName
   listQuery.value.companyAreaName = addressObj.areaName
+  listQuery.value.companyAddress = addressObj.address
 }
 // 点击删除或者取消
 const handleDelete = (row: rowReturn) => {
@@ -175,13 +182,14 @@
     companyCityName: '', // 市
     companyCountryName: '', // 国家
     companyProvinceName: '', // 省
+    companyAddress: '',
     formId: SCHEDULE.SUPPLIER_APPROVAL,
     supplierName: '',
     supplierNo: '',
     offset: 1,
     limit: 20,
   }
-  fetchData(true)
+  fetchData(true, true)
 }
 // 导出
 const exportExcelBtn = () => {
@@ -237,6 +245,12 @@
 const approvalSuccess = () => {
   fetchData(true)
 }
+// 驳回后编辑
+function editAgain(row: Omit<ISupplier, 'traceSupplierPersonList'>) {
+  console.log('999', row.processId)
+
+  $router.push(`/source/edit/${row.id}/${row.processId}?from=reject`)
+}
 
 // 提交
 const approvalSubmit = (row: ISupplier) => {
@@ -266,7 +280,12 @@
       approvalSubmit(row)
       break
     case '编辑':
-      $router.push(`/source/edit/${row.id}`)
+      if (row.approvalStatusName === '未通过-驳回') {
+        editAgain(row)
+      }
+      else {
+        $router.push(`/source/edit/${row.id}`)
+      }
       break
     case '同意':
       approvalDialog.value.initDialog('agree', row.taskId)
@@ -286,11 +305,6 @@
   }
 }
 
-// 驳回后编辑
-function editAgain(row: ISupplier) {
-  $router.push(`/source/edit/${row.id}?from=reject`)
-}
-
 // 监听status变化，更新approvalStatus
 watch (
   () => props.status,
diff --git a/src/views/measure/source/components/sourceApprovalDetail.vue b/src/views/measure/source/components/sourceApprovalDetail.vue
index 8d9d22d..c507032 100644
--- a/src/views/measure/source/components/sourceApprovalDetail.vue
+++ b/src/views/measure/source/components/sourceApprovalDetail.vue
@@ -70,13 +70,6 @@
   approvalStatus: '', // 审批状态
   approvalStatusName: '', // 审批状态名称
 })
-// 获取表单详情
-const getInfo = () => {
-  getSoucreListDetail({ id: infoId.value }).then((res) => {
-    dataForm.value = res.data
-  })
-}
-getInfo()
 
 const traceSupplierPersonList: Ref<traceSupplierPerson[]> = ref([])
 const columns = [
@@ -86,7 +79,13 @@
   { text: '职务', value: 'job' },
   { text: '联系方式', value: 'phone' },
 ]
-
+// 获取表单详情
+const getInfo = () => {
+  getSoucreListDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data
+  })
+}
+getInfo()
 // 初始化router
 const $router = useRouter()
 // 关闭新增页面的回调
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index e2778fe..e352e61 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -18,8 +18,6 @@
   offset: 1,
   limit: 20,
 })
-// 控制是否显示新增页面
-const show = ref(true)
 // 表格数据
 const list = ref<ISupplier[]>([])
 const { proxy } = getCurrentInstance() as any
@@ -81,12 +79,6 @@
 const checkoutList = ref<string[]>([])
 // 文件上传input
 const fileRef = ref()
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index 34b813b..2e92d4d 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -9,7 +9,7 @@
 import type { ISupplier, traceSupplierPerson } from './list_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-import { getSoucreListDetail, getSoucreListlevelType, sourceDraftUpdate, sourceSave, sourceSubmit, updateSourceApproval } from '@/api/measure/source'
+import { failUpdateSourceApproval, getSoucreListDetail, getSoucreListlevelType, sourceDraftUpdate, sourceSave, sourceSubmit } from '@/api/measure/source'
 import { validatePhone } from '@/utils/validate'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import type { IAddress } from '@/components/AddressSelect/address-interface'
@@ -23,20 +23,11 @@
   add: '新建',
   detail: '详情',
 }// 字典
-const fromPage = ref('') // 来自于草稿箱还是驳回
-// 从路由中获取页面类型参数
-const $route = useRoute()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
+const from = ref('') // 来自于草稿箱还是驳回reject驳回
+const processId = ref('') // 流程实例id
 
-if ($route.query && $route.query.from) {
-  fromPage.value = $route.query.from as string
-}
-const formInline: Ref<ISupplier> = ref({
+const formInline = ref<ISupplier>({
+  processId: '', // 流程实例id
   id: '',
   businessContent: '',
   supplierName: '',
@@ -105,6 +96,25 @@
   businessContent: [{ required: true, message: '业务内容不能为空', trigger: ['blur', 'change'] }],
   taxNumber: [{ required: true, message: '税号不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
+
+// -------------------------------------路由参数----------------------------------------
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+  if ($route.params.processId) { // 流程实例id
+    formInline.value.processId = $route.params.processId as string
+    processId.value = $route.params.processId as string
+  }
+}
+if ($route.query && $route.query.from) {
+  from.value = $route.query.from as string
+}
+
+// -------------------------------------------------------------------------------------
+
 // 初始化router
 const $router = useRouter()
 // 关闭新增页面的回调
@@ -204,22 +214,36 @@
   extarCss: '',
 })
 
-// 保存至草稿箱
+// 保存
 const saveForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
       formInline.value.traceSupplierPersonList = traceSupplierPersonList.value
-      if (formInline.value.supplierNo) {
-        sourceDraftUpdate(formInline.value).then((res) => {
-          if (res.code === 200) {
-            ElMessage.success('已保存')
-            isChanged.value = false
-          }
-        })
+      formInline.value.processId = processId.value
+
+      if (pageType.value !== 'add') { // 编辑
+        if (formInline.value.supplierNo && from.value !== 'reject') {
+          sourceDraftUpdate(formInline.value).then((res) => { // 草稿箱编辑
+            if (res.code === 200) {
+              ElMessage.success('已保存')
+              isChanged.value = false
+              close()
+            }
+          })
+        }
+        else if (from.value === 'reject') {
+          failUpdateSourceApproval(formInline.value).then((res) => { // 未通过-驳回编辑
+            if (res.code === 200) {
+              ElMessage.success('已保存')
+              isChanged.value = false
+              close()
+            }
+          })
+        }
       }
-      else {
-        sourceSave(formInline.value).then((res) => {
+      else { // 新建
+        sourceSave(formInline.value).then((res) => { // 新建的保存
           if (res.code === 200) {
             formInline.value.id = res.data.id
             formInline.value.supplierNo = res.data.supplierNo
@@ -257,40 +281,54 @@
           type: 'warning',
         },
       ).then(() => {
-        if (fromPage.value == 'reject') { // 驳回调用驳回编辑接口
-          updateSourceApproval(formInline.value).then((res) => {
-            ElMessage.success('提交成功!')
-          })
+        if (!formInline.value.id) {
+          ElMessage.warning('请先保存!')
+          return false
         }
         else {
-          // 如果id存在, 调用更新接口
-          if (formInline.value.id) {
-          // 如果表单变更过,先保存，再提交
-            if (isChanged.value) {
-              sourceDraftUpdate(formInline.value).then((res) => {
-                if (res.code === 200) {
-                  submitFunc()
-                }
-                else {
-                  ElMessage.error('保存失败，请重新保存后提交')
-                }
-              })
-            }
-            else { // 表单未变更过，直接提交
-              submitFunc()
-            }
+          const params = {
+            id: formInline.value.id,
+            formId: curFormId, // 表单id
           }
-          else {
-          // id不存在，调用保存接口，再提交
-            sourceSave(formInline.value).then((res) => {
-              if (res.code === 200) {
-                formInline.value.id = res.data.id
-                formInline.value.supplierNo = res.data.supplierNo
-                submitFunc()
-              }
-            })
-          }
+          sourceSubmit(params).then((res) => {
+            ElMessage.success('提交成功')
+            close()
+          })
         }
+      //   if (from.value == 'reject') { // 驳回调用驳回编辑接口
+      //     failUpdateSourceApproval(formInline.value).then(() => {
+      //       ElMessage.success('提交成功!')
+      //     })
+      //   }
+      //   else {
+      //     // 如果id存在, 调用更新接口
+      //     if (formInline.value.id) {
+      //     // 如果表单变更过,先保存，再提交
+      //       if (isChanged.value) {
+      //         sourceDraftUpdate(formInline.value).then((res) => {
+      //           if (res.code === 200) {
+      //             submitFunc()
+      //           }
+      //           else {
+      //             ElMessage.error('保存失败，请重新保存后提交')
+      //           }
+      //         })
+      //       }
+      //       else { // 表单未变更过，直接提交
+      //         submitFunc()
+      //       }
+      //     }
+      //     else {
+      //     // id不存在，调用保存接口，再提交
+      //       sourceSave(formInline.value).then((res) => {
+      //         if (res.code === 200) {
+      //           formInline.value.id = res.data.id
+      //           formInline.value.supplierNo = res.data.supplierNo
+      //           submitFunc()
+      //         }
+      //       })
+      //     }
+      //   }
       })
     }
   })
@@ -319,17 +357,18 @@
 const upload = () => {
   fileRef.value.click()
 }
-// 双击行显示输入框
-const dblclickRow = (row: traceSupplierPerson) => {
-  setAllRowReadable()
-  row.editable = true
-}
 // 将所有人员信息列表置为不可编辑状态
 function setAllRowReadable() {
   for (const item of traceSupplierPersonList.value) {
     item.editable = false
   }
 }
+// 双击行显示输入框
+const dblclickRow = (row: traceSupplierPerson) => {
+  setAllRowReadable()
+  row.editable = true
+}
+
 // 非添加页面获取详情
 if (pageType.value !== 'add') {
   getInfo()
@@ -346,7 +385,7 @@
         <el-button v-if="pageType === 'add'" type="primary" @click="submitForm(ruleFormRef)">
           提交
         </el-button>
-        <el-button v-if="pageType !== 'detail' && fromPage !== 'reject'" type="primary" @click="saveForm(ruleFormRef)">
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
           保存
         </el-button>
         <el-button type="info" @click="close">

diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index 1c3ae09..cb7dee6 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -64,7 +64,7 @@
   })
 }
 // 驳回后编辑接口
-export function updateSourceApproval(data: object) {
+export function failUpdateSourceApproval(data: object) {
   return request({
     url: '/meter/supplier/failUpdate',
     method: 'post',
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 64a02ff..3911d5b 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -411,7 +411,7 @@
         },
       },
       {
-        path: ':type/:id?',
+        path: ':type/:id?/:processId?',
         name: 'ListSourceAdd',
         component: () => import('@/views/measure/source/listAdd.vue'),
         meta: {
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 5d7fc0f..7d13e1b 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -369,7 +369,7 @@
 
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
-  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
+  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '' && window.sessionStorage.getItem('buttonBoxActive') !== null) {
     active.value = window.sessionStorage.getItem('buttonBoxActive')!
   }
   else {
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 0a4cf0a..2916278 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -417,7 +417,7 @@
 }
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
-  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
+  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '' && window.sessionStorage.getItem('buttonBoxActive') !== null) {
     active.value = window.sessionStorage.getItem('buttonBoxActive')!
   }
   else {
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 2d86a98..62da755 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -17,7 +17,7 @@
 const props = defineProps({
   status: {
     type: String,
-    default: '0',
+    default: '',
   },
   buttons: {
     type: Array as PropType<IButton[]>,
@@ -139,7 +139,6 @@
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
 
-const buttonTypeMap = ref('')
 // 点击删除
 const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
@@ -243,12 +242,10 @@
 }
 // 驳回后编辑
 const editAgain = (row: IlistApproval) => {
-  $router.push(`/maintenance/maintenanceList/edit/${row.id}?from=reject`)
+  $router.push(`/maintenance/maintenanceList/edit/${row.id}/${row.approvalStatusName}/${row.processId}?from=reject`)
 }
 // 跳转到详情
 const goDetail = (row: IlistApproval, type: string) => {
-  console.log('-----')
-
   $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.approvalStatusName}/${row.processId}`)
 }
 // 获取到组织信息
@@ -297,7 +294,12 @@
       approvalSubmit(row)
       break
     case '编辑':
-      goDetail(row, 'edit')
+      if (row.approvalStatusName === '未通过-驳回') {
+        editAgain(row)
+      }
+      else {
+        goDetail(row, 'edit')
+      }
       break
     case '同意':
       approvalDialog.value.initDialog('agree', row.taskId)
@@ -322,9 +324,10 @@
   () => props.status,
   (newVal: string) => {
     listQuery.value.approvalStatus = newVal
+    window.sessionStorage.setItem('maintenceListApprovalStatus', newVal)
     fetchData(false)
   },
-  { immediate: true })
+)
 
 // 打印列表
 function printList() {
@@ -347,19 +350,14 @@
   }
 }
 onMounted(async () => {
-  console.log(sessionStorage.getItem('maintenceListApprovalStatus'))
-
-  // await getDict()
-  // if (sessionStorage.getItem('maintenceListApprovalStatus')) {
-  //   listQuery.value.approvalStatus = sessionStorage.getItem('maintenceListApprovalStatus')!
-  //   console.log(approvalStatusReserveMap.value[sessionStorage.getItem('maintenceListMenu')!])
-  // }
-  // else {
-  //   console.log('没有')
-
-  //   listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部']
-  // }
-  // fetchData(true)
+  await getDict()
+  if (window.sessionStorage.getItem('maintenceListApprovalStatus')) {
+    listQuery.value.approvalStatus = window.sessionStorage.getItem('maintenceListApprovalStatus')!
+  }
+  else {
+    listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部']
+  }
+  fetchData(true)
 })
 </script>
 
diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
index 860d610..3e0498c 100644
--- a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
+++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
@@ -227,6 +227,10 @@
 const addId = ref('')
 // 提交、保存
 const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  if (!formInline.value.equipmentInfoList.length) {
+    ElMessage.warning('要求设备检修列表不能为空')
+    return
+  }
   if (item === '保存' && pageType.value === 'add') {
     if (!formEl) { return }
     await formEl.validate((valid, fields) => {
@@ -270,6 +274,9 @@
               }
             })
           }
+          else {
+            formInline.value.equipmentList = []
+          }
           if (from.value === 'reject') { // 未通过-驳回的编辑
             failUpdateEquipmentApply(formInline.value).then((res) => {
               if (res.code === 200) {
@@ -408,13 +415,15 @@
 const approvalRecordData = ref([]) // 审批流程数据
 // 查询审批记录
 function getApprovalRecord(processId: string) {
-  if (processId) {
-    fetchApproval(processId).then((res) => {
-      approvalRecordData.value = res.data
-    })
-  }
-  else {
-    ElMessage.warning('流程实例id为空')
+  if (pageType.value !== 'add') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
   }
 }
 // 审批结束回调
@@ -570,7 +579,7 @@
         </el-table-column>
       </el-table>
     </detail-block>
-    <detail-block v-if="formInline.approvalStatusName !== '草稿箱'" title="审批流程">
+    <detail-block v-if="formInline.approvalStatusName !== '草稿箱' && pageType !== 'add'" title="审批流程">
       <!-- 审批流程 -->
       <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
     </detail-block>
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index dc748fb..2e4bfe4 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -85,21 +85,23 @@
     }
   })
 }
-getDict()
+
 // 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
 onUnmounted(() => {
-  sessionStorage.setItem('maintenceListMenu', currentTab.value)
+  // sessionStorage.setItem('maintenceListMenu', currentTab.value)
 })
 // 挂载的时候找到之前存过的审批类型
-onMounted(() => {
-  currentTab.value = sessionStorage.getItem('maintenceListMenu') || '全部'
-  sessionStorage.getItem('maintenceListMenu') ? sessionStorage.removeItem('maintenceListMenu') : ''
+onMounted(async () => {
+  await getDict()
+  currentTab.value = window.sessionStorage.getItem('maintenceListMenu') || '全部'
+  currentApprovalStatus.value = approvalStatusReserveMap.value[currentTab.value]
 })
 
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
+  window.sessionStorage.setItem('maintenceListMenu', newValue)
   currentButtons.value = buttonsSet[newValue]
-}, { deep: true, immediate: true })
+}, { deep: true })
 </script>
 
 <template>
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 11abf8f..d1c0538 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -320,7 +320,7 @@
 const changeCurrentButton = (val: string) => {
   active.value = val
   activeTitle.value = menu.value.find(item => item.id === val)!.name
-  window.sessionStorage.setItem('buttonBoxActive', val)
+  window.sessionStorage.setItem('receiveButtonBoxActive', val)
   clearList()
 }
 
@@ -365,9 +365,9 @@
 onMounted(async () => {
   // 获取字典-审批状态
   getDict().then(() => {
-    if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '' && window.sessionStorage.getItem('buttonBoxActive') !== null) {
-      active.value = window.sessionStorage.getItem('buttonBoxActive')!
-      console.log(window.sessionStorage.getItem('buttonBoxActive'))
+    if (window.sessionStorage.getItem('receiveButtonBoxActive') !== 'undefined' && window.sessionStorage.getItem('receiveButtonBoxActive') !== '' && window.sessionStorage.getItem('receiveButtonBoxActive') !== null) {
+      active.value = window.sessionStorage.getItem('receiveButtonBoxActive')!
+      console.log(window.sessionStorage.getItem('receiveButtonBoxActive'))
     }
     else {
       active.value = menu.value.find(item => item.name === '全部')!.id // 全部
@@ -381,7 +381,7 @@
   })
 })
 onUnmounted(() => {
-  window.sessionStorage.setItem('buttonBoxActive', '') // 清除
+  window.sessionStorage.setItem('receiveButtonBoxActive', '') // 清除
 })
 </script>
 
diff --git a/src/views/device/receive/solve/solveList.vue b/src/views/device/receive/solve/solveList.vue
index 2eda82d..6fc0cc5 100644
--- a/src/views/device/receive/solve/solveList.vue
+++ b/src/views/device/receive/solve/solveList.vue
@@ -264,7 +264,7 @@
 // 右上角按钮切换
 const changeCurrentButton = (val: string) => {
   active.value = val
-  window.sessionStorage.setItem('solveButtonBoxActive', val)
+  window.sessionStorage.setItem('receiveSolveButtonBoxActive', val)
   clearList()
 }
 
@@ -306,8 +306,8 @@
 
 onMounted(async () => {
   await getDict()
-  if (window.sessionStorage.getItem('solveButtonBoxActive') !== 'undefined' && window.sessionStorage.getItem('solveButtonBoxActive') !== '' && window.sessionStorage.getItem('buttonBoxActive') !== null) {
-    active.value = window.sessionStorage.getItem('solveButtonBoxActive')!
+  if (window.sessionStorage.getItem('receiveSolveButtonBoxActive') !== 'undefined' && window.sessionStorage.getItem('receiveSolveButtonBoxActive') !== '' && window.sessionStorage.getItem('buttonBoxActive') !== null) {
+    active.value = window.sessionStorage.getItem('receiveSolveButtonBoxActive')!
   }
   else {
     active.value = menu.value.find(item => item.name === '待领用')!.id // 未领用
@@ -322,7 +322,7 @@
   })
 })
 onUnmounted(() => {
-  window.sessionStorage.setItem('solveButtonBoxActive', '')
+  window.sessionStorage.setItem('receiveSolveButtonBoxActive', '')
 })
 </script>
 
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index c0c3744..5000903 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -47,6 +47,7 @@
   companyCityName: '', // 市
   companyCountryName: '', // 国家
   companyProvinceName: '', // 省
+  companyAddress: '',
   formId: SCHEDULE.SUPPLIER_APPROVAL,
   supplierName: '',
   supplierNo: '',
@@ -78,7 +79,7 @@
 const loadingTable = ref(false)
 
 // 获取数据
-const fetchData = (isNowPage: boolean) => {
+const fetchData = (isNowPage: boolean, isReset?: false) => {
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -86,7 +87,12 @@
   }
   getapprovalListPage(listQuery.value).then((response) => {
     list.value = response.data.rows
-    companyAddress.value = [response.data.rows[0].companyCountry, response.data.rows[0].companyProvince, response.data.rows[0].companyCity, response.data.rows[0].companyArea, response.data.rows[0].companyAddress]
+    if (!companyAddress.value) {
+      companyAddress.value = [response.data.rows[0].companyCountry, response.data.rows[0].companyProvince, response.data.rows[0].companyCity, response.data.rows[0].companyArea, response.data.rows[0].companyAddress]
+    }
+    else if (isReset) {
+      companyAddress.value = [response.data.rows[0].companyCountry, response.data.rows[0].companyProvince, response.data.rows[0].companyCity, response.data.rows[0].companyArea, response.data.rows[0].companyAddress]
+    }
     total.value = parseInt(response.data.total)
     console.log(companyAddress.value)
     loadingTable.value = false
@@ -109,6 +115,7 @@
   listQuery.value.companyProvinceName = addressObj.provinceName
   listQuery.value.companyCityName = addressObj.cityName
   listQuery.value.companyAreaName = addressObj.areaName
+  listQuery.value.companyAddress = addressObj.address
 }
 // 点击删除或者取消
 const handleDelete = (row: rowReturn) => {
@@ -175,13 +182,14 @@
     companyCityName: '', // 市
     companyCountryName: '', // 国家
     companyProvinceName: '', // 省
+    companyAddress: '',
     formId: SCHEDULE.SUPPLIER_APPROVAL,
     supplierName: '',
     supplierNo: '',
     offset: 1,
     limit: 20,
   }
-  fetchData(true)
+  fetchData(true, true)
 }
 // 导出
 const exportExcelBtn = () => {
@@ -237,6 +245,12 @@
 const approvalSuccess = () => {
   fetchData(true)
 }
+// 驳回后编辑
+function editAgain(row: Omit<ISupplier, 'traceSupplierPersonList'>) {
+  console.log('999', row.processId)
+
+  $router.push(`/source/edit/${row.id}/${row.processId}?from=reject`)
+}
 
 // 提交
 const approvalSubmit = (row: ISupplier) => {
@@ -266,7 +280,12 @@
       approvalSubmit(row)
       break
     case '编辑':
-      $router.push(`/source/edit/${row.id}`)
+      if (row.approvalStatusName === '未通过-驳回') {
+        editAgain(row)
+      }
+      else {
+        $router.push(`/source/edit/${row.id}`)
+      }
       break
     case '同意':
       approvalDialog.value.initDialog('agree', row.taskId)
@@ -286,11 +305,6 @@
   }
 }
 
-// 驳回后编辑
-function editAgain(row: ISupplier) {
-  $router.push(`/source/edit/${row.id}?from=reject`)
-}
-
 // 监听status变化，更新approvalStatus
 watch (
   () => props.status,
diff --git a/src/views/measure/source/components/sourceApprovalDetail.vue b/src/views/measure/source/components/sourceApprovalDetail.vue
index 8d9d22d..c507032 100644
--- a/src/views/measure/source/components/sourceApprovalDetail.vue
+++ b/src/views/measure/source/components/sourceApprovalDetail.vue
@@ -70,13 +70,6 @@
   approvalStatus: '', // 审批状态
   approvalStatusName: '', // 审批状态名称
 })
-// 获取表单详情
-const getInfo = () => {
-  getSoucreListDetail({ id: infoId.value }).then((res) => {
-    dataForm.value = res.data
-  })
-}
-getInfo()
 
 const traceSupplierPersonList: Ref<traceSupplierPerson[]> = ref([])
 const columns = [
@@ -86,7 +79,13 @@
   { text: '职务', value: 'job' },
   { text: '联系方式', value: 'phone' },
 ]
-
+// 获取表单详情
+const getInfo = () => {
+  getSoucreListDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data
+  })
+}
+getInfo()
 // 初始化router
 const $router = useRouter()
 // 关闭新增页面的回调
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index e2778fe..e352e61 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -18,8 +18,6 @@
   offset: 1,
   limit: 20,
 })
-// 控制是否显示新增页面
-const show = ref(true)
 // 表格数据
 const list = ref<ISupplier[]>([])
 const { proxy } = getCurrentInstance() as any
@@ -81,12 +79,6 @@
 const checkoutList = ref<string[]>([])
 // 文件上传input
 const fileRef = ref()
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index 34b813b..2e92d4d 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -9,7 +9,7 @@
 import type { ISupplier, traceSupplierPerson } from './list_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-import { getSoucreListDetail, getSoucreListlevelType, sourceDraftUpdate, sourceSave, sourceSubmit, updateSourceApproval } from '@/api/measure/source'
+import { failUpdateSourceApproval, getSoucreListDetail, getSoucreListlevelType, sourceDraftUpdate, sourceSave, sourceSubmit } from '@/api/measure/source'
 import { validatePhone } from '@/utils/validate'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import type { IAddress } from '@/components/AddressSelect/address-interface'
@@ -23,20 +23,11 @@
   add: '新建',
   detail: '详情',
 }// 字典
-const fromPage = ref('') // 来自于草稿箱还是驳回
-// 从路由中获取页面类型参数
-const $route = useRoute()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
+const from = ref('') // 来自于草稿箱还是驳回reject驳回
+const processId = ref('') // 流程实例id
 
-if ($route.query && $route.query.from) {
-  fromPage.value = $route.query.from as string
-}
-const formInline: Ref<ISupplier> = ref({
+const formInline = ref<ISupplier>({
+  processId: '', // 流程实例id
   id: '',
   businessContent: '',
   supplierName: '',
@@ -105,6 +96,25 @@
   businessContent: [{ required: true, message: '业务内容不能为空', trigger: ['blur', 'change'] }],
   taxNumber: [{ required: true, message: '税号不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
+
+// -------------------------------------路由参数----------------------------------------
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+  if ($route.params.processId) { // 流程实例id
+    formInline.value.processId = $route.params.processId as string
+    processId.value = $route.params.processId as string
+  }
+}
+if ($route.query && $route.query.from) {
+  from.value = $route.query.from as string
+}
+
+// -------------------------------------------------------------------------------------
+
 // 初始化router
 const $router = useRouter()
 // 关闭新增页面的回调
@@ -204,22 +214,36 @@
   extarCss: '',
 })
 
-// 保存至草稿箱
+// 保存
 const saveForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
       formInline.value.traceSupplierPersonList = traceSupplierPersonList.value
-      if (formInline.value.supplierNo) {
-        sourceDraftUpdate(formInline.value).then((res) => {
-          if (res.code === 200) {
-            ElMessage.success('已保存')
-            isChanged.value = false
-          }
-        })
+      formInline.value.processId = processId.value
+
+      if (pageType.value !== 'add') { // 编辑
+        if (formInline.value.supplierNo && from.value !== 'reject') {
+          sourceDraftUpdate(formInline.value).then((res) => { // 草稿箱编辑
+            if (res.code === 200) {
+              ElMessage.success('已保存')
+              isChanged.value = false
+              close()
+            }
+          })
+        }
+        else if (from.value === 'reject') {
+          failUpdateSourceApproval(formInline.value).then((res) => { // 未通过-驳回编辑
+            if (res.code === 200) {
+              ElMessage.success('已保存')
+              isChanged.value = false
+              close()
+            }
+          })
+        }
       }
-      else {
-        sourceSave(formInline.value).then((res) => {
+      else { // 新建
+        sourceSave(formInline.value).then((res) => { // 新建的保存
           if (res.code === 200) {
             formInline.value.id = res.data.id
             formInline.value.supplierNo = res.data.supplierNo
@@ -257,40 +281,54 @@
           type: 'warning',
         },
       ).then(() => {
-        if (fromPage.value == 'reject') { // 驳回调用驳回编辑接口
-          updateSourceApproval(formInline.value).then((res) => {
-            ElMessage.success('提交成功!')
-          })
+        if (!formInline.value.id) {
+          ElMessage.warning('请先保存!')
+          return false
         }
         else {
-          // 如果id存在, 调用更新接口
-          if (formInline.value.id) {
-          // 如果表单变更过,先保存，再提交
-            if (isChanged.value) {
-              sourceDraftUpdate(formInline.value).then((res) => {
-                if (res.code === 200) {
-                  submitFunc()
-                }
-                else {
-                  ElMessage.error('保存失败，请重新保存后提交')
-                }
-              })
-            }
-            else { // 表单未变更过，直接提交
-              submitFunc()
-            }
+          const params = {
+            id: formInline.value.id,
+            formId: curFormId, // 表单id
           }
-          else {
-          // id不存在，调用保存接口，再提交
-            sourceSave(formInline.value).then((res) => {
-              if (res.code === 200) {
-                formInline.value.id = res.data.id
-                formInline.value.supplierNo = res.data.supplierNo
-                submitFunc()
-              }
-            })
-          }
+          sourceSubmit(params).then((res) => {
+            ElMessage.success('提交成功')
+            close()
+          })
         }
+      //   if (from.value == 'reject') { // 驳回调用驳回编辑接口
+      //     failUpdateSourceApproval(formInline.value).then(() => {
+      //       ElMessage.success('提交成功!')
+      //     })
+      //   }
+      //   else {
+      //     // 如果id存在, 调用更新接口
+      //     if (formInline.value.id) {
+      //     // 如果表单变更过,先保存，再提交
+      //       if (isChanged.value) {
+      //         sourceDraftUpdate(formInline.value).then((res) => {
+      //           if (res.code === 200) {
+      //             submitFunc()
+      //           }
+      //           else {
+      //             ElMessage.error('保存失败，请重新保存后提交')
+      //           }
+      //         })
+      //       }
+      //       else { // 表单未变更过，直接提交
+      //         submitFunc()
+      //       }
+      //     }
+      //     else {
+      //     // id不存在，调用保存接口，再提交
+      //       sourceSave(formInline.value).then((res) => {
+      //         if (res.code === 200) {
+      //           formInline.value.id = res.data.id
+      //           formInline.value.supplierNo = res.data.supplierNo
+      //           submitFunc()
+      //         }
+      //       })
+      //     }
+      //   }
       })
     }
   })
@@ -319,17 +357,18 @@
 const upload = () => {
   fileRef.value.click()
 }
-// 双击行显示输入框
-const dblclickRow = (row: traceSupplierPerson) => {
-  setAllRowReadable()
-  row.editable = true
-}
 // 将所有人员信息列表置为不可编辑状态
 function setAllRowReadable() {
   for (const item of traceSupplierPersonList.value) {
     item.editable = false
   }
 }
+// 双击行显示输入框
+const dblclickRow = (row: traceSupplierPerson) => {
+  setAllRowReadable()
+  row.editable = true
+}
+
 // 非添加页面获取详情
 if (pageType.value !== 'add') {
   getInfo()
@@ -346,7 +385,7 @@
         <el-button v-if="pageType === 'add'" type="primary" @click="submitForm(ruleFormRef)">
           提交
         </el-button>
-        <el-button v-if="pageType !== 'detail' && fromPage !== 'reject'" type="primary" @click="saveForm(ruleFormRef)">
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
           保存
         </el-button>
         <el-button type="info" @click="close">
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index 60d4160..42114f0 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -111,6 +111,7 @@
   companyCityName: string // 市
   companyCountryName: string // 国家
   companyProvinceName: string // 省
+  companyAddress: string // 详细地址
   formId: string
   supplierName: string
   supplierNo: string