diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index df7ef20..ce83b27 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -1,45 +1,64 @@
 import request from '../index'
-const prefix = 'resource/customer'
+const prefix = 'resource/customer/suggestForm'
 
-export function getSuggestFormList(data: any) {
+export function getFormList(data: any) {
   return request({
-    url: `${prefix}/suggestForm/approval/listPage?limit=${data.limit}&offset=${data.offset}`,
+    url: `${prefix}/approval/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
 }
 
-// 保存 草稿箱
-export function saveSuggestForm(data: object) {
+// 查询待处理列表
+export function getFormToBeHandleList(data: any) {
   return request({
-    url: `${prefix}/suggestForm/save`,
+    url: `${prefix}/handle/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出
+export function exportList(data: object) {
+  return request({
+    url: `${prefix}/listExport`,
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+
+// 保存 草稿箱
+export function saveForm(data: object) {
+  return request({
+    url: `${prefix}/save`,
     method: 'post',
     data,
   })
 }
 
 // 删除 草稿箱
-export function deleteSuggestFormDraft(data: object) {
+export function deleteFormDraft(data: object) {
   return request({
-    url: `${prefix}/suggestForm/draftDelete`,
+    url: `${prefix}/draftDelete`,
     method: 'post',
     data,
   })
 }
 
 // 删除 已取消
-export function deleteSuggestFormRevoked(data: object) {
+export function deleteFormRevoked(data: object) {
   return request({
-    url: `${prefix}/suggestForm/approval/delete`,
+    url: `${prefix}/approval/delete`,
     method: 'post',
     data,
   })
 }
 
 // 提交流程
-export function submitSuggestForm(data: object) {
+export function submitForm(data: object) {
   return request({
-    url: `${prefix}/suggestForm/submit`,
+    url: `${prefix}/submit`,
     method: 'post',
     data,
   })
@@ -48,7 +67,7 @@
 // 发起者撤回，表单状态更改为已取消
 export function revokeApproval(data: object) {
   return request({
-    url: `${prefix}/suggestForm/approval/revoke`,
+    url: `${prefix}/approval/revoke`,
     method: 'post',
     data,
   })
@@ -57,25 +76,43 @@
 // 委托方名录审批-拒绝
 export function refuseApproval(data: object) {
   return request({
-    url: `${prefix}/suggestForm/approval/refuse`,
+    url: `${prefix}/approval/refuse`,
     method: 'post',
     data,
   })
 }
 
 // 草稿箱编辑（不走流程审批）
-export function updateDraftSuggest(data: object) {
+export function updateDraft(data: object) {
   return request({
-    url: `${prefix}/suggestForm/draftUpdate`,
+    url: `${prefix}/draftUpdate`,
     method: 'post',
     data,
   })
 }
 
 // 未通过委托方编辑（重走流程审批）
-export function failUpdateSuggest(data: object) {
+export function failUpdate(data: object) {
   return request({
-    url: `${prefix}/suggestForm/failUpdate`,
+    url: `${prefix}/failUpdate`,
+    method: 'post',
+    data,
+  })
+}
+
+// 受理意见登记表
+export function acceptForm(data: object) {
+  return request({
+    url: `${prefix}/acceptance`,
+    method: 'post',
+    data,
+  })
+}
+
+// 实施人员退回到管理组
+export function rejectAcceptedForm(data: object) {
+  return request({
+    url: `${prefix}/reject`,
     method: 'post',
     data,
   })

diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index df7ef20..ce83b27 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -1,45 +1,64 @@
 import request from '../index'
-const prefix = 'resource/customer'
+const prefix = 'resource/customer/suggestForm'
 
-export function getSuggestFormList(data: any) {
+export function getFormList(data: any) {
   return request({
-    url: `${prefix}/suggestForm/approval/listPage?limit=${data.limit}&offset=${data.offset}`,
+    url: `${prefix}/approval/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
 }
 
-// 保存 草稿箱
-export function saveSuggestForm(data: object) {
+// 查询待处理列表
+export function getFormToBeHandleList(data: any) {
   return request({
-    url: `${prefix}/suggestForm/save`,
+    url: `${prefix}/handle/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出
+export function exportList(data: object) {
+  return request({
+    url: `${prefix}/listExport`,
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+
+// 保存 草稿箱
+export function saveForm(data: object) {
+  return request({
+    url: `${prefix}/save`,
     method: 'post',
     data,
   })
 }
 
 // 删除 草稿箱
-export function deleteSuggestFormDraft(data: object) {
+export function deleteFormDraft(data: object) {
   return request({
-    url: `${prefix}/suggestForm/draftDelete`,
+    url: `${prefix}/draftDelete`,
     method: 'post',
     data,
   })
 }
 
 // 删除 已取消
-export function deleteSuggestFormRevoked(data: object) {
+export function deleteFormRevoked(data: object) {
   return request({
-    url: `${prefix}/suggestForm/approval/delete`,
+    url: `${prefix}/approval/delete`,
     method: 'post',
     data,
   })
 }
 
 // 提交流程
-export function submitSuggestForm(data: object) {
+export function submitForm(data: object) {
   return request({
-    url: `${prefix}/suggestForm/submit`,
+    url: `${prefix}/submit`,
     method: 'post',
     data,
   })
@@ -48,7 +67,7 @@
 // 发起者撤回，表单状态更改为已取消
 export function revokeApproval(data: object) {
   return request({
-    url: `${prefix}/suggestForm/approval/revoke`,
+    url: `${prefix}/approval/revoke`,
     method: 'post',
     data,
   })
@@ -57,25 +76,43 @@
 // 委托方名录审批-拒绝
 export function refuseApproval(data: object) {
   return request({
-    url: `${prefix}/suggestForm/approval/refuse`,
+    url: `${prefix}/approval/refuse`,
     method: 'post',
     data,
   })
 }
 
 // 草稿箱编辑（不走流程审批）
-export function updateDraftSuggest(data: object) {
+export function updateDraft(data: object) {
   return request({
-    url: `${prefix}/suggestForm/draftUpdate`,
+    url: `${prefix}/draftUpdate`,
     method: 'post',
     data,
   })
 }
 
 // 未通过委托方编辑（重走流程审批）
-export function failUpdateSuggest(data: object) {
+export function failUpdate(data: object) {
   return request({
-    url: `${prefix}/suggestForm/failUpdate`,
+    url: `${prefix}/failUpdate`,
+    method: 'post',
+    data,
+  })
+}
+
+// 受理意见登记表
+export function acceptForm(data: object) {
+  return request({
+    url: `${prefix}/acceptance`,
+    method: 'post',
+    data,
+  })
+}
+
+// 实施人员退回到管理组
+export function rejectAcceptedForm(data: object) {
+  return request({
+    url: `${prefix}/reject`,
     method: 'post',
     data,
   })
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index d3a5e80..eaf221c 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -90,3 +90,10 @@
   })
 }
 
+export function getDept(params?: { deptId?: string }) {
+  return request({
+    url: '/system/dept/listPage',
+    method: 'get',
+    params,
+  })
+}

diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index df7ef20..ce83b27 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -1,45 +1,64 @@
 import request from '../index'
-const prefix = 'resource/customer'
+const prefix = 'resource/customer/suggestForm'
 
-export function getSuggestFormList(data: any) {
+export function getFormList(data: any) {
   return request({
-    url: `${prefix}/suggestForm/approval/listPage?limit=${data.limit}&offset=${data.offset}`,
+    url: `${prefix}/approval/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
 }
 
-// 保存 草稿箱
-export function saveSuggestForm(data: object) {
+// 查询待处理列表
+export function getFormToBeHandleList(data: any) {
   return request({
-    url: `${prefix}/suggestForm/save`,
+    url: `${prefix}/handle/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出
+export function exportList(data: object) {
+  return request({
+    url: `${prefix}/listExport`,
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+
+// 保存 草稿箱
+export function saveForm(data: object) {
+  return request({
+    url: `${prefix}/save`,
     method: 'post',
     data,
   })
 }
 
 // 删除 草稿箱
-export function deleteSuggestFormDraft(data: object) {
+export function deleteFormDraft(data: object) {
   return request({
-    url: `${prefix}/suggestForm/draftDelete`,
+    url: `${prefix}/draftDelete`,
     method: 'post',
     data,
   })
 }
 
 // 删除 已取消
-export function deleteSuggestFormRevoked(data: object) {
+export function deleteFormRevoked(data: object) {
   return request({
-    url: `${prefix}/suggestForm/approval/delete`,
+    url: `${prefix}/approval/delete`,
     method: 'post',
     data,
   })
 }
 
 // 提交流程
-export function submitSuggestForm(data: object) {
+export function submitForm(data: object) {
   return request({
-    url: `${prefix}/suggestForm/submit`,
+    url: `${prefix}/submit`,
     method: 'post',
     data,
   })
@@ -48,7 +67,7 @@
 // 发起者撤回，表单状态更改为已取消
 export function revokeApproval(data: object) {
   return request({
-    url: `${prefix}/suggestForm/approval/revoke`,
+    url: `${prefix}/approval/revoke`,
     method: 'post',
     data,
   })
@@ -57,25 +76,43 @@
 // 委托方名录审批-拒绝
 export function refuseApproval(data: object) {
   return request({
-    url: `${prefix}/suggestForm/approval/refuse`,
+    url: `${prefix}/approval/refuse`,
     method: 'post',
     data,
   })
 }
 
 // 草稿箱编辑（不走流程审批）
-export function updateDraftSuggest(data: object) {
+export function updateDraft(data: object) {
   return request({
-    url: `${prefix}/suggestForm/draftUpdate`,
+    url: `${prefix}/draftUpdate`,
     method: 'post',
     data,
   })
 }
 
 // 未通过委托方编辑（重走流程审批）
-export function failUpdateSuggest(data: object) {
+export function failUpdate(data: object) {
   return request({
-    url: `${prefix}/suggestForm/failUpdate`,
+    url: `${prefix}/failUpdate`,
+    method: 'post',
+    data,
+  })
+}
+
+// 受理意见登记表
+export function acceptForm(data: object) {
+  return request({
+    url: `${prefix}/acceptance`,
+    method: 'post',
+    data,
+  })
+}
+
+// 实施人员退回到管理组
+export function rejectAcceptedForm(data: object) {
+  return request({
+    url: `${prefix}/reject`,
     method: 'post',
     data,
   })
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index d3a5e80..eaf221c 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -90,3 +90,10 @@
   })
 }
 
+export function getDept(params?: { deptId?: string }) {
+  return request({
+    url: '/system/dept/listPage',
+    method: 'get',
+    params,
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 9a33674..a884b89 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -3,7 +3,7 @@
 import type { Ref } from 'vue'
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
 import useDictStore from '@/store/modules/dict'
-import { getAllDeptList, getDeptTreeList } from '@/api/system/dept'
+import { getAllDeptList, getDept, getDeptTreeList } from '@/api/system/dept'
 import { judgeTree, toTreeList } from '@/utils/structure'
 const props = defineProps({
   // 数据绑定
@@ -47,6 +47,10 @@
     type: Boolean,
     default: false,
   },
+  needSelf: { // 是否需要包括自己 与是否需要pid配合使用
+    type: Boolean,
+    default: false,
+  },
 })
 const emit = defineEmits(['update:modelValue', 'change'])
 // ------------------------------定义props参数---------------------------------------------
@@ -73,13 +77,30 @@
 }
 const showDeptSelect = ref(true)
 const dictStore = useDictStore()
-function fetchPcode() {
+async function fetchPcode() {
   // 如果未指定需要展示的部门类型，获取全部部门
   if (!props.deptType) {
     // if (dictStore.allDeptList.length === 0) { // 如果store中未存储，从服务器上获取
     if (props.needPid) {
+      const list: any = []
+      if (props.needSelf == true) {
+        // 包括自己
+        await getDept({ deptId: props.pid }).then((res) => {
+          if (res.code === 200 && res.data.total > 0) {
+            list.push({
+              id: res.data.list[0].id,
+              name: res.data.list[0].fullName,
+              pid: res.data.list[0].pid,
+            })
+          }
+        })
+      }
+
+      // 查询子部门
       getAllDeptList({ pid: props.pid }).then((res) => {
-        const list = res.data
+        res.data.forEach((item: any) => {
+          list.push(item)
+        })
         dictStore.setAllDeptList(list)
         refreshList(list)
       })
@@ -91,17 +112,28 @@
         refreshList(list)
       })
     }
-
-    // }
-    // else {
-    // refreshList(dictStore.allDeptList)
-    // }
   }
   else { // 如果指定了需要展示的部门类型
     // if (dictStore.companyList.length === 0) { // 如果store中未存储，从服务器上获取
     if (props.needPid) {
+      const list: any = []
+
+      if (props.needSelf == true) {
+        // 包括自己
+        await getDept({ deptId: props.pid }).then((res) => {
+          if (res.code === 200 && res.data.total > 0) {
+            list.push({
+              id: res.data.list[0].id,
+              name: res.data.list[0].fullName,
+              pid: res.data.list[0].pid,
+            })
+          }
+        })
+      }
       getAllDeptList({ pid: props.pid }).then((res) => {
-        const list = res.data
+        res.data.forEach((item: any) => {
+          list.push(item)
+        })
         dictStore.setAllDeptList(list)
         refreshList(list)
       })
@@ -113,11 +145,6 @@
         refreshList(list)
       })
     }
-
-    // }
-    // else {
-    // refreshList(dictStore.companyList)
-    // }
   }
 }
 function refreshList(list: DeptTreeNode[]) {

diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index df7ef20..ce83b27 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -1,45 +1,64 @@
 import request from '../index'
-const prefix = 'resource/customer'
+const prefix = 'resource/customer/suggestForm'
 
-export function getSuggestFormList(data: any) {
+export function getFormList(data: any) {
   return request({
-    url: `${prefix}/suggestForm/approval/listPage?limit=${data.limit}&offset=${data.offset}`,
+    url: `${prefix}/approval/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
 }
 
-// 保存 草稿箱
-export function saveSuggestForm(data: object) {
+// 查询待处理列表
+export function getFormToBeHandleList(data: any) {
   return request({
-    url: `${prefix}/suggestForm/save`,
+    url: `${prefix}/handle/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出
+export function exportList(data: object) {
+  return request({
+    url: `${prefix}/listExport`,
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+
+// 保存 草稿箱
+export function saveForm(data: object) {
+  return request({
+    url: `${prefix}/save`,
     method: 'post',
     data,
   })
 }
 
 // 删除 草稿箱
-export function deleteSuggestFormDraft(data: object) {
+export function deleteFormDraft(data: object) {
   return request({
-    url: `${prefix}/suggestForm/draftDelete`,
+    url: `${prefix}/draftDelete`,
     method: 'post',
     data,
   })
 }
 
 // 删除 已取消
-export function deleteSuggestFormRevoked(data: object) {
+export function deleteFormRevoked(data: object) {
   return request({
-    url: `${prefix}/suggestForm/approval/delete`,
+    url: `${prefix}/approval/delete`,
     method: 'post',
     data,
   })
 }
 
 // 提交流程
-export function submitSuggestForm(data: object) {
+export function submitForm(data: object) {
   return request({
-    url: `${prefix}/suggestForm/submit`,
+    url: `${prefix}/submit`,
     method: 'post',
     data,
   })
@@ -48,7 +67,7 @@
 // 发起者撤回，表单状态更改为已取消
 export function revokeApproval(data: object) {
   return request({
-    url: `${prefix}/suggestForm/approval/revoke`,
+    url: `${prefix}/approval/revoke`,
     method: 'post',
     data,
   })
@@ -57,25 +76,43 @@
 // 委托方名录审批-拒绝
 export function refuseApproval(data: object) {
   return request({
-    url: `${prefix}/suggestForm/approval/refuse`,
+    url: `${prefix}/approval/refuse`,
     method: 'post',
     data,
   })
 }
 
 // 草稿箱编辑（不走流程审批）
-export function updateDraftSuggest(data: object) {
+export function updateDraft(data: object) {
   return request({
-    url: `${prefix}/suggestForm/draftUpdate`,
+    url: `${prefix}/draftUpdate`,
     method: 'post',
     data,
   })
 }
 
 // 未通过委托方编辑（重走流程审批）
-export function failUpdateSuggest(data: object) {
+export function failUpdate(data: object) {
   return request({
-    url: `${prefix}/suggestForm/failUpdate`,
+    url: `${prefix}/failUpdate`,
+    method: 'post',
+    data,
+  })
+}
+
+// 受理意见登记表
+export function acceptForm(data: object) {
+  return request({
+    url: `${prefix}/acceptance`,
+    method: 'post',
+    data,
+  })
+}
+
+// 实施人员退回到管理组
+export function rejectAcceptedForm(data: object) {
+  return request({
+    url: `${prefix}/reject`,
     method: 'post',
     data,
   })
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index d3a5e80..eaf221c 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -90,3 +90,10 @@
   })
 }
 
+export function getDept(params?: { deptId?: string }) {
+  return request({
+    url: '/system/dept/listPage',
+    method: 'get',
+    params,
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 9a33674..a884b89 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -3,7 +3,7 @@
 import type { Ref } from 'vue'
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
 import useDictStore from '@/store/modules/dict'
-import { getAllDeptList, getDeptTreeList } from '@/api/system/dept'
+import { getAllDeptList, getDept, getDeptTreeList } from '@/api/system/dept'
 import { judgeTree, toTreeList } from '@/utils/structure'
 const props = defineProps({
   // 数据绑定
@@ -47,6 +47,10 @@
     type: Boolean,
     default: false,
   },
+  needSelf: { // 是否需要包括自己 与是否需要pid配合使用
+    type: Boolean,
+    default: false,
+  },
 })
 const emit = defineEmits(['update:modelValue', 'change'])
 // ------------------------------定义props参数---------------------------------------------
@@ -73,13 +77,30 @@
 }
 const showDeptSelect = ref(true)
 const dictStore = useDictStore()
-function fetchPcode() {
+async function fetchPcode() {
   // 如果未指定需要展示的部门类型，获取全部部门
   if (!props.deptType) {
     // if (dictStore.allDeptList.length === 0) { // 如果store中未存储，从服务器上获取
     if (props.needPid) {
+      const list: any = []
+      if (props.needSelf == true) {
+        // 包括自己
+        await getDept({ deptId: props.pid }).then((res) => {
+          if (res.code === 200 && res.data.total > 0) {
+            list.push({
+              id: res.data.list[0].id,
+              name: res.data.list[0].fullName,
+              pid: res.data.list[0].pid,
+            })
+          }
+        })
+      }
+
+      // 查询子部门
       getAllDeptList({ pid: props.pid }).then((res) => {
-        const list = res.data
+        res.data.forEach((item: any) => {
+          list.push(item)
+        })
         dictStore.setAllDeptList(list)
         refreshList(list)
       })
@@ -91,17 +112,28 @@
         refreshList(list)
       })
     }
-
-    // }
-    // else {
-    // refreshList(dictStore.allDeptList)
-    // }
   }
   else { // 如果指定了需要展示的部门类型
     // if (dictStore.companyList.length === 0) { // 如果store中未存储，从服务器上获取
     if (props.needPid) {
+      const list: any = []
+
+      if (props.needSelf == true) {
+        // 包括自己
+        await getDept({ deptId: props.pid }).then((res) => {
+          if (res.code === 200 && res.data.total > 0) {
+            list.push({
+              id: res.data.list[0].id,
+              name: res.data.list[0].fullName,
+              pid: res.data.list[0].pid,
+            })
+          }
+        })
+      }
       getAllDeptList({ pid: props.pid }).then((res) => {
-        const list = res.data
+        res.data.forEach((item: any) => {
+          list.push(item)
+        })
         dictStore.setAllDeptList(list)
         refreshList(list)
       })
@@ -113,11 +145,6 @@
         refreshList(list)
       })
     }
-
-    // }
-    // else {
-    // refreshList(dictStore.companyList)
-    // }
   }
 }
 function refreshList(list: DeptTreeNode[]) {
diff --git a/src/components/SearchArea/SearchItem.vue b/src/components/SearchArea/SearchItem.vue
index 185287a..82374e8 100644
--- a/src/components/SearchArea/SearchItem.vue
+++ b/src/components/SearchArea/SearchItem.vue
@@ -1,4 +1,11 @@
 <script lang="ts" setup name="searchItem">
+const props = defineProps({
+  width: {
+    type: String,
+    default: '',
+  },
+})
+
 const inputslot = ref<HTMLElement | null >(null)
 
 onMounted(() => {
@@ -11,7 +18,7 @@
 </script>
 
 <template>
-  <div ref="inputslot" class="search-item">
+  <div ref="inputslot" class="search-item" :style="{ width: props.width ? props.width : undefined }">
     <slot />
   </div>
 </template>

diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index df7ef20..ce83b27 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -1,45 +1,64 @@
 import request from '../index'
-const prefix = 'resource/customer'
+const prefix = 'resource/customer/suggestForm'
 
-export function getSuggestFormList(data: any) {
+export function getFormList(data: any) {
   return request({
-    url: `${prefix}/suggestForm/approval/listPage?limit=${data.limit}&offset=${data.offset}`,
+    url: `${prefix}/approval/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
 }
 
-// 保存 草稿箱
-export function saveSuggestForm(data: object) {
+// 查询待处理列表
+export function getFormToBeHandleList(data: any) {
   return request({
-    url: `${prefix}/suggestForm/save`,
+    url: `${prefix}/handle/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出
+export function exportList(data: object) {
+  return request({
+    url: `${prefix}/listExport`,
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+
+// 保存 草稿箱
+export function saveForm(data: object) {
+  return request({
+    url: `${prefix}/save`,
     method: 'post',
     data,
   })
 }
 
 // 删除 草稿箱
-export function deleteSuggestFormDraft(data: object) {
+export function deleteFormDraft(data: object) {
   return request({
-    url: `${prefix}/suggestForm/draftDelete`,
+    url: `${prefix}/draftDelete`,
     method: 'post',
     data,
   })
 }
 
 // 删除 已取消
-export function deleteSuggestFormRevoked(data: object) {
+export function deleteFormRevoked(data: object) {
   return request({
-    url: `${prefix}/suggestForm/approval/delete`,
+    url: `${prefix}/approval/delete`,
     method: 'post',
     data,
   })
 }
 
 // 提交流程
-export function submitSuggestForm(data: object) {
+export function submitForm(data: object) {
   return request({
-    url: `${prefix}/suggestForm/submit`,
+    url: `${prefix}/submit`,
     method: 'post',
     data,
   })
@@ -48,7 +67,7 @@
 // 发起者撤回，表单状态更改为已取消
 export function revokeApproval(data: object) {
   return request({
-    url: `${prefix}/suggestForm/approval/revoke`,
+    url: `${prefix}/approval/revoke`,
     method: 'post',
     data,
   })
@@ -57,25 +76,43 @@
 // 委托方名录审批-拒绝
 export function refuseApproval(data: object) {
   return request({
-    url: `${prefix}/suggestForm/approval/refuse`,
+    url: `${prefix}/approval/refuse`,
     method: 'post',
     data,
   })
 }
 
 // 草稿箱编辑（不走流程审批）
-export function updateDraftSuggest(data: object) {
+export function updateDraft(data: object) {
   return request({
-    url: `${prefix}/suggestForm/draftUpdate`,
+    url: `${prefix}/draftUpdate`,
     method: 'post',
     data,
   })
 }
 
 // 未通过委托方编辑（重走流程审批）
-export function failUpdateSuggest(data: object) {
+export function failUpdate(data: object) {
   return request({
-    url: `${prefix}/suggestForm/failUpdate`,
+    url: `${prefix}/failUpdate`,
+    method: 'post',
+    data,
+  })
+}
+
+// 受理意见登记表
+export function acceptForm(data: object) {
+  return request({
+    url: `${prefix}/acceptance`,
+    method: 'post',
+    data,
+  })
+}
+
+// 实施人员退回到管理组
+export function rejectAcceptedForm(data: object) {
+  return request({
+    url: `${prefix}/reject`,
     method: 'post',
     data,
   })
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index d3a5e80..eaf221c 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -90,3 +90,10 @@
   })
 }
 
+export function getDept(params?: { deptId?: string }) {
+  return request({
+    url: '/system/dept/listPage',
+    method: 'get',
+    params,
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 9a33674..a884b89 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -3,7 +3,7 @@
 import type { Ref } from 'vue'
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
 import useDictStore from '@/store/modules/dict'
-import { getAllDeptList, getDeptTreeList } from '@/api/system/dept'
+import { getAllDeptList, getDept, getDeptTreeList } from '@/api/system/dept'
 import { judgeTree, toTreeList } from '@/utils/structure'
 const props = defineProps({
   // 数据绑定
@@ -47,6 +47,10 @@
     type: Boolean,
     default: false,
   },
+  needSelf: { // 是否需要包括自己 与是否需要pid配合使用
+    type: Boolean,
+    default: false,
+  },
 })
 const emit = defineEmits(['update:modelValue', 'change'])
 // ------------------------------定义props参数---------------------------------------------
@@ -73,13 +77,30 @@
 }
 const showDeptSelect = ref(true)
 const dictStore = useDictStore()
-function fetchPcode() {
+async function fetchPcode() {
   // 如果未指定需要展示的部门类型，获取全部部门
   if (!props.deptType) {
     // if (dictStore.allDeptList.length === 0) { // 如果store中未存储，从服务器上获取
     if (props.needPid) {
+      const list: any = []
+      if (props.needSelf == true) {
+        // 包括自己
+        await getDept({ deptId: props.pid }).then((res) => {
+          if (res.code === 200 && res.data.total > 0) {
+            list.push({
+              id: res.data.list[0].id,
+              name: res.data.list[0].fullName,
+              pid: res.data.list[0].pid,
+            })
+          }
+        })
+      }
+
+      // 查询子部门
       getAllDeptList({ pid: props.pid }).then((res) => {
-        const list = res.data
+        res.data.forEach((item: any) => {
+          list.push(item)
+        })
         dictStore.setAllDeptList(list)
         refreshList(list)
       })
@@ -91,17 +112,28 @@
         refreshList(list)
       })
     }
-
-    // }
-    // else {
-    // refreshList(dictStore.allDeptList)
-    // }
   }
   else { // 如果指定了需要展示的部门类型
     // if (dictStore.companyList.length === 0) { // 如果store中未存储，从服务器上获取
     if (props.needPid) {
+      const list: any = []
+
+      if (props.needSelf == true) {
+        // 包括自己
+        await getDept({ deptId: props.pid }).then((res) => {
+          if (res.code === 200 && res.data.total > 0) {
+            list.push({
+              id: res.data.list[0].id,
+              name: res.data.list[0].fullName,
+              pid: res.data.list[0].pid,
+            })
+          }
+        })
+      }
       getAllDeptList({ pid: props.pid }).then((res) => {
-        const list = res.data
+        res.data.forEach((item: any) => {
+          list.push(item)
+        })
         dictStore.setAllDeptList(list)
         refreshList(list)
       })
@@ -113,11 +145,6 @@
         refreshList(list)
       })
     }
-
-    // }
-    // else {
-    // refreshList(dictStore.companyList)
-    // }
   }
 }
 function refreshList(list: DeptTreeNode[]) {
diff --git a/src/components/SearchArea/SearchItem.vue b/src/components/SearchArea/SearchItem.vue
index 185287a..82374e8 100644
--- a/src/components/SearchArea/SearchItem.vue
+++ b/src/components/SearchArea/SearchItem.vue
@@ -1,4 +1,11 @@
 <script lang="ts" setup name="searchItem">
+const props = defineProps({
+  width: {
+    type: String,
+    default: '',
+  },
+})
+
 const inputslot = ref<HTMLElement | null >(null)
 
 onMounted(() => {
@@ -11,7 +18,7 @@
 </script>
 
 <template>
-  <div ref="inputslot" class="search-item">
+  <div ref="inputslot" class="search-item" :style="{ width: props.width ? props.width : undefined }">
     <slot />
   </div>
 </template>
diff --git a/src/views/resource/common/filterSysUser.vue b/src/views/resource/common/filterSysUser.vue
index b9bee7c..073838a 100644
--- a/src/views/resource/common/filterSysUser.vue
+++ b/src/views/resource/common/filterSysUser.vue
@@ -1,9 +1,17 @@
 <!-- 筛选系统用户弹窗 -->
 <script name="FilterSysUser" lang="ts" setup>
-import type { IlistQueryType } from '@/views/system/user/user-interface'
+import type { IlistQueryType, addInfo } from '@/views/system/user/user-interface'
 import { getUserList } from '@/api/system/user'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 
+const props = defineProps({
+  // 数据绑定
+  needPid: { // 是否需要pid去请求某个部门及下面的部门
+    type: Boolean,
+    default: true,
+  },
+})
+
 const emit = defineEmits(['recordSelected'])
 
 // 定义变量
@@ -18,7 +26,8 @@
   endTime: '',
   deptType: '',
 })
-const sysUserList = ref([])
+const pid = ref<string>('')
+const sysUserList = ref<Array<addInfo>>([])
 const total = ref<number>(0) // 数据总条数
 const columns = ref <Array<TableColumn>>([
   { text: '账号', value: 'account', align: 'center' },
@@ -46,11 +55,11 @@
   getSysUserList()
 }
 
-const selectSingleUser = (row: Object) => {
+const selectSingleUser = (row: addInfo) => {
   emit('recordSelected', row)
 }
 
-const showOrHideFilterDialog = (show: boolean) => {
+const showOrHideFilterDialog = (show: boolean, deptId = '') => {
   if (show === false) {
     searchQuery.keywords = ''
     searchQuery.deptId = ''
@@ -58,6 +67,8 @@
     searchQuery.limit = 10
   }
   else {
+    pid.value = deptId
+    searchQuery.deptId = deptId
     getSysUserList()
   }
 
@@ -76,7 +87,7 @@
         <el-input v-model="searchQuery.keywords" placeholder="姓名" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="searchQuery.deptId" pid="1712003809046552578" :need-pid="true" placeholder="工作部门" style="width: 100%;" />
+        <dept-select v-model="searchQuery.deptId" :need-pid="props.needPid" :need-self="true" :pid="pid" placeholder="工作部门" style="width: 100%;" />
       </search-item>
     </search-area>
 

diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index df7ef20..ce83b27 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -1,45 +1,64 @@
 import request from '../index'
-const prefix = 'resource/customer'
+const prefix = 'resource/customer/suggestForm'
 
-export function getSuggestFormList(data: any) {
+export function getFormList(data: any) {
   return request({
-    url: `${prefix}/suggestForm/approval/listPage?limit=${data.limit}&offset=${data.offset}`,
+    url: `${prefix}/approval/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
 }
 
-// 保存 草稿箱
-export function saveSuggestForm(data: object) {
+// 查询待处理列表
+export function getFormToBeHandleList(data: any) {
   return request({
-    url: `${prefix}/suggestForm/save`,
+    url: `${prefix}/handle/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出
+export function exportList(data: object) {
+  return request({
+    url: `${prefix}/listExport`,
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+
+// 保存 草稿箱
+export function saveForm(data: object) {
+  return request({
+    url: `${prefix}/save`,
     method: 'post',
     data,
   })
 }
 
 // 删除 草稿箱
-export function deleteSuggestFormDraft(data: object) {
+export function deleteFormDraft(data: object) {
   return request({
-    url: `${prefix}/suggestForm/draftDelete`,
+    url: `${prefix}/draftDelete`,
     method: 'post',
     data,
   })
 }
 
 // 删除 已取消
-export function deleteSuggestFormRevoked(data: object) {
+export function deleteFormRevoked(data: object) {
   return request({
-    url: `${prefix}/suggestForm/approval/delete`,
+    url: `${prefix}/approval/delete`,
     method: 'post',
     data,
   })
 }
 
 // 提交流程
-export function submitSuggestForm(data: object) {
+export function submitForm(data: object) {
   return request({
-    url: `${prefix}/suggestForm/submit`,
+    url: `${prefix}/submit`,
     method: 'post',
     data,
   })
@@ -48,7 +67,7 @@
 // 发起者撤回，表单状态更改为已取消
 export function revokeApproval(data: object) {
   return request({
-    url: `${prefix}/suggestForm/approval/revoke`,
+    url: `${prefix}/approval/revoke`,
     method: 'post',
     data,
   })
@@ -57,25 +76,43 @@
 // 委托方名录审批-拒绝
 export function refuseApproval(data: object) {
   return request({
-    url: `${prefix}/suggestForm/approval/refuse`,
+    url: `${prefix}/approval/refuse`,
     method: 'post',
     data,
   })
 }
 
 // 草稿箱编辑（不走流程审批）
-export function updateDraftSuggest(data: object) {
+export function updateDraft(data: object) {
   return request({
-    url: `${prefix}/suggestForm/draftUpdate`,
+    url: `${prefix}/draftUpdate`,
     method: 'post',
     data,
   })
 }
 
 // 未通过委托方编辑（重走流程审批）
-export function failUpdateSuggest(data: object) {
+export function failUpdate(data: object) {
   return request({
-    url: `${prefix}/suggestForm/failUpdate`,
+    url: `${prefix}/failUpdate`,
+    method: 'post',
+    data,
+  })
+}
+
+// 受理意见登记表
+export function acceptForm(data: object) {
+  return request({
+    url: `${prefix}/acceptance`,
+    method: 'post',
+    data,
+  })
+}
+
+// 实施人员退回到管理组
+export function rejectAcceptedForm(data: object) {
+  return request({
+    url: `${prefix}/reject`,
     method: 'post',
     data,
   })
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index d3a5e80..eaf221c 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -90,3 +90,10 @@
   })
 }
 
+export function getDept(params?: { deptId?: string }) {
+  return request({
+    url: '/system/dept/listPage',
+    method: 'get',
+    params,
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 9a33674..a884b89 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -3,7 +3,7 @@
 import type { Ref } from 'vue'
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
 import useDictStore from '@/store/modules/dict'
-import { getAllDeptList, getDeptTreeList } from '@/api/system/dept'
+import { getAllDeptList, getDept, getDeptTreeList } from '@/api/system/dept'
 import { judgeTree, toTreeList } from '@/utils/structure'
 const props = defineProps({
   // 数据绑定
@@ -47,6 +47,10 @@
     type: Boolean,
     default: false,
   },
+  needSelf: { // 是否需要包括自己 与是否需要pid配合使用
+    type: Boolean,
+    default: false,
+  },
 })
 const emit = defineEmits(['update:modelValue', 'change'])
 // ------------------------------定义props参数---------------------------------------------
@@ -73,13 +77,30 @@
 }
 const showDeptSelect = ref(true)
 const dictStore = useDictStore()
-function fetchPcode() {
+async function fetchPcode() {
   // 如果未指定需要展示的部门类型，获取全部部门
   if (!props.deptType) {
     // if (dictStore.allDeptList.length === 0) { // 如果store中未存储，从服务器上获取
     if (props.needPid) {
+      const list: any = []
+      if (props.needSelf == true) {
+        // 包括自己
+        await getDept({ deptId: props.pid }).then((res) => {
+          if (res.code === 200 && res.data.total > 0) {
+            list.push({
+              id: res.data.list[0].id,
+              name: res.data.list[0].fullName,
+              pid: res.data.list[0].pid,
+            })
+          }
+        })
+      }
+
+      // 查询子部门
       getAllDeptList({ pid: props.pid }).then((res) => {
-        const list = res.data
+        res.data.forEach((item: any) => {
+          list.push(item)
+        })
         dictStore.setAllDeptList(list)
         refreshList(list)
       })
@@ -91,17 +112,28 @@
         refreshList(list)
       })
     }
-
-    // }
-    // else {
-    // refreshList(dictStore.allDeptList)
-    // }
   }
   else { // 如果指定了需要展示的部门类型
     // if (dictStore.companyList.length === 0) { // 如果store中未存储，从服务器上获取
     if (props.needPid) {
+      const list: any = []
+
+      if (props.needSelf == true) {
+        // 包括自己
+        await getDept({ deptId: props.pid }).then((res) => {
+          if (res.code === 200 && res.data.total > 0) {
+            list.push({
+              id: res.data.list[0].id,
+              name: res.data.list[0].fullName,
+              pid: res.data.list[0].pid,
+            })
+          }
+        })
+      }
       getAllDeptList({ pid: props.pid }).then((res) => {
-        const list = res.data
+        res.data.forEach((item: any) => {
+          list.push(item)
+        })
         dictStore.setAllDeptList(list)
         refreshList(list)
       })
@@ -113,11 +145,6 @@
         refreshList(list)
       })
     }
-
-    // }
-    // else {
-    // refreshList(dictStore.companyList)
-    // }
   }
 }
 function refreshList(list: DeptTreeNode[]) {
diff --git a/src/components/SearchArea/SearchItem.vue b/src/components/SearchArea/SearchItem.vue
index 185287a..82374e8 100644
--- a/src/components/SearchArea/SearchItem.vue
+++ b/src/components/SearchArea/SearchItem.vue
@@ -1,4 +1,11 @@
 <script lang="ts" setup name="searchItem">
+const props = defineProps({
+  width: {
+    type: String,
+    default: '',
+  },
+})
+
 const inputslot = ref<HTMLElement | null >(null)
 
 onMounted(() => {
@@ -11,7 +18,7 @@
 </script>
 
 <template>
-  <div ref="inputslot" class="search-item">
+  <div ref="inputslot" class="search-item" :style="{ width: props.width ? props.width : undefined }">
     <slot />
   </div>
 </template>
diff --git a/src/views/resource/common/filterSysUser.vue b/src/views/resource/common/filterSysUser.vue
index b9bee7c..073838a 100644
--- a/src/views/resource/common/filterSysUser.vue
+++ b/src/views/resource/common/filterSysUser.vue
@@ -1,9 +1,17 @@
 <!-- 筛选系统用户弹窗 -->
 <script name="FilterSysUser" lang="ts" setup>
-import type { IlistQueryType } from '@/views/system/user/user-interface'
+import type { IlistQueryType, addInfo } from '@/views/system/user/user-interface'
 import { getUserList } from '@/api/system/user'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 
+const props = defineProps({
+  // 数据绑定
+  needPid: { // 是否需要pid去请求某个部门及下面的部门
+    type: Boolean,
+    default: true,
+  },
+})
+
 const emit = defineEmits(['recordSelected'])
 
 // 定义变量
@@ -18,7 +26,8 @@
   endTime: '',
   deptType: '',
 })
-const sysUserList = ref([])
+const pid = ref<string>('')
+const sysUserList = ref<Array<addInfo>>([])
 const total = ref<number>(0) // 数据总条数
 const columns = ref <Array<TableColumn>>([
   { text: '账号', value: 'account', align: 'center' },
@@ -46,11 +55,11 @@
   getSysUserList()
 }
 
-const selectSingleUser = (row: Object) => {
+const selectSingleUser = (row: addInfo) => {
   emit('recordSelected', row)
 }
 
-const showOrHideFilterDialog = (show: boolean) => {
+const showOrHideFilterDialog = (show: boolean, deptId = '') => {
   if (show === false) {
     searchQuery.keywords = ''
     searchQuery.deptId = ''
@@ -58,6 +67,8 @@
     searchQuery.limit = 10
   }
   else {
+    pid.value = deptId
+    searchQuery.deptId = deptId
     getSysUserList()
   }
 
@@ -76,7 +87,7 @@
         <el-input v-model="searchQuery.keywords" placeholder="姓名" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="searchQuery.deptId" pid="1712003809046552578" :need-pid="true" placeholder="工作部门" style="width: 100%;" />
+        <dept-select v-model="searchQuery.deptId" :need-pid="props.needPid" :need-self="true" :pid="pid" placeholder="工作部门" style="width: 100%;" />
       </search-item>
     </search-area>
 
diff --git a/src/views/resource/customer/suggestForm/customer-suggest.ts b/src/views/resource/customer/suggestForm/customer-suggest.ts
index 4e67e44..e309782 100644
--- a/src/views/resource/customer/suggestForm/customer-suggest.ts
+++ b/src/views/resource/customer/suggestForm/customer-suggest.ts
@@ -6,6 +6,8 @@
   createTimeStart: string
   createTimeEnd: string
   approvalStatus: string
+  handleStatus: string
+  labCode: string
   formId: string
   offset: number
   limit: number
@@ -13,6 +15,21 @@
   order?: string
 }
 
+export interface IHandleListQuery {
+  formNo: string
+  customerName: string
+  customerDeptName: string
+  createUserName: string
+  createTimeStart: string
+  createTimeEnd: string
+  handleStatus: string
+  labCode: string
+  offset: number
+  limit: number
+  sort?: string
+  order?: string
+}
+
 export interface ICustomerSuggestInfo {
   id?: string
   formNo: string
@@ -26,12 +43,19 @@
   labCodeName?: string
   approvalStatus?: string
   approvalStatusName?: string
-  appealUserId: string
+  handleStatus: string
+  handleStatusName?: string
+  acceptanceUserId?: string // 受理人
+  acceptanceUserName?: string
+  acceptanceTime?: string
+  appealUserId: string // 申诉人
   appealUserName: string
   processId: string
   taskId: string
   suggestContent: string
+  reasonAndConclusion: string
   remark: string
+  effectRemark?: string
   decisionItem?: string
   createUserId?: string
   createUserName?: string

diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index df7ef20..ce83b27 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -1,45 +1,64 @@
 import request from '../index'
-const prefix = 'resource/customer'
+const prefix = 'resource/customer/suggestForm'
 
-export function getSuggestFormList(data: any) {
+export function getFormList(data: any) {
   return request({
-    url: `${prefix}/suggestForm/approval/listPage?limit=${data.limit}&offset=${data.offset}`,
+    url: `${prefix}/approval/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
 }
 
-// 保存 草稿箱
-export function saveSuggestForm(data: object) {
+// 查询待处理列表
+export function getFormToBeHandleList(data: any) {
   return request({
-    url: `${prefix}/suggestForm/save`,
+    url: `${prefix}/handle/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出
+export function exportList(data: object) {
+  return request({
+    url: `${prefix}/listExport`,
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+
+// 保存 草稿箱
+export function saveForm(data: object) {
+  return request({
+    url: `${prefix}/save`,
     method: 'post',
     data,
   })
 }
 
 // 删除 草稿箱
-export function deleteSuggestFormDraft(data: object) {
+export function deleteFormDraft(data: object) {
   return request({
-    url: `${prefix}/suggestForm/draftDelete`,
+    url: `${prefix}/draftDelete`,
     method: 'post',
     data,
   })
 }
 
 // 删除 已取消
-export function deleteSuggestFormRevoked(data: object) {
+export function deleteFormRevoked(data: object) {
   return request({
-    url: `${prefix}/suggestForm/approval/delete`,
+    url: `${prefix}/approval/delete`,
     method: 'post',
     data,
   })
 }
 
 // 提交流程
-export function submitSuggestForm(data: object) {
+export function submitForm(data: object) {
   return request({
-    url: `${prefix}/suggestForm/submit`,
+    url: `${prefix}/submit`,
     method: 'post',
     data,
   })
@@ -48,7 +67,7 @@
 // 发起者撤回，表单状态更改为已取消
 export function revokeApproval(data: object) {
   return request({
-    url: `${prefix}/suggestForm/approval/revoke`,
+    url: `${prefix}/approval/revoke`,
     method: 'post',
     data,
   })
@@ -57,25 +76,43 @@
 // 委托方名录审批-拒绝
 export function refuseApproval(data: object) {
   return request({
-    url: `${prefix}/suggestForm/approval/refuse`,
+    url: `${prefix}/approval/refuse`,
     method: 'post',
     data,
   })
 }
 
 // 草稿箱编辑（不走流程审批）
-export function updateDraftSuggest(data: object) {
+export function updateDraft(data: object) {
   return request({
-    url: `${prefix}/suggestForm/draftUpdate`,
+    url: `${prefix}/draftUpdate`,
     method: 'post',
     data,
   })
 }
 
 // 未通过委托方编辑（重走流程审批）
-export function failUpdateSuggest(data: object) {
+export function failUpdate(data: object) {
   return request({
-    url: `${prefix}/suggestForm/failUpdate`,
+    url: `${prefix}/failUpdate`,
+    method: 'post',
+    data,
+  })
+}
+
+// 受理意见登记表
+export function acceptForm(data: object) {
+  return request({
+    url: `${prefix}/acceptance`,
+    method: 'post',
+    data,
+  })
+}
+
+// 实施人员退回到管理组
+export function rejectAcceptedForm(data: object) {
+  return request({
+    url: `${prefix}/reject`,
     method: 'post',
     data,
   })
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index d3a5e80..eaf221c 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -90,3 +90,10 @@
   })
 }
 
+export function getDept(params?: { deptId?: string }) {
+  return request({
+    url: '/system/dept/listPage',
+    method: 'get',
+    params,
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 9a33674..a884b89 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -3,7 +3,7 @@
 import type { Ref } from 'vue'
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
 import useDictStore from '@/store/modules/dict'
-import { getAllDeptList, getDeptTreeList } from '@/api/system/dept'
+import { getAllDeptList, getDept, getDeptTreeList } from '@/api/system/dept'
 import { judgeTree, toTreeList } from '@/utils/structure'
 const props = defineProps({
   // 数据绑定
@@ -47,6 +47,10 @@
     type: Boolean,
     default: false,
   },
+  needSelf: { // 是否需要包括自己 与是否需要pid配合使用
+    type: Boolean,
+    default: false,
+  },
 })
 const emit = defineEmits(['update:modelValue', 'change'])
 // ------------------------------定义props参数---------------------------------------------
@@ -73,13 +77,30 @@
 }
 const showDeptSelect = ref(true)
 const dictStore = useDictStore()
-function fetchPcode() {
+async function fetchPcode() {
   // 如果未指定需要展示的部门类型，获取全部部门
   if (!props.deptType) {
     // if (dictStore.allDeptList.length === 0) { // 如果store中未存储，从服务器上获取
     if (props.needPid) {
+      const list: any = []
+      if (props.needSelf == true) {
+        // 包括自己
+        await getDept({ deptId: props.pid }).then((res) => {
+          if (res.code === 200 && res.data.total > 0) {
+            list.push({
+              id: res.data.list[0].id,
+              name: res.data.list[0].fullName,
+              pid: res.data.list[0].pid,
+            })
+          }
+        })
+      }
+
+      // 查询子部门
       getAllDeptList({ pid: props.pid }).then((res) => {
-        const list = res.data
+        res.data.forEach((item: any) => {
+          list.push(item)
+        })
         dictStore.setAllDeptList(list)
         refreshList(list)
       })
@@ -91,17 +112,28 @@
         refreshList(list)
       })
     }
-
-    // }
-    // else {
-    // refreshList(dictStore.allDeptList)
-    // }
   }
   else { // 如果指定了需要展示的部门类型
     // if (dictStore.companyList.length === 0) { // 如果store中未存储，从服务器上获取
     if (props.needPid) {
+      const list: any = []
+
+      if (props.needSelf == true) {
+        // 包括自己
+        await getDept({ deptId: props.pid }).then((res) => {
+          if (res.code === 200 && res.data.total > 0) {
+            list.push({
+              id: res.data.list[0].id,
+              name: res.data.list[0].fullName,
+              pid: res.data.list[0].pid,
+            })
+          }
+        })
+      }
       getAllDeptList({ pid: props.pid }).then((res) => {
-        const list = res.data
+        res.data.forEach((item: any) => {
+          list.push(item)
+        })
         dictStore.setAllDeptList(list)
         refreshList(list)
       })
@@ -113,11 +145,6 @@
         refreshList(list)
       })
     }
-
-    // }
-    // else {
-    // refreshList(dictStore.companyList)
-    // }
   }
 }
 function refreshList(list: DeptTreeNode[]) {
diff --git a/src/components/SearchArea/SearchItem.vue b/src/components/SearchArea/SearchItem.vue
index 185287a..82374e8 100644
--- a/src/components/SearchArea/SearchItem.vue
+++ b/src/components/SearchArea/SearchItem.vue
@@ -1,4 +1,11 @@
 <script lang="ts" setup name="searchItem">
+const props = defineProps({
+  width: {
+    type: String,
+    default: '',
+  },
+})
+
 const inputslot = ref<HTMLElement | null >(null)
 
 onMounted(() => {
@@ -11,7 +18,7 @@
 </script>
 
 <template>
-  <div ref="inputslot" class="search-item">
+  <div ref="inputslot" class="search-item" :style="{ width: props.width ? props.width : undefined }">
     <slot />
   </div>
 </template>
diff --git a/src/views/resource/common/filterSysUser.vue b/src/views/resource/common/filterSysUser.vue
index b9bee7c..073838a 100644
--- a/src/views/resource/common/filterSysUser.vue
+++ b/src/views/resource/common/filterSysUser.vue
@@ -1,9 +1,17 @@
 <!-- 筛选系统用户弹窗 -->
 <script name="FilterSysUser" lang="ts" setup>
-import type { IlistQueryType } from '@/views/system/user/user-interface'
+import type { IlistQueryType, addInfo } from '@/views/system/user/user-interface'
 import { getUserList } from '@/api/system/user'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 
+const props = defineProps({
+  // 数据绑定
+  needPid: { // 是否需要pid去请求某个部门及下面的部门
+    type: Boolean,
+    default: true,
+  },
+})
+
 const emit = defineEmits(['recordSelected'])
 
 // 定义变量
@@ -18,7 +26,8 @@
   endTime: '',
   deptType: '',
 })
-const sysUserList = ref([])
+const pid = ref<string>('')
+const sysUserList = ref<Array<addInfo>>([])
 const total = ref<number>(0) // 数据总条数
 const columns = ref <Array<TableColumn>>([
   { text: '账号', value: 'account', align: 'center' },
@@ -46,11 +55,11 @@
   getSysUserList()
 }
 
-const selectSingleUser = (row: Object) => {
+const selectSingleUser = (row: addInfo) => {
   emit('recordSelected', row)
 }
 
-const showOrHideFilterDialog = (show: boolean) => {
+const showOrHideFilterDialog = (show: boolean, deptId = '') => {
   if (show === false) {
     searchQuery.keywords = ''
     searchQuery.deptId = ''
@@ -58,6 +67,8 @@
     searchQuery.limit = 10
   }
   else {
+    pid.value = deptId
+    searchQuery.deptId = deptId
     getSysUserList()
   }
 
@@ -76,7 +87,7 @@
         <el-input v-model="searchQuery.keywords" placeholder="姓名" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="searchQuery.deptId" pid="1712003809046552578" :need-pid="true" placeholder="工作部门" style="width: 100%;" />
+        <dept-select v-model="searchQuery.deptId" :need-pid="props.needPid" :need-self="true" :pid="pid" placeholder="工作部门" style="width: 100%;" />
       </search-item>
     </search-area>
 
diff --git a/src/views/resource/customer/suggestForm/customer-suggest.ts b/src/views/resource/customer/suggestForm/customer-suggest.ts
index 4e67e44..e309782 100644
--- a/src/views/resource/customer/suggestForm/customer-suggest.ts
+++ b/src/views/resource/customer/suggestForm/customer-suggest.ts
@@ -6,6 +6,8 @@
   createTimeStart: string
   createTimeEnd: string
   approvalStatus: string
+  handleStatus: string
+  labCode: string
   formId: string
   offset: number
   limit: number
@@ -13,6 +15,21 @@
   order?: string
 }
 
+export interface IHandleListQuery {
+  formNo: string
+  customerName: string
+  customerDeptName: string
+  createUserName: string
+  createTimeStart: string
+  createTimeEnd: string
+  handleStatus: string
+  labCode: string
+  offset: number
+  limit: number
+  sort?: string
+  order?: string
+}
+
 export interface ICustomerSuggestInfo {
   id?: string
   formNo: string
@@ -26,12 +43,19 @@
   labCodeName?: string
   approvalStatus?: string
   approvalStatusName?: string
-  appealUserId: string
+  handleStatus: string
+  handleStatusName?: string
+  acceptanceUserId?: string // 受理人
+  acceptanceUserName?: string
+  acceptanceTime?: string
+  appealUserId: string // 申诉人
   appealUserName: string
   processId: string
   taskId: string
   suggestContent: string
+  reasonAndConclusion: string
   remark: string
+  effectRemark?: string
   decisionItem?: string
   createUserId?: string
   createUserName?: string
diff --git a/src/views/resource/customer/suggestForm/detail.vue b/src/views/resource/customer/suggestForm/detail.vue
index 5a315ea..9cf373e 100644
--- a/src/views/resource/customer/suggestForm/detail.vue
+++ b/src/views/resource/customer/suggestForm/detail.vue
@@ -1,17 +1,16 @@
 <!-- 委托方意见登记表详情 -->
 <script name="SuggestFormDetail" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
-import type { ICustomerInfo } from '../info/customer-info'
 import type { ICustomerSuggestInfo } from './customer-suggest'
 import type { IDictType } from '@/commonInterface/resource-interface'
-import type { DeptInfo } from '@/views/system/dept/dept-interface'
-import FilterCustomer from '@/views/resource/common/filterCustomer.vue'
-import FilterCustomerDept from '@/views/resource/common/filterCustomerDept.vue'
+import type { addInfo } from '@/views/system/user/user-interface'
+import FilterSysUser from '@/views/resource/common/filterSysUser.vue'
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
-import { deleteSuggestFormRevoked, failUpdateSuggest, refuseApproval, revokeApproval, saveSuggestForm, submitSuggestForm, updateDraftSuggest } from '@/api/resource/suggestForm'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { acceptForm, deleteFormRevoked, failUpdate, refuseApproval, rejectAcceptedForm, revokeApproval, saveForm, submitForm, updateDraft } from '@/api/resource/suggestForm'
 
 // 从路由中传过来的参数
 const type = ref<string>('')
@@ -21,7 +20,7 @@
 // 关键字段是否可以编辑
 const keyFieldsDisable = ref<boolean>(true)
 
-const flowFormId = 'zyglwtfyjdjb' // 资源管理 - 委托方意见登记表
+const flowFormId = SCHEDULE.CUSTOMER_OPINION_REGISTER_APPROVAL // 资源管理 - 委托方意见登记表
 
 const userInfo = useUserStore()
 const route = useRoute()
@@ -39,15 +38,10 @@
 // 弹窗子组件
 const apprDial = ref()
 const suggestFormRef = ref()
-const refCustomerFilter = ref()
-const refCustomerDeptFilter = ref()
+const refSysUserFilter = ref()
 
 const suggestFormRules = ref({
-  labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  appealUserName: [{ required: true, message: '申诉人不能为空', trigger: 'blur' }],
-  customerId: [{ required: true, message: '意见反馈单位不能为空，请选择', trigger: ['change', 'blur'] }],
-  customerDeptId: [{ required: true, message: '意见反馈部门不能为空，请选择', trigger: ['change', 'blur'] }],
-  suggestContent: [{ required: true, message: '意见内容不能为空', trigger: 'blur' }],
+  reasonAndConclusion: [{ required: true, message: '原因及结论不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -57,6 +51,8 @@
 const cancelButtVisable = ref<boolean>(false) // 是否显示 取消 按钮
 const deleteButtVisable = ref<boolean>(false) // 是否显示 删除 按钮
 const editButtVisable = ref<boolean>(false) // 是否显示 编辑 按钮
+const acceptButtVisable = ref<boolean>(false) // 是否显示 受理 按钮
+const rejectButtVisable = ref<boolean>(false) // 是否显示 退回 按钮
 
 const suggestInfo = ref<ICustomerSuggestInfo>({
   id: '',
@@ -69,19 +65,24 @@
   customerDeptPid: '',
   labCode: '',
   labCodeName: '',
+  handleStatus: '',
   appealUserId: '',
   appealUserName: '',
+  acceptanceUserId: '',
+  acceptanceUserName: '',
+  acceptanceTime: '',
   processId: '',
   taskId: '',
   createTime: '',
   createUserId: '',
   createUserName: '',
   suggestContent: '',
+  reasonAndConclusion: '',
   remark: '',
 })
 
 // 字典值
-const labCodeDict = ref<IDictType[]>([])
+const meterDeptDict = ref<Array<IDictType>>([])
 
 // 逻辑
 // 详情页的各个tab切换操作
@@ -105,6 +106,8 @@
   cancelButtVisable.value = false
   deleteButtVisable.value = false
   editButtVisable.value = false
+  acceptButtVisable.value = false
+  rejectButtVisable.value = false
 }
 
 // 根据审批状态显示对应的流程操作按钮
@@ -137,6 +140,22 @@
       deleteButtVisable.value = true
       break
 
+    case '11':
+      // 待处理：受理 退回 保存 提交按钮可见
+      if (suggestInfo.value.handleStatus === '0') {
+        // 未处置状态下 可以受理 只可选择受理人不可编辑字段
+        acceptButtVisable.value = true
+        keyFieldsDisable.value = true
+      }
+      else {
+        // 处置中状态下可以退回管理组 保存及提交
+        saveButtVisable.value = true
+        submitButtVisable.value = true
+        rejectButtVisable.value = true
+        keyFieldsDisable.value = false
+      }
+      break
+
     default:
       // 默认不显示所有的操作按钮
       hideAllOpterationButtons()
@@ -147,23 +166,21 @@
 // 关闭
 const resetForm = () => {
   sessionStorage.removeItem('suggestFormInfo') // 返回列表时 将缓存中的数据删除
+  sessionStorage.removeItem('bizMeterStationDeptId')
   router.go(-1)
 }
 
 // 保存至草稿箱
 const saveSuggestInfo = () => {
-  suggestInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 创建时间改为提交时间
-  saveSuggestForm(suggestInfo.value).then((res) => {
+  saveForm({
+    id: suggestInfo.value.id,
+    reasonAndConclusion: suggestInfo.value.reasonAndConclusion,
+    effectRemark: suggestInfo.value.effectRemark,
+  }).then((res) => {
     if (res.code === 200) {
       // 提示保存成功
       ElMessage.success('保存成功')
-      // 设置返回的委托方id和委托方编号
-      suggestInfo.value.formNo = res.data.formNo
-      suggestInfo.value.id = res.data.id
-      id.value = res.data.id
-
-      type.value = 'update'
-      status.value = '1' // 保存成功后进入草稿箱 为了不显示审批详情
+      submitButtVisable.value = true // 保存成功后显示提交按钮
     }
     else {
       // 提示失败信息
@@ -174,7 +191,7 @@
 
 // 编辑草稿箱（不走流程审批）
 const updateSuggestInfo = () => {
-  updateDraftSuggest(suggestInfo.value).then((res) => {
+  updateDraft(suggestInfo.value).then((res) => {
     if (res.code === 200) {
       // 提示保存成功
       ElMessage.success('保存成功')
@@ -189,11 +206,12 @@
 // 编辑按钮点击事件处理函数
 const editClickedHandler = () => {
   type.value = 'update'
-  title.value = '计量测试站授权（代理）委托书（编辑）'
+  title.value = '委托方意见登记表（编辑）'
 
   // 隐藏编辑按钮 显示提交按钮
   editButtVisable.value = false
   submitButtVisable.value = true
+  keyFieldsDisable.value = false
 }
 
 // 新建时保存后的处理 获取返回的id
@@ -222,41 +240,104 @@
   })
 }
 
+// 受理
+const acceptFormHandler = () => {
+  refSysUserFilter.value.showOrHideFilterDialog(true, meterDeptDict.value[0].value)
+}
+
+// 选择实施人
+const effectUserSelectedHanler = (user: addInfo) => {
+  refSysUserFilter.value.showOrHideFilterDialog(false)
+
+  ElMessageBox.confirm(`是否由 ${user.name} 受理委托方意见登记表`, '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+  // 调用接口
+    acceptForm({ effectUserId: user.id, effectUserName: user.name, id: suggestInfo.value.id }).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success(`委托方意见登记表 ${suggestInfo.value.formNo} 受理成功`)
+
+        // 更新表单
+        suggestInfo.value.acceptanceTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+        suggestInfo.value.acceptanceUserName = userInfo.name
+        acceptButtVisable.value = false
+
+        resetForm()
+      }
+      else {
+        ElMessage.error(`委托方意见登记表 ${suggestInfo.value.formNo} 受理失败`)
+      }
+    })
+  })
+}
+
+// 退回管理组
+const rejectFormHandler = async () => {
+  ElMessageBox.confirm('是否退回到管理组', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    rejectAcceptedForm({ id: suggestInfo.value.id }).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success(`委托方意见登记表 ${suggestInfo.value.formNo} 回退到管理组成功`)
+      }
+      else {
+        ElMessage.error(`委托方意见登记表 ${suggestInfo.value.formNo} 回退到管理组失败`)
+      }
+    })
+
+    resetForm()
+  })
+}
+
 // 提交按钮
 const submitButtonHandler = async () => {
-  if (suggestInfo.value === null || suggestInfo.value.processId === undefined || suggestInfo.value.processId === '') {
-    // 流程id为空 表示还未进入流程中 直接提交
-    ElMessageBox.confirm(`是否提交意见登记表 ${suggestInfo.value.formNo}`, '提示', {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    }).then(() => {
-      submitSuggestForm({
-        formId: flowFormId,
-        id: suggestInfo.value.id,
-      }).then((res) => {
-        if (res.code === 200) {
-          ElMessage.success(`意见登记表 ${suggestInfo.value.formNo} 提交成功`)
+  await suggestFormRef.value.validate((valid: boolean) => {
+    if (valid === true) {
+      if (suggestInfo.value === null || suggestInfo.value.processId === undefined || suggestInfo.value.processId === '') {
+        // 流程id为空 表示还未进入流程中 直接提交
+        ElMessageBox.confirm(`是否提交意见登记表 ${suggestInfo.value.formNo}`, '提示', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          saveForm({
+            id: suggestInfo.value.id,
+            reasonAndConclusion: suggestInfo.value.reasonAndConclusion,
+            effectRemark: suggestInfo.value.effectRemark,
+          }).then((res) => {
+            if (res.code === 200) {
+              submitForm({
+                formId: flowFormId,
+                id: suggestInfo.value.id,
+              }).then((res) => {
+                if (res.code === 200) {
+                  ElMessage.success(`意见登记表 ${suggestInfo.value.formNo} 提交成功`)
 
-          type.value = 'detail'
-          hideAllOpterationButtons()
-        }
-        else {
-          ElMessage.error(`意见登记表 ${suggestInfo.value.formNo} 提交失败：${res.message}`)
-        }
-      })
-    })
-  }
-  else {
-    // 之前已经在流程中的表单 保存提交
-    await suggestFormRef.value.validate((valid: boolean) => {
-      if (valid === true) {
-        failUpdateSuggest(suggestInfo.value).then((res) => {
+                  type.value = 'detail'
+                  keyFieldsDisable.value = true
+                  hideAllOpterationButtons()
+                }
+                else {
+                  ElMessage.error(`意见登记表 ${suggestInfo.value.formNo} 提交失败：${res.message}`)
+                }
+              })
+            }
+          })
+        })
+      }
+      else {
+        // 之前已经在流程中的表单 保存提交
+        failUpdate(suggestInfo.value).then((res) => {
           if (res.code === 200) {
           // 提示保存成功
             ElMessage.success(`意见登记表 ${suggestInfo.value.formNo} 提交成功`)
 
             type.value = 'detail'
+            keyFieldsDisable.value = true
             hideAllOpterationButtons()
           }
           else {
@@ -265,8 +346,8 @@
           }
         })
       }
-    })
-  }
+    }
+  })
 }
 
 // 流程审批-同意
@@ -295,7 +376,7 @@
       type: 'warning',
     },
   ).then(() => {
-    deleteSuggestFormRevoked({ id: suggestInfo.value.id, taskId: suggestInfo.value.taskId }).then((res) => {
+    deleteFormRevoked({ id: suggestInfo.value.id, taskId: suggestInfo.value.taskId }).then((res) => {
       if (res.code === 200) {
         ElMessage.success(`意见登记表 ${suggestInfo.value.formNo} 删除成功`)
         resetForm()
@@ -318,7 +399,7 @@
 }
 
 // 取消
-const noteRevokeHandler = (param: any) => {
+const formRevokeHandler = (param: any) => {
   revokeApproval(param).then((res) => {
     if (res.code === 200) {
       ElMessage.success('流程取消成功')
@@ -334,7 +415,7 @@
 }
 
 // 拒绝
-const noteRefuseHandler = (param: any) => {
+const formRefuseHandler = (param: any) => {
   refuseApproval(param).then((res) => {
     if (res.code === 200) {
       ElMessage.success('拒绝审批完成')
@@ -349,60 +430,22 @@
   })
 }
 
-// 显示筛选委托方名录的弹窗
-const showFilterCustomer = () => {
-  refCustomerFilter.value.showOrHideFilterDialog(true)
-}
-
-// 选择委托方名录
-const customerSelectedHandler = (row: ICustomerInfo) => {
-  refCustomerFilter.value.showOrHideFilterDialog(false)
-
-  suggestInfo.value.customerId = row.id
-  suggestInfo.value.customerName = row.customerName
-  suggestInfo.value.customerDeptPid = row.deptId
-
-  // 清除下一级
-  suggestInfo.value.customerDeptId = ''
-  suggestInfo.value.customerDeptName = ''
-}
-
-// 显示筛选委托方部门树形结构的弹窗
-const showFilterCustomerDept = () => {
-  if (suggestInfo.value.customerDeptPid === '' || suggestInfo.value.customerId === '') {
-    ElMessage.warning('请先选择意见反馈单位')
+const getMeterDeptId = () => {
+  if (sessionStorage.getItem('bizMeterStationDeptId') !== null && sessionStorage.getItem('bizMeterStationDeptId') !== '') {
+    meterDeptDict.value = JSON.parse(sessionStorage.getItem('bizMeterStationDeptId')!)
   }
   else {
-    refCustomerDeptFilter.value.showOrHideFilterDialog(true, suggestInfo.value.customerDeptPid)
-  }
-}
-
-// 选择委托方部门
-const customerDeptSelectedHandler = (row: DeptInfo) => {
-  refCustomerDeptFilter.value.showOrHideFilterDialog(false)
-
-  suggestInfo.value.customerDeptId = row.id
-  suggestInfo.value.customerDeptName = row.simpleName
-}
-
-const getLabCodeDict = async () => {
-  // 先从缓存中获取
-  if (sessionStorage.getItem('bizLabCodeExceptAll') === null || sessionStorage.getItem('bizLabCodeExceptAll') === undefined) {
-    // 缓存中没有则调用接口查询
-    await getDictByCode('bizLabCode').then((res) => {
+    getDictByCode('bizMeterStationDeptId').then((res) => {
       if (res.code === 200) {
-        labCodeDict.value = res.data.filter((item: { name: string }) => item.name !== '全站')
-        sessionStorage.setItem('bizLabCodeExceptAll', JSON.stringify(labCodeDict.value)) // 放到缓存中
+        meterDeptDict.value = res.data
+        sessionStorage.setItem('bizMeterStationDeptId', JSON.stringify(res.data))
       }
     })
   }
-  else {
-    labCodeDict.value = JSON.parse(sessionStorage.getItem('bizLabCodeExceptAll')!)
-  }
 }
 
 const initDict = () => {
-  getLabCodeDict()
+  getMeterDeptId()
 }
 
 const initDialog = (params: any) => {
@@ -415,16 +458,14 @@
   current.value = radioItems.value[0].value
   currentLabel.value = radioItems.value[0].name
 
+  suggestInfo.value = JSON.parse(sessionStorage.getItem('suggestFormInfo')!)
+
   switch (params.type) {
     case 'create' :
       title.value = '委托方意见登记表（新增）'
       saveButtVisable.value = true
-      submitButtVisable.value = true
-
-      sessionStorage.removeItem('suggestFormInfo')
-      suggestInfo.value.createUserId = userInfo.id
-      suggestInfo.value.createUserName = userInfo.name
-      suggestInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
+      submitButtVisable.value = false // 首先隐藏提交按钮
+      rejectButtVisable.value = true
 
       keyFieldsDisable.value = false
 
@@ -432,19 +473,14 @@
     case 'update':
       title.value = '委托方意见登记表（编辑）'
 
-      suggestInfo.value = JSON.parse(sessionStorage.getItem('suggestFormInfo')!)
-
       // 判断显示哪些流程操作按钮
       showOperationButtonByStatus()
-      keyFieldsDisable.value = true
 
       break
     case 'detail':
       title.value = '委托方意见登记表'
       id.value = params.id
 
-      suggestInfo.value = JSON.parse(sessionStorage.getItem('suggestFormInfo')!)
-
       // 查看详情时所有的操作按钮都隐藏
       showOperationButtonByStatus()
       keyFieldsDisable.value = true
@@ -457,21 +493,6 @@
   }
 }
 
-// 监听 显示中文
-watch(() => suggestInfo.value.labCode, (newVal) => {
-  labCodeDict.value = JSON.parse(sessionStorage.getItem('bizLabCodeExceptAll')!)
-
-  if (labCodeDict.value.length > 0) {
-    const targetList = labCodeDict.value.filter(item => item.value === newVal)
-    if (targetList.length > 0) {
-      suggestInfo.value.labCodeName = targetList[0].name
-    }
-    else {
-      suggestInfo.value.labCodeName = ''
-    }
-  }
-})
-
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -496,12 +517,19 @@
             </el-button>
           </template>
 
-          <el-button v-if="submitButtVisable" :disabled="id === ''" type="primary" @click="submitButtonHandler">
+          <el-button v-if="acceptButtVisable" type="primary" @click="acceptFormHandler">
+            受理
+          </el-button>
+
+          <el-button v-if="submitButtVisable" type="primary" @click="submitButtonHandler">
             提交
           </el-button>
           <el-button v-if="saveButtVisable" type="primary" @click="saveButtonHandler">
             保存
           </el-button>
+          <el-button v-if="rejectButtVisable" type="danger" @click="rejectFormHandler">
+            退回
+          </el-button>
 
           <el-button v-if="deleteButtVisable" type="danger" @click="deleteClickedHandler">
             删除
@@ -523,37 +551,18 @@
           <el-row :gutter="24">
             <!-- 第一行 第一列 -->
             <el-col :span="6">
-              <el-form-item label="实验室代码" prop="labCode">
-                <el-select v-model="suggestInfo.labCode" placeholder="请选择实验室代码" :disabled="keyFieldsDisable" style="width: 100%;">
-                  <el-option v-for="dict in labCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
-                </el-select>
-                <el-input v-model="suggestInfo.labCodeName" type="hidden" />
+              <el-form-item label="文件编号">
+                <el-input v-model="suggestInfo.formNo" :disabled="true" />
               </el-form-item>
-              <el-form-item label="申诉人" prop="appealUserName">
-                <el-input v-model="suggestInfo.appealUserName" placeholder="请输入申诉人姓名" :disabled="type === 'detail'" />
-              </el-form-item>
-            </el-col>
 
-            <el-col :span="6">
-              <el-form-item label="登记表编号">
-                <el-input v-model="suggestInfo.formNo" placeholder="登记表编号，保存后自动生成" :disabled="true" />
-              </el-form-item>
               <el-form-item label="创建人">
                 <el-input v-model="suggestInfo.createUserName" :disabled="true" />
-                <el-input v-model="suggestInfo.createUserId" type="hidden" />
               </el-form-item>
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="意见反馈单位" prop="customerId">
-                <el-input v-model="suggestInfo.customerName" :disabled="true">
-                  <template #append>
-                    <el-button size="small" :disabled="type === 'detail'" @click="showFilterCustomer">
-                      选择
-                    </el-button>
-                  </template>
-                </el-input>
-                <el-input v-model="suggestInfo.customerId" type="hidden" />
+              <el-form-item label="意见反馈单位">
+                <el-input v-model="suggestInfo.customerName" :disabled="true" />
               </el-form-item>
 
               <el-form-item label="创建时间">
@@ -562,15 +571,22 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="意见反馈部门" prop="customerDeptId">
-                <el-input v-model="suggestInfo.customerDeptName" :disabled="true">
-                  <template #append>
-                    <el-button size="small" :disabled="type === 'detail'" @click="showFilterCustomerDept">
-                      选择
-                    </el-button>
-                  </template>
-                </el-input>
-                <el-input v-model="suggestInfo.customerDeptId" type="hidden" />
+              <el-form-item label="意见反馈部门">
+                <el-input v-model="suggestInfo.customerDeptName" :disabled="true" />
+              </el-form-item>
+
+              <el-form-item label="受理人">
+                <el-input v-model="suggestInfo.acceptanceUserName" :disabled="true" />
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="6">
+              <el-form-item label="意见对象">
+                <el-input v-model="suggestInfo.labCodeName" :disabled="true" />
+              </el-form-item>
+
+              <el-form-item label="受理时间">
+                <el-input v-model="suggestInfo.acceptanceTime" :disabled="true" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -581,8 +597,16 @@
         <detail-block title="">
           <el-row :gutter="24">
             <el-col :span="24">
-              <el-form-item label="意见内容" prop="suggestContent">
-                <el-input v-model="suggestInfo.suggestContent" placeholder="请填写意见内容" type="textarea" rows="5" :clearable="true" :disabled="type === 'detail'" />
+              <el-form-item label="意见内容">
+                <el-input v-model="suggestInfo.suggestContent" type="textarea" rows="5" :disabled="true" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="原因及结论" prop="reasonAndConclusion">
+                <el-input v-model="suggestInfo.reasonAndConclusion" type="textarea" rows="5" :clearable="true" :disabled="keyFieldsDisable" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -590,7 +614,7 @@
           <el-row :gutter="24">
             <el-col :span="24">
               <el-form-item label="备注">
-                <el-input v-model="suggestInfo.remark" placeholder="请填写备注信息" type="textarea" rows="3" :clearable="true" :disabled="type === 'detail'" />
+                <el-input v-model="suggestInfo.effectRemark" type="textarea" rows="3" :clearable="true" :disabled="keyFieldsDisable" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -601,14 +625,14 @@
     <approval-dialog
       ref="apprDial"
       @on-success="approvalSuccessHandler"
-      @on-refuse="noteRefuseHandler"
-      @on-revoke="noteRevokeHandler"
+      @on-refuse="formRefuseHandler"
+      @on-revoke="formRevokeHandler"
     />
 
-    <filter-customer ref="refCustomerFilter" @record-selected="customerSelectedHandler" />
-    <filter-customer-dept ref="refCustomerDeptFilter" @record-selected="customerDeptSelectedHandler" />
+    <filter-sys-user ref="refSysUserFilter" :need-pid="true" @record-selected="effectUserSelectedHanler" />
 
-    <template v-if="current === 'suggest-approval' && status !== '1'">
+    <!-- 草稿箱/待处理状态下不显示审批详情 -->
+    <template v-if="current === 'suggest-approval' && status !== '1' && status !== '11'">
       <approval-record-table :process-id="suggestInfo.processId" />
     </template>
   </app-container>

diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index df7ef20..ce83b27 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -1,45 +1,64 @@
 import request from '../index'
-const prefix = 'resource/customer'
+const prefix = 'resource/customer/suggestForm'
 
-export function getSuggestFormList(data: any) {
+export function getFormList(data: any) {
   return request({
-    url: `${prefix}/suggestForm/approval/listPage?limit=${data.limit}&offset=${data.offset}`,
+    url: `${prefix}/approval/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
 }
 
-// 保存 草稿箱
-export function saveSuggestForm(data: object) {
+// 查询待处理列表
+export function getFormToBeHandleList(data: any) {
   return request({
-    url: `${prefix}/suggestForm/save`,
+    url: `${prefix}/handle/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出
+export function exportList(data: object) {
+  return request({
+    url: `${prefix}/listExport`,
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+
+// 保存 草稿箱
+export function saveForm(data: object) {
+  return request({
+    url: `${prefix}/save`,
     method: 'post',
     data,
   })
 }
 
 // 删除 草稿箱
-export function deleteSuggestFormDraft(data: object) {
+export function deleteFormDraft(data: object) {
   return request({
-    url: `${prefix}/suggestForm/draftDelete`,
+    url: `${prefix}/draftDelete`,
     method: 'post',
     data,
   })
 }
 
 // 删除 已取消
-export function deleteSuggestFormRevoked(data: object) {
+export function deleteFormRevoked(data: object) {
   return request({
-    url: `${prefix}/suggestForm/approval/delete`,
+    url: `${prefix}/approval/delete`,
     method: 'post',
     data,
   })
 }
 
 // 提交流程
-export function submitSuggestForm(data: object) {
+export function submitForm(data: object) {
   return request({
-    url: `${prefix}/suggestForm/submit`,
+    url: `${prefix}/submit`,
     method: 'post',
     data,
   })
@@ -48,7 +67,7 @@
 // 发起者撤回，表单状态更改为已取消
 export function revokeApproval(data: object) {
   return request({
-    url: `${prefix}/suggestForm/approval/revoke`,
+    url: `${prefix}/approval/revoke`,
     method: 'post',
     data,
   })
@@ -57,25 +76,43 @@
 // 委托方名录审批-拒绝
 export function refuseApproval(data: object) {
   return request({
-    url: `${prefix}/suggestForm/approval/refuse`,
+    url: `${prefix}/approval/refuse`,
     method: 'post',
     data,
   })
 }
 
 // 草稿箱编辑（不走流程审批）
-export function updateDraftSuggest(data: object) {
+export function updateDraft(data: object) {
   return request({
-    url: `${prefix}/suggestForm/draftUpdate`,
+    url: `${prefix}/draftUpdate`,
     method: 'post',
     data,
   })
 }
 
 // 未通过委托方编辑（重走流程审批）
-export function failUpdateSuggest(data: object) {
+export function failUpdate(data: object) {
   return request({
-    url: `${prefix}/suggestForm/failUpdate`,
+    url: `${prefix}/failUpdate`,
+    method: 'post',
+    data,
+  })
+}
+
+// 受理意见登记表
+export function acceptForm(data: object) {
+  return request({
+    url: `${prefix}/acceptance`,
+    method: 'post',
+    data,
+  })
+}
+
+// 实施人员退回到管理组
+export function rejectAcceptedForm(data: object) {
+  return request({
+    url: `${prefix}/reject`,
     method: 'post',
     data,
   })
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index d3a5e80..eaf221c 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -90,3 +90,10 @@
   })
 }
 
+export function getDept(params?: { deptId?: string }) {
+  return request({
+    url: '/system/dept/listPage',
+    method: 'get',
+    params,
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 9a33674..a884b89 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -3,7 +3,7 @@
 import type { Ref } from 'vue'
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
 import useDictStore from '@/store/modules/dict'
-import { getAllDeptList, getDeptTreeList } from '@/api/system/dept'
+import { getAllDeptList, getDept, getDeptTreeList } from '@/api/system/dept'
 import { judgeTree, toTreeList } from '@/utils/structure'
 const props = defineProps({
   // 数据绑定
@@ -47,6 +47,10 @@
     type: Boolean,
     default: false,
   },
+  needSelf: { // 是否需要包括自己 与是否需要pid配合使用
+    type: Boolean,
+    default: false,
+  },
 })
 const emit = defineEmits(['update:modelValue', 'change'])
 // ------------------------------定义props参数---------------------------------------------
@@ -73,13 +77,30 @@
 }
 const showDeptSelect = ref(true)
 const dictStore = useDictStore()
-function fetchPcode() {
+async function fetchPcode() {
   // 如果未指定需要展示的部门类型，获取全部部门
   if (!props.deptType) {
     // if (dictStore.allDeptList.length === 0) { // 如果store中未存储，从服务器上获取
     if (props.needPid) {
+      const list: any = []
+      if (props.needSelf == true) {
+        // 包括自己
+        await getDept({ deptId: props.pid }).then((res) => {
+          if (res.code === 200 && res.data.total > 0) {
+            list.push({
+              id: res.data.list[0].id,
+              name: res.data.list[0].fullName,
+              pid: res.data.list[0].pid,
+            })
+          }
+        })
+      }
+
+      // 查询子部门
       getAllDeptList({ pid: props.pid }).then((res) => {
-        const list = res.data
+        res.data.forEach((item: any) => {
+          list.push(item)
+        })
         dictStore.setAllDeptList(list)
         refreshList(list)
       })
@@ -91,17 +112,28 @@
         refreshList(list)
       })
     }
-
-    // }
-    // else {
-    // refreshList(dictStore.allDeptList)
-    // }
   }
   else { // 如果指定了需要展示的部门类型
     // if (dictStore.companyList.length === 0) { // 如果store中未存储，从服务器上获取
     if (props.needPid) {
+      const list: any = []
+
+      if (props.needSelf == true) {
+        // 包括自己
+        await getDept({ deptId: props.pid }).then((res) => {
+          if (res.code === 200 && res.data.total > 0) {
+            list.push({
+              id: res.data.list[0].id,
+              name: res.data.list[0].fullName,
+              pid: res.data.list[0].pid,
+            })
+          }
+        })
+      }
       getAllDeptList({ pid: props.pid }).then((res) => {
-        const list = res.data
+        res.data.forEach((item: any) => {
+          list.push(item)
+        })
         dictStore.setAllDeptList(list)
         refreshList(list)
       })
@@ -113,11 +145,6 @@
         refreshList(list)
       })
     }
-
-    // }
-    // else {
-    // refreshList(dictStore.companyList)
-    // }
   }
 }
 function refreshList(list: DeptTreeNode[]) {
diff --git a/src/components/SearchArea/SearchItem.vue b/src/components/SearchArea/SearchItem.vue
index 185287a..82374e8 100644
--- a/src/components/SearchArea/SearchItem.vue
+++ b/src/components/SearchArea/SearchItem.vue
@@ -1,4 +1,11 @@
 <script lang="ts" setup name="searchItem">
+const props = defineProps({
+  width: {
+    type: String,
+    default: '',
+  },
+})
+
 const inputslot = ref<HTMLElement | null >(null)
 
 onMounted(() => {
@@ -11,7 +18,7 @@
 </script>
 
 <template>
-  <div ref="inputslot" class="search-item">
+  <div ref="inputslot" class="search-item" :style="{ width: props.width ? props.width : undefined }">
     <slot />
   </div>
 </template>
diff --git a/src/views/resource/common/filterSysUser.vue b/src/views/resource/common/filterSysUser.vue
index b9bee7c..073838a 100644
--- a/src/views/resource/common/filterSysUser.vue
+++ b/src/views/resource/common/filterSysUser.vue
@@ -1,9 +1,17 @@
 <!-- 筛选系统用户弹窗 -->
 <script name="FilterSysUser" lang="ts" setup>
-import type { IlistQueryType } from '@/views/system/user/user-interface'
+import type { IlistQueryType, addInfo } from '@/views/system/user/user-interface'
 import { getUserList } from '@/api/system/user'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 
+const props = defineProps({
+  // 数据绑定
+  needPid: { // 是否需要pid去请求某个部门及下面的部门
+    type: Boolean,
+    default: true,
+  },
+})
+
 const emit = defineEmits(['recordSelected'])
 
 // 定义变量
@@ -18,7 +26,8 @@
   endTime: '',
   deptType: '',
 })
-const sysUserList = ref([])
+const pid = ref<string>('')
+const sysUserList = ref<Array<addInfo>>([])
 const total = ref<number>(0) // 数据总条数
 const columns = ref <Array<TableColumn>>([
   { text: '账号', value: 'account', align: 'center' },
@@ -46,11 +55,11 @@
   getSysUserList()
 }
 
-const selectSingleUser = (row: Object) => {
+const selectSingleUser = (row: addInfo) => {
   emit('recordSelected', row)
 }
 
-const showOrHideFilterDialog = (show: boolean) => {
+const showOrHideFilterDialog = (show: boolean, deptId = '') => {
   if (show === false) {
     searchQuery.keywords = ''
     searchQuery.deptId = ''
@@ -58,6 +67,8 @@
     searchQuery.limit = 10
   }
   else {
+    pid.value = deptId
+    searchQuery.deptId = deptId
     getSysUserList()
   }
 
@@ -76,7 +87,7 @@
         <el-input v-model="searchQuery.keywords" placeholder="姓名" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="searchQuery.deptId" pid="1712003809046552578" :need-pid="true" placeholder="工作部门" style="width: 100%;" />
+        <dept-select v-model="searchQuery.deptId" :need-pid="props.needPid" :need-self="true" :pid="pid" placeholder="工作部门" style="width: 100%;" />
       </search-item>
     </search-area>
 
diff --git a/src/views/resource/customer/suggestForm/customer-suggest.ts b/src/views/resource/customer/suggestForm/customer-suggest.ts
index 4e67e44..e309782 100644
--- a/src/views/resource/customer/suggestForm/customer-suggest.ts
+++ b/src/views/resource/customer/suggestForm/customer-suggest.ts
@@ -6,6 +6,8 @@
   createTimeStart: string
   createTimeEnd: string
   approvalStatus: string
+  handleStatus: string
+  labCode: string
   formId: string
   offset: number
   limit: number
@@ -13,6 +15,21 @@
   order?: string
 }
 
+export interface IHandleListQuery {
+  formNo: string
+  customerName: string
+  customerDeptName: string
+  createUserName: string
+  createTimeStart: string
+  createTimeEnd: string
+  handleStatus: string
+  labCode: string
+  offset: number
+  limit: number
+  sort?: string
+  order?: string
+}
+
 export interface ICustomerSuggestInfo {
   id?: string
   formNo: string
@@ -26,12 +43,19 @@
   labCodeName?: string
   approvalStatus?: string
   approvalStatusName?: string
-  appealUserId: string
+  handleStatus: string
+  handleStatusName?: string
+  acceptanceUserId?: string // 受理人
+  acceptanceUserName?: string
+  acceptanceTime?: string
+  appealUserId: string // 申诉人
   appealUserName: string
   processId: string
   taskId: string
   suggestContent: string
+  reasonAndConclusion: string
   remark: string
+  effectRemark?: string
   decisionItem?: string
   createUserId?: string
   createUserName?: string
diff --git a/src/views/resource/customer/suggestForm/detail.vue b/src/views/resource/customer/suggestForm/detail.vue
index 5a315ea..9cf373e 100644
--- a/src/views/resource/customer/suggestForm/detail.vue
+++ b/src/views/resource/customer/suggestForm/detail.vue
@@ -1,17 +1,16 @@
 <!-- 委托方意见登记表详情 -->
 <script name="SuggestFormDetail" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
-import type { ICustomerInfo } from '../info/customer-info'
 import type { ICustomerSuggestInfo } from './customer-suggest'
 import type { IDictType } from '@/commonInterface/resource-interface'
-import type { DeptInfo } from '@/views/system/dept/dept-interface'
-import FilterCustomer from '@/views/resource/common/filterCustomer.vue'
-import FilterCustomerDept from '@/views/resource/common/filterCustomerDept.vue'
+import type { addInfo } from '@/views/system/user/user-interface'
+import FilterSysUser from '@/views/resource/common/filterSysUser.vue'
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
-import { deleteSuggestFormRevoked, failUpdateSuggest, refuseApproval, revokeApproval, saveSuggestForm, submitSuggestForm, updateDraftSuggest } from '@/api/resource/suggestForm'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { acceptForm, deleteFormRevoked, failUpdate, refuseApproval, rejectAcceptedForm, revokeApproval, saveForm, submitForm, updateDraft } from '@/api/resource/suggestForm'
 
 // 从路由中传过来的参数
 const type = ref<string>('')
@@ -21,7 +20,7 @@
 // 关键字段是否可以编辑
 const keyFieldsDisable = ref<boolean>(true)
 
-const flowFormId = 'zyglwtfyjdjb' // 资源管理 - 委托方意见登记表
+const flowFormId = SCHEDULE.CUSTOMER_OPINION_REGISTER_APPROVAL // 资源管理 - 委托方意见登记表
 
 const userInfo = useUserStore()
 const route = useRoute()
@@ -39,15 +38,10 @@
 // 弹窗子组件
 const apprDial = ref()
 const suggestFormRef = ref()
-const refCustomerFilter = ref()
-const refCustomerDeptFilter = ref()
+const refSysUserFilter = ref()
 
 const suggestFormRules = ref({
-  labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  appealUserName: [{ required: true, message: '申诉人不能为空', trigger: 'blur' }],
-  customerId: [{ required: true, message: '意见反馈单位不能为空，请选择', trigger: ['change', 'blur'] }],
-  customerDeptId: [{ required: true, message: '意见反馈部门不能为空，请选择', trigger: ['change', 'blur'] }],
-  suggestContent: [{ required: true, message: '意见内容不能为空', trigger: 'blur' }],
+  reasonAndConclusion: [{ required: true, message: '原因及结论不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -57,6 +51,8 @@
 const cancelButtVisable = ref<boolean>(false) // 是否显示 取消 按钮
 const deleteButtVisable = ref<boolean>(false) // 是否显示 删除 按钮
 const editButtVisable = ref<boolean>(false) // 是否显示 编辑 按钮
+const acceptButtVisable = ref<boolean>(false) // 是否显示 受理 按钮
+const rejectButtVisable = ref<boolean>(false) // 是否显示 退回 按钮
 
 const suggestInfo = ref<ICustomerSuggestInfo>({
   id: '',
@@ -69,19 +65,24 @@
   customerDeptPid: '',
   labCode: '',
   labCodeName: '',
+  handleStatus: '',
   appealUserId: '',
   appealUserName: '',
+  acceptanceUserId: '',
+  acceptanceUserName: '',
+  acceptanceTime: '',
   processId: '',
   taskId: '',
   createTime: '',
   createUserId: '',
   createUserName: '',
   suggestContent: '',
+  reasonAndConclusion: '',
   remark: '',
 })
 
 // 字典值
-const labCodeDict = ref<IDictType[]>([])
+const meterDeptDict = ref<Array<IDictType>>([])
 
 // 逻辑
 // 详情页的各个tab切换操作
@@ -105,6 +106,8 @@
   cancelButtVisable.value = false
   deleteButtVisable.value = false
   editButtVisable.value = false
+  acceptButtVisable.value = false
+  rejectButtVisable.value = false
 }
 
 // 根据审批状态显示对应的流程操作按钮
@@ -137,6 +140,22 @@
       deleteButtVisable.value = true
       break
 
+    case '11':
+      // 待处理：受理 退回 保存 提交按钮可见
+      if (suggestInfo.value.handleStatus === '0') {
+        // 未处置状态下 可以受理 只可选择受理人不可编辑字段
+        acceptButtVisable.value = true
+        keyFieldsDisable.value = true
+      }
+      else {
+        // 处置中状态下可以退回管理组 保存及提交
+        saveButtVisable.value = true
+        submitButtVisable.value = true
+        rejectButtVisable.value = true
+        keyFieldsDisable.value = false
+      }
+      break
+
     default:
       // 默认不显示所有的操作按钮
       hideAllOpterationButtons()
@@ -147,23 +166,21 @@
 // 关闭
 const resetForm = () => {
   sessionStorage.removeItem('suggestFormInfo') // 返回列表时 将缓存中的数据删除
+  sessionStorage.removeItem('bizMeterStationDeptId')
   router.go(-1)
 }
 
 // 保存至草稿箱
 const saveSuggestInfo = () => {
-  suggestInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 创建时间改为提交时间
-  saveSuggestForm(suggestInfo.value).then((res) => {
+  saveForm({
+    id: suggestInfo.value.id,
+    reasonAndConclusion: suggestInfo.value.reasonAndConclusion,
+    effectRemark: suggestInfo.value.effectRemark,
+  }).then((res) => {
     if (res.code === 200) {
       // 提示保存成功
       ElMessage.success('保存成功')
-      // 设置返回的委托方id和委托方编号
-      suggestInfo.value.formNo = res.data.formNo
-      suggestInfo.value.id = res.data.id
-      id.value = res.data.id
-
-      type.value = 'update'
-      status.value = '1' // 保存成功后进入草稿箱 为了不显示审批详情
+      submitButtVisable.value = true // 保存成功后显示提交按钮
     }
     else {
       // 提示失败信息
@@ -174,7 +191,7 @@
 
 // 编辑草稿箱（不走流程审批）
 const updateSuggestInfo = () => {
-  updateDraftSuggest(suggestInfo.value).then((res) => {
+  updateDraft(suggestInfo.value).then((res) => {
     if (res.code === 200) {
       // 提示保存成功
       ElMessage.success('保存成功')
@@ -189,11 +206,12 @@
 // 编辑按钮点击事件处理函数
 const editClickedHandler = () => {
   type.value = 'update'
-  title.value = '计量测试站授权（代理）委托书（编辑）'
+  title.value = '委托方意见登记表（编辑）'
 
   // 隐藏编辑按钮 显示提交按钮
   editButtVisable.value = false
   submitButtVisable.value = true
+  keyFieldsDisable.value = false
 }
 
 // 新建时保存后的处理 获取返回的id
@@ -222,41 +240,104 @@
   })
 }
 
+// 受理
+const acceptFormHandler = () => {
+  refSysUserFilter.value.showOrHideFilterDialog(true, meterDeptDict.value[0].value)
+}
+
+// 选择实施人
+const effectUserSelectedHanler = (user: addInfo) => {
+  refSysUserFilter.value.showOrHideFilterDialog(false)
+
+  ElMessageBox.confirm(`是否由 ${user.name} 受理委托方意见登记表`, '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+  // 调用接口
+    acceptForm({ effectUserId: user.id, effectUserName: user.name, id: suggestInfo.value.id }).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success(`委托方意见登记表 ${suggestInfo.value.formNo} 受理成功`)
+
+        // 更新表单
+        suggestInfo.value.acceptanceTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+        suggestInfo.value.acceptanceUserName = userInfo.name
+        acceptButtVisable.value = false
+
+        resetForm()
+      }
+      else {
+        ElMessage.error(`委托方意见登记表 ${suggestInfo.value.formNo} 受理失败`)
+      }
+    })
+  })
+}
+
+// 退回管理组
+const rejectFormHandler = async () => {
+  ElMessageBox.confirm('是否退回到管理组', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    rejectAcceptedForm({ id: suggestInfo.value.id }).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success(`委托方意见登记表 ${suggestInfo.value.formNo} 回退到管理组成功`)
+      }
+      else {
+        ElMessage.error(`委托方意见登记表 ${suggestInfo.value.formNo} 回退到管理组失败`)
+      }
+    })
+
+    resetForm()
+  })
+}
+
 // 提交按钮
 const submitButtonHandler = async () => {
-  if (suggestInfo.value === null || suggestInfo.value.processId === undefined || suggestInfo.value.processId === '') {
-    // 流程id为空 表示还未进入流程中 直接提交
-    ElMessageBox.confirm(`是否提交意见登记表 ${suggestInfo.value.formNo}`, '提示', {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    }).then(() => {
-      submitSuggestForm({
-        formId: flowFormId,
-        id: suggestInfo.value.id,
-      }).then((res) => {
-        if (res.code === 200) {
-          ElMessage.success(`意见登记表 ${suggestInfo.value.formNo} 提交成功`)
+  await suggestFormRef.value.validate((valid: boolean) => {
+    if (valid === true) {
+      if (suggestInfo.value === null || suggestInfo.value.processId === undefined || suggestInfo.value.processId === '') {
+        // 流程id为空 表示还未进入流程中 直接提交
+        ElMessageBox.confirm(`是否提交意见登记表 ${suggestInfo.value.formNo}`, '提示', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          saveForm({
+            id: suggestInfo.value.id,
+            reasonAndConclusion: suggestInfo.value.reasonAndConclusion,
+            effectRemark: suggestInfo.value.effectRemark,
+          }).then((res) => {
+            if (res.code === 200) {
+              submitForm({
+                formId: flowFormId,
+                id: suggestInfo.value.id,
+              }).then((res) => {
+                if (res.code === 200) {
+                  ElMessage.success(`意见登记表 ${suggestInfo.value.formNo} 提交成功`)
 
-          type.value = 'detail'
-          hideAllOpterationButtons()
-        }
-        else {
-          ElMessage.error(`意见登记表 ${suggestInfo.value.formNo} 提交失败：${res.message}`)
-        }
-      })
-    })
-  }
-  else {
-    // 之前已经在流程中的表单 保存提交
-    await suggestFormRef.value.validate((valid: boolean) => {
-      if (valid === true) {
-        failUpdateSuggest(suggestInfo.value).then((res) => {
+                  type.value = 'detail'
+                  keyFieldsDisable.value = true
+                  hideAllOpterationButtons()
+                }
+                else {
+                  ElMessage.error(`意见登记表 ${suggestInfo.value.formNo} 提交失败：${res.message}`)
+                }
+              })
+            }
+          })
+        })
+      }
+      else {
+        // 之前已经在流程中的表单 保存提交
+        failUpdate(suggestInfo.value).then((res) => {
           if (res.code === 200) {
           // 提示保存成功
             ElMessage.success(`意见登记表 ${suggestInfo.value.formNo} 提交成功`)
 
             type.value = 'detail'
+            keyFieldsDisable.value = true
             hideAllOpterationButtons()
           }
           else {
@@ -265,8 +346,8 @@
           }
         })
       }
-    })
-  }
+    }
+  })
 }
 
 // 流程审批-同意
@@ -295,7 +376,7 @@
       type: 'warning',
     },
   ).then(() => {
-    deleteSuggestFormRevoked({ id: suggestInfo.value.id, taskId: suggestInfo.value.taskId }).then((res) => {
+    deleteFormRevoked({ id: suggestInfo.value.id, taskId: suggestInfo.value.taskId }).then((res) => {
       if (res.code === 200) {
         ElMessage.success(`意见登记表 ${suggestInfo.value.formNo} 删除成功`)
         resetForm()
@@ -318,7 +399,7 @@
 }
 
 // 取消
-const noteRevokeHandler = (param: any) => {
+const formRevokeHandler = (param: any) => {
   revokeApproval(param).then((res) => {
     if (res.code === 200) {
       ElMessage.success('流程取消成功')
@@ -334,7 +415,7 @@
 }
 
 // 拒绝
-const noteRefuseHandler = (param: any) => {
+const formRefuseHandler = (param: any) => {
   refuseApproval(param).then((res) => {
     if (res.code === 200) {
       ElMessage.success('拒绝审批完成')
@@ -349,60 +430,22 @@
   })
 }
 
-// 显示筛选委托方名录的弹窗
-const showFilterCustomer = () => {
-  refCustomerFilter.value.showOrHideFilterDialog(true)
-}
-
-// 选择委托方名录
-const customerSelectedHandler = (row: ICustomerInfo) => {
-  refCustomerFilter.value.showOrHideFilterDialog(false)
-
-  suggestInfo.value.customerId = row.id
-  suggestInfo.value.customerName = row.customerName
-  suggestInfo.value.customerDeptPid = row.deptId
-
-  // 清除下一级
-  suggestInfo.value.customerDeptId = ''
-  suggestInfo.value.customerDeptName = ''
-}
-
-// 显示筛选委托方部门树形结构的弹窗
-const showFilterCustomerDept = () => {
-  if (suggestInfo.value.customerDeptPid === '' || suggestInfo.value.customerId === '') {
-    ElMessage.warning('请先选择意见反馈单位')
+const getMeterDeptId = () => {
+  if (sessionStorage.getItem('bizMeterStationDeptId') !== null && sessionStorage.getItem('bizMeterStationDeptId') !== '') {
+    meterDeptDict.value = JSON.parse(sessionStorage.getItem('bizMeterStationDeptId')!)
   }
   else {
-    refCustomerDeptFilter.value.showOrHideFilterDialog(true, suggestInfo.value.customerDeptPid)
-  }
-}
-
-// 选择委托方部门
-const customerDeptSelectedHandler = (row: DeptInfo) => {
-  refCustomerDeptFilter.value.showOrHideFilterDialog(false)
-
-  suggestInfo.value.customerDeptId = row.id
-  suggestInfo.value.customerDeptName = row.simpleName
-}
-
-const getLabCodeDict = async () => {
-  // 先从缓存中获取
-  if (sessionStorage.getItem('bizLabCodeExceptAll') === null || sessionStorage.getItem('bizLabCodeExceptAll') === undefined) {
-    // 缓存中没有则调用接口查询
-    await getDictByCode('bizLabCode').then((res) => {
+    getDictByCode('bizMeterStationDeptId').then((res) => {
       if (res.code === 200) {
-        labCodeDict.value = res.data.filter((item: { name: string }) => item.name !== '全站')
-        sessionStorage.setItem('bizLabCodeExceptAll', JSON.stringify(labCodeDict.value)) // 放到缓存中
+        meterDeptDict.value = res.data
+        sessionStorage.setItem('bizMeterStationDeptId', JSON.stringify(res.data))
       }
     })
   }
-  else {
-    labCodeDict.value = JSON.parse(sessionStorage.getItem('bizLabCodeExceptAll')!)
-  }
 }
 
 const initDict = () => {
-  getLabCodeDict()
+  getMeterDeptId()
 }
 
 const initDialog = (params: any) => {
@@ -415,16 +458,14 @@
   current.value = radioItems.value[0].value
   currentLabel.value = radioItems.value[0].name
 
+  suggestInfo.value = JSON.parse(sessionStorage.getItem('suggestFormInfo')!)
+
   switch (params.type) {
     case 'create' :
       title.value = '委托方意见登记表（新增）'
       saveButtVisable.value = true
-      submitButtVisable.value = true
-
-      sessionStorage.removeItem('suggestFormInfo')
-      suggestInfo.value.createUserId = userInfo.id
-      suggestInfo.value.createUserName = userInfo.name
-      suggestInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
+      submitButtVisable.value = false // 首先隐藏提交按钮
+      rejectButtVisable.value = true
 
       keyFieldsDisable.value = false
 
@@ -432,19 +473,14 @@
     case 'update':
       title.value = '委托方意见登记表（编辑）'
 
-      suggestInfo.value = JSON.parse(sessionStorage.getItem('suggestFormInfo')!)
-
       // 判断显示哪些流程操作按钮
       showOperationButtonByStatus()
-      keyFieldsDisable.value = true
 
       break
     case 'detail':
       title.value = '委托方意见登记表'
       id.value = params.id
 
-      suggestInfo.value = JSON.parse(sessionStorage.getItem('suggestFormInfo')!)
-
       // 查看详情时所有的操作按钮都隐藏
       showOperationButtonByStatus()
       keyFieldsDisable.value = true
@@ -457,21 +493,6 @@
   }
 }
 
-// 监听 显示中文
-watch(() => suggestInfo.value.labCode, (newVal) => {
-  labCodeDict.value = JSON.parse(sessionStorage.getItem('bizLabCodeExceptAll')!)
-
-  if (labCodeDict.value.length > 0) {
-    const targetList = labCodeDict.value.filter(item => item.value === newVal)
-    if (targetList.length > 0) {
-      suggestInfo.value.labCodeName = targetList[0].name
-    }
-    else {
-      suggestInfo.value.labCodeName = ''
-    }
-  }
-})
-
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -496,12 +517,19 @@
             </el-button>
           </template>
 
-          <el-button v-if="submitButtVisable" :disabled="id === ''" type="primary" @click="submitButtonHandler">
+          <el-button v-if="acceptButtVisable" type="primary" @click="acceptFormHandler">
+            受理
+          </el-button>
+
+          <el-button v-if="submitButtVisable" type="primary" @click="submitButtonHandler">
             提交
           </el-button>
           <el-button v-if="saveButtVisable" type="primary" @click="saveButtonHandler">
             保存
           </el-button>
+          <el-button v-if="rejectButtVisable" type="danger" @click="rejectFormHandler">
+            退回
+          </el-button>
 
           <el-button v-if="deleteButtVisable" type="danger" @click="deleteClickedHandler">
             删除
@@ -523,37 +551,18 @@
           <el-row :gutter="24">
             <!-- 第一行 第一列 -->
             <el-col :span="6">
-              <el-form-item label="实验室代码" prop="labCode">
-                <el-select v-model="suggestInfo.labCode" placeholder="请选择实验室代码" :disabled="keyFieldsDisable" style="width: 100%;">
-                  <el-option v-for="dict in labCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
-                </el-select>
-                <el-input v-model="suggestInfo.labCodeName" type="hidden" />
+              <el-form-item label="文件编号">
+                <el-input v-model="suggestInfo.formNo" :disabled="true" />
               </el-form-item>
-              <el-form-item label="申诉人" prop="appealUserName">
-                <el-input v-model="suggestInfo.appealUserName" placeholder="请输入申诉人姓名" :disabled="type === 'detail'" />
-              </el-form-item>
-            </el-col>
 
-            <el-col :span="6">
-              <el-form-item label="登记表编号">
-                <el-input v-model="suggestInfo.formNo" placeholder="登记表编号，保存后自动生成" :disabled="true" />
-              </el-form-item>
               <el-form-item label="创建人">
                 <el-input v-model="suggestInfo.createUserName" :disabled="true" />
-                <el-input v-model="suggestInfo.createUserId" type="hidden" />
               </el-form-item>
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="意见反馈单位" prop="customerId">
-                <el-input v-model="suggestInfo.customerName" :disabled="true">
-                  <template #append>
-                    <el-button size="small" :disabled="type === 'detail'" @click="showFilterCustomer">
-                      选择
-                    </el-button>
-                  </template>
-                </el-input>
-                <el-input v-model="suggestInfo.customerId" type="hidden" />
+              <el-form-item label="意见反馈单位">
+                <el-input v-model="suggestInfo.customerName" :disabled="true" />
               </el-form-item>
 
               <el-form-item label="创建时间">
@@ -562,15 +571,22 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="意见反馈部门" prop="customerDeptId">
-                <el-input v-model="suggestInfo.customerDeptName" :disabled="true">
-                  <template #append>
-                    <el-button size="small" :disabled="type === 'detail'" @click="showFilterCustomerDept">
-                      选择
-                    </el-button>
-                  </template>
-                </el-input>
-                <el-input v-model="suggestInfo.customerDeptId" type="hidden" />
+              <el-form-item label="意见反馈部门">
+                <el-input v-model="suggestInfo.customerDeptName" :disabled="true" />
+              </el-form-item>
+
+              <el-form-item label="受理人">
+                <el-input v-model="suggestInfo.acceptanceUserName" :disabled="true" />
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="6">
+              <el-form-item label="意见对象">
+                <el-input v-model="suggestInfo.labCodeName" :disabled="true" />
+              </el-form-item>
+
+              <el-form-item label="受理时间">
+                <el-input v-model="suggestInfo.acceptanceTime" :disabled="true" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -581,8 +597,16 @@
         <detail-block title="">
           <el-row :gutter="24">
             <el-col :span="24">
-              <el-form-item label="意见内容" prop="suggestContent">
-                <el-input v-model="suggestInfo.suggestContent" placeholder="请填写意见内容" type="textarea" rows="5" :clearable="true" :disabled="type === 'detail'" />
+              <el-form-item label="意见内容">
+                <el-input v-model="suggestInfo.suggestContent" type="textarea" rows="5" :disabled="true" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="原因及结论" prop="reasonAndConclusion">
+                <el-input v-model="suggestInfo.reasonAndConclusion" type="textarea" rows="5" :clearable="true" :disabled="keyFieldsDisable" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -590,7 +614,7 @@
           <el-row :gutter="24">
             <el-col :span="24">
               <el-form-item label="备注">
-                <el-input v-model="suggestInfo.remark" placeholder="请填写备注信息" type="textarea" rows="3" :clearable="true" :disabled="type === 'detail'" />
+                <el-input v-model="suggestInfo.effectRemark" type="textarea" rows="3" :clearable="true" :disabled="keyFieldsDisable" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -601,14 +625,14 @@
     <approval-dialog
       ref="apprDial"
       @on-success="approvalSuccessHandler"
-      @on-refuse="noteRefuseHandler"
-      @on-revoke="noteRevokeHandler"
+      @on-refuse="formRefuseHandler"
+      @on-revoke="formRevokeHandler"
     />
 
-    <filter-customer ref="refCustomerFilter" @record-selected="customerSelectedHandler" />
-    <filter-customer-dept ref="refCustomerDeptFilter" @record-selected="customerDeptSelectedHandler" />
+    <filter-sys-user ref="refSysUserFilter" :need-pid="true" @record-selected="effectUserSelectedHanler" />
 
-    <template v-if="current === 'suggest-approval' && status !== '1'">
+    <!-- 草稿箱/待处理状态下不显示审批详情 -->
+    <template v-if="current === 'suggest-approval' && status !== '1' && status !== '11'">
       <approval-record-table :process-id="suggestInfo.processId" />
     </template>
   </app-container>
diff --git a/src/views/resource/customer/suggestForm/list.vue b/src/views/resource/customer/suggestForm/list.vue
index 8292867..599837f 100644
--- a/src/views/resource/customer/suggestForm/list.vue
+++ b/src/views/resource/customer/suggestForm/list.vue
@@ -2,16 +2,19 @@
 <script name="SuggestFormList" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { DateModelType } from 'element-plus'
-import type{ ICustomerSuggestInfo, IListQuery } from './customer-suggest'
-import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import type{ ICustomerSuggestInfo, IHandleListQuery, IListQuery } from './customer-suggest'
+import type { IDictType } from '@/commonInterface/resource-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { deleteSuggestFormDraft, deleteSuggestFormRevoked, getSuggestFormList, refuseApproval, revokeApproval } from '@/api/resource/suggestForm'
-import { getDictByCode } from '@/api/system/dict'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
+import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import { deleteFormDraft, deleteFormRevoked, exportList, getFormList, getFormToBeHandleList, refuseApproval, revokeApproval } from '@/api/resource/suggestForm'
+import { getDictByCode } from '@/api/system/dict'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { exportFile } from '@/utils/exportUtils'
 
 // 定义常量
 const buttonBoxActive = 'suggestFormApproval' // 存储在sessionstorage里面的字段名，用于记录右上角buttonbox点击状态
-const flowFormId = 'zyglwtfyjdjb' // 资源管理 - 委托方意见登记表
+const flowFormId = SCHEDULE.CUSTOMER_OPINION_REGISTER_APPROVAL // 资源管理 - 委托方意见登记表
 
 const { proxy } = getCurrentInstance() as any
 const router = useRouter()
@@ -20,9 +23,12 @@
 const active = ref('')
 const menu = ref<IMenu[]>([]) // 审批状态按钮组合
 const approvalStatusList = ref<String[]>([
-  '全部', '已审批', '待审批', '审批', '草稿箱', '审批中', '已通过', '未通过', '已取消',
+  '全部', '待处理', '已审批', '待审批', '审批', '审批中', '已通过', '未通过', '已取消',
 ])
 
+const handleStatusDict = ref<Array<IDictType>>([])
+const labCodeDict = ref<Array<IDictType>>([])
+
 // 弹窗子组件
 const apprDial = ref()
 
@@ -35,6 +41,8 @@
   createTimeStart: '', // 创建时间-起始
   createTimeEnd: '', // 创建时间-结束
   approvalStatus: active.value, // 审批状态
+  labCode: '',
+  handleStatus: '',
   formId: flowFormId, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
   offset: 1,
   limit: 20,
@@ -43,15 +51,31 @@
 const total = ref(0) // 数据条数
 const loadingTable = ref(false) // 表格loading
 
+const handleSearchQuery = ref<IHandleListQuery>({
+  formNo: '', // 通知单编号
+  customerName: '',
+  customerDeptName: '',
+  createUserName: '', // 创建人名字
+  createTimeStart: '', // 创建时间-起始
+  createTimeEnd: '', // 创建时间-结束
+  labCode: '',
+  handleStatus: '',
+  offset: 1,
+  limit: 20,
+})
+
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '表单编号', value: 'formNo', align: 'center', width: '180' },
+  { text: '文件编号', value: 'formNo', align: 'center', width: '180' },
   { text: '意见反馈单位', value: 'customerName', align: 'center' },
   { text: '意见反馈部门', value: 'customerDeptName', align: 'center' },
+  { text: '意见对象', value: 'labCodeName', align: 'center' },
   { text: '创建人', value: 'createUserName', align: 'center', width: '150' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
+  { text: '处置情况', value: 'handleStatusName', align: 'center', width: '150' },
 ])
 const suggestList = ref<Array<ICustomerSuggestInfo>>([]) // 表格数据
+const suggestListSelected = ref<Array<ICustomerSuggestInfo>>([]) // 表格多选
 
 const reset = () => {
   searchQuery.value = {
@@ -61,6 +85,8 @@
     createUserName: '',
     createTimeStart: '', // 创建时间-起始
     createTimeEnd: '', // 创建时间-结束
+    labCode: '',
+    handleStatus: '',
     approvalStatus: active.value, // 审批状态
     formId: flowFormId, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
     offset: 1,
@@ -81,18 +107,37 @@
     // 是否显示当前页，否则跳转第一页
     searchQuery.value.offset = 1
   }
-  if (searchQuery.value.approvalStatus === '10') { searchQuery.value.approvalStatus = '' } // 审批状态不允许传字典要求传''
 
-  getSuggestFormList(searchQuery.value).then((response) => {
-    if (response.code === 200) {
-      suggestList.value = response.data.rows
-
-      total.value = parseInt(response.data.total)
+  const targetMenu = menu.value.filter((m) => { return m.id === active.value })
+  if (targetMenu.length > 0) {
+    if (targetMenu[0].name === '待处理') {
+      // 查询待处理
+      searchQuery.value.approvalStatus = ''
+      searchQuery.value.formId = ''
+      getFormToBeHandleList(handleSearchQuery.value).then((res) => {
+        if (res.code === 200) {
+          suggestList.value = res.data.rows
+          total.value = parseInt(res.data.total)
+        }
+        loadingTable.value = false
+      })
     }
-    loadingTable.value = false
-  }).catch(() => {
-    loadingTable.value = false
-  })
+    else {
+      // 查询其他审批流程
+      if (searchQuery.value.approvalStatus === '10') { searchQuery.value.approvalStatus = '' } // 审批状态不允许传字典要求传''
+
+      getFormList(searchQuery.value).then((response) => {
+        if (response.code === 200) {
+          suggestList.value = response.data.rows
+
+          total.value = parseInt(response.data.total)
+        }
+        loadingTable.value = false
+      }).catch(() => {
+        loadingTable.value = false
+      })
+    }
+  }
 }
 
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -106,13 +151,29 @@
   fetchData(true)
 }
 
-const addSuggestForm = () => {
-  router.push({
-    query: {
-      type: 'create',
-    },
-    path: 'suggestForm/detail',
+// 导出
+const batchExportSuggestForm = () => {
+  const ids: string[] = []
+  suggestListSelected.value.forEach((item: ICustomerSuggestInfo) => {
+    ids.push(item.id!)
   })
+
+  if (ids.length === 0) {
+    // 没有选择导出所有
+    exportList(searchQuery.value).then((res) => {
+      exportFile(res.data, `委托方意见登记表-${dayjs().format('YYYYMMDDHHmmss')}.xls`)
+    })
+  }
+  else {
+    exportList({ ids }).then((res) => {
+      exportFile(res.data, `委托方意见登记表-${dayjs().format('YYYYMMDDHHmmss')}.xls`)
+    })
+  }
+}
+
+// 多选改变
+const suggestSelected = (e: any) => {
+  suggestListSelected.value = e
 }
 
 const detail = (row: ICustomerSuggestInfo) => {
@@ -125,8 +186,18 @@
       path: 'suggestForm/approved/detail',
     })
   }
-  else if (active.value === '1') {
-    // 草稿箱 状态下的查看 可以编辑
+  else if (active.value === '11' && row.handleStatus === '1' && row.reasonAndConclusion === '') {
+    // 待处理时且未填写原因 表示为在实施人处 新建处置流程
+    sessionStorage.setItem('suggestFormInfo', JSON.stringify(row))
+    router.push({
+      query: {
+        type: 'create',
+      },
+      path: 'suggestForm/detail',
+    })
+  }
+  else if (active.value === '1' || active.value === '11') {
+    // 草稿箱或待处理可以编辑
     sessionStorage.setItem('suggestFormInfo', JSON.stringify(row))
     router.push({
       query: {
@@ -138,6 +209,7 @@
     })
   }
   else {
+  // 其余情况下只能查看
     sessionStorage.setItem('suggestFormInfo', JSON.stringify(row))
     router.push({
       query: {
@@ -163,7 +235,7 @@
   ).then(() => {
     if (active.value === '0' || active.value === '1') {
       // 全部 及 草稿箱 中删除
-      deleteSuggestFormDraft({ id: row.id }).then((res) => {
+      deleteFormDraft({ id: row.id }).then((res) => {
         if (res.code === 200) {
           ElMessage.success(`意见登记表 ${row.formNo} 删除成功`)
           fetchData(true)
@@ -175,7 +247,7 @@
     }
     else if (active.value === '6') {
       // 已取消 中删除
-      deleteSuggestFormRevoked({ id: row.id }).then((res) => {
+      deleteFormRevoked({ id: row.id }).then((res) => {
         if (res.code === 200) {
           ElMessage.success(`意见登记表 ${row.formNo} 删除成功`)
           fetchData(true)
@@ -217,7 +289,7 @@
 }
 
 // 取消
-const noteRevokeHandler = (param: any) => {
+const formRevokeHandler = (param: any) => {
   revokeApproval(param).then((res) => {
     if (res.code === 200) {
       ElMessage.success('流程取消成功')
@@ -233,7 +305,7 @@
 }
 
 // 拒绝
-const noteRefuseHandler = (param: any) => {
+const formRefuseHandler = (param: any) => {
   refuseApproval(param).then((res) => {
     if (res.code === 200) {
       ElMessage.success('拒绝审批完成')
@@ -265,8 +337,26 @@
   })
 }
 
+const getLabCodeDict = async () => {
+  getDictByCode('bizLabCode').then((res) => {
+    if (res.code === 200) {
+      labCodeDict.value = res.data
+    }
+  })
+}
+
+const getHandleStatusDict = async () => {
+  getDictByCode('handleStatus').then((res) => {
+    if (res.code === 200) {
+      handleStatusDict.value = res.data
+    }
+  })
+}
+
 const getDict = async () => {
   await getApprovalStatusDict()
+  await getLabCodeDict()
+  await getHandleStatusDict()
 }
 
 watch(dateRange, (val) => {
@@ -280,19 +370,6 @@
   }
 })
 
-watch(() => active.value, (val) => {
-  if (val === '10') { // 审批把审批状态加上
-    if (columns.value[columns.value.length - 1].value !== 'approvalStatusName') {
-      columns.value.push({ text: '审批状态', value: 'approvalStatusName', align: 'center' })
-    }
-  }
-  else { // 其他不显示审批状态
-    if (columns.value[columns.value.length - 1].value === 'approvalStatusName') {
-      columns.value.pop()
-    }
-  }
-}, { immediate: true })
-
 onMounted(async () => {
   await getDict()
   if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
@@ -308,28 +385,37 @@
   <app-container>
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="reset">
-      <search-item>
-        <el-input v-model="searchQuery.formNo" placeholder="登记表编号" clearable />
+      <search-item width="162px">
+        <el-input v-model="searchQuery.formNo" placeholder="文件编号" clearable />
       </search-item>
-      <search-item>
+      <search-item width="162px">
         <el-input v-model="searchQuery.customerName" placeholder="意见反馈单位" clearable />
       </search-item>
-      <search-item>
+      <search-item width="162px">
         <el-input v-model="searchQuery.customerDeptName" placeholder="意见反馈部门" clearable />
       </search-item>
-      <search-item>
+      <search-item width="162px">
+        <el-select v-model="searchQuery.labCode" placeholder="意见对象" clearable>
+          <el-option v-for="dict in labCodeDict" :key="dict.id" :value="dict.value" :label="dict.name" />
+        </el-select>
+      </search-item>
+      <search-item width="162px">
         <el-input v-model="searchQuery.createUserName" placeholder="创建人" clearable />
       </search-item>
       <search-item>
         <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
       </search-item>
+      <search-item width="162px">
+        <el-select v-model="searchQuery.handleStatus" placeholder="处置情况" clearable>
+          <el-option v-for="dict in handleStatusDict" :key="dict.id" :value="dict.value" :label="dict.name" />
+        </el-select>
+      </search-item>
     </search-area>
 
     <!-- 表格数据展示 -->
     <table-container>
-      <!-- 表头区域 -->
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/resource/customer/suggestForm/add') && active === '0'" icon="icon-add" title="新建" @click="addSuggestForm" />
+        <icon-button icon="icon-export" title="导出" @click="batchExportSuggestForm" />
       </template>
 
       <!-- 表格区域 -->
@@ -337,6 +423,7 @@
         :data="suggestList" :total="total" :columns="columns"
         :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
         :list-loading="loadingTable"
+        :is-showmulti-select="true" @multi-select="suggestSelected"
         @change="changePage"
       >
         <template #preColumns>
@@ -347,13 +434,14 @@
           </el-table-column>
         </template>
         <template #columns>
+          <el-table-column v-if="active === '10'" label="审批状态" align="center" width="100">
+            <template #default="{ row }">
+              {{ row.approvalStatusName }}
+            </template>
+          </el-table-column>
           <el-table-column fixed="right" label="操作" align="center" width="130">
             <template #default="{ row }">
-              <el-button v-if="active === '0'" size="small" type="primary" link @click="detail(row)">
-                查看
-              </el-button>
-
-              <el-button v-else size="small" type="primary" link @click="detail(row)">
+              <el-button size="small" type="primary" link @click="detail(row)">
                 查看
               </el-button>
 
@@ -384,8 +472,8 @@
     <approval-dialog
       ref="apprDial"
       @on-success="afterApprovalHandler"
-      @on-refuse="noteRefuseHandler"
-      @on-revoke="noteRevokeHandler"
+      @on-refuse="formRefuseHandler"
+      @on-revoke="formRevokeHandler"
     />
 
     <!-- 右上角按钮集合 -->