diff --git a/src/views/resource/customer/suggestForm/approvedDetail.vue b/src/views/resource/customer/suggestForm/approvedDetail.vue
index bfd6c1d..5ac027f 100644
--- a/src/views/resource/customer/suggestForm/approvedDetail.vue
+++ b/src/views/resource/customer/suggestForm/approvedDetail.vue
@@ -20,6 +20,16 @@
   ElMessage.success('打印成功')
 }
 
+// 打印Word
+const printToWord = () => {
+  // exportFile({ id: noticeInfo.value.id, pdf: false })
+}
+
+// 打印PDF
+const printToPDF = () => {
+
+}
+
 const initDialog = (params: any) => {
   // 从路由中获取参数
   id.value = params.id !== undefined ? params.id : ''

diff --git a/src/views/resource/customer/suggestForm/approvedDetail.vue b/src/views/resource/customer/suggestForm/approvedDetail.vue
index bfd6c1d..5ac027f 100644
--- a/src/views/resource/customer/suggestForm/approvedDetail.vue
+++ b/src/views/resource/customer/suggestForm/approvedDetail.vue
@@ -20,6 +20,16 @@
   ElMessage.success('打印成功')
 }
 
+// 打印Word
+const printToWord = () => {
+  // exportFile({ id: noticeInfo.value.id, pdf: false })
+}
+
+// 打印PDF
+const printToPDF = () => {
+
+}
+
 const initDialog = (params: any) => {
   // 从路由中获取参数
   id.value = params.id !== undefined ? params.id : ''
diff --git a/src/views/resource/customer/suggestForm/detail.vue b/src/views/resource/customer/suggestForm/detail.vue
index a3324f0..5a315ea 100644
--- a/src/views/resource/customer/suggestForm/detail.vue
+++ b/src/views/resource/customer/suggestForm/detail.vue
@@ -3,14 +3,15 @@
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerInfo } from '../info/customer-info'
 import type { ICustomerSuggestInfo } from './customer-suggest'
-import SuggestApprovalDialog from './suggestApprovalDialog.vue'
-import FilterCustomer from './filterCustomer.vue'
-import FilterCustomerDept from './filterCustomerDept.vue'
-import { getDictByCode } from '@/api/system/dict'
 import type { IDictType } from '@/commonInterface/resource-interface'
-import useUserStore from '@/store/modules/user'
-import { deleteSuggestFormRevoked, failUpdateSuggest, saveSuggestForm, submitSuggestForm, updateDraftSuggest } from '@/api/resource/suggestForm'
 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 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'
 
 // 从路由中传过来的参数
 const type = ref<string>('')
@@ -162,6 +163,7 @@
       id.value = res.data.id
 
       type.value = 'update'
+      status.value = '1' // 保存成功后进入草稿箱 为了不显示审批详情
     }
     else {
       // 提示失败信息
@@ -315,6 +317,38 @@
   }
 }
 
+// 取消
+const noteRevokeHandler = (param: any) => {
+  revokeApproval(param).then((res) => {
+    if (res.code === 200) {
+      ElMessage.success('流程取消成功')
+    }
+    else {
+      ElMessage.error(`流程取消失败：${res.message}`)
+    }
+    // 关闭弹窗
+    apprDial.value.handleClose()
+
+    cancelButtVisable.value = false
+  })
+}
+
+// 拒绝
+const noteRefuseHandler = (param: any) => {
+  refuseApproval(param).then((res) => {
+    if (res.code === 200) {
+      ElMessage.success('拒绝审批完成')
+    }
+    else {
+      ElMessage.error(`拒绝审批失败：${res.message}`)
+    }
+    // 关闭弹窗
+    apprDial.value.handleClose()
+
+    flowButtsVisable.value = false
+  })
+}
+
 // 显示筛选委托方名录的弹窗
 const showFilterCustomer = () => {
   refCustomerFilter.value.showOrHideFilterDialog(true)
@@ -505,25 +539,37 @@
                 <el-input v-model="suggestInfo.formNo" placeholder="登记表编号，保存后自动生成" :disabled="true" />
               </el-form-item>
               <el-form-item label="创建人">
-                <el-input v-model="suggestInfo.createUserName" :readonly="true" />
+                <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" :readonly="true" :disabled="type === 'detail'" @click="showFilterCustomer" />
+                <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>
 
               <el-form-item label="创建时间">
-                <el-input v-model="suggestInfo.createTime" :readonly="true" />
+                <el-input v-model="suggestInfo.createTime" :disabled="true" />
               </el-form-item>
             </el-col>
 
             <el-col :span="6">
               <el-form-item label="意见反馈部门" prop="customerDeptId">
-                <el-input v-model="suggestInfo.customerDeptName" :readonly="true" :disabled="type === 'detail'" @click="showFilterCustomerDept" />
+                <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>
             </el-col>
@@ -552,15 +598,18 @@
       </template>
     </el-form>
 
-    <suggest-approval-dialog ref="apprDial" @on-success="approvalSuccessHandler" />
+    <approval-dialog
+      ref="apprDial"
+      @on-success="approvalSuccessHandler"
+      @on-refuse="noteRefuseHandler"
+      @on-revoke="noteRevokeHandler"
+    />
 
     <filter-customer ref="refCustomerFilter" @record-selected="customerSelectedHandler" />
     <filter-customer-dept ref="refCustomerDeptFilter" @record-selected="customerDeptSelectedHandler" />
 
-    <template v-if="current === 'suggest-approval'">
-      <detail-page title="审批详情">
-        审批详情
-      </detail-page>
+    <template v-if="current === 'suggest-approval' && status !== '1'">
+      <approval-record-table :process-id="suggestInfo.processId" />
     </template>
   </app-container>
 </template>

diff --git a/src/views/resource/customer/suggestForm/approvedDetail.vue b/src/views/resource/customer/suggestForm/approvedDetail.vue
index bfd6c1d..5ac027f 100644
--- a/src/views/resource/customer/suggestForm/approvedDetail.vue
+++ b/src/views/resource/customer/suggestForm/approvedDetail.vue
@@ -20,6 +20,16 @@
   ElMessage.success('打印成功')
 }
 
+// 打印Word
+const printToWord = () => {
+  // exportFile({ id: noticeInfo.value.id, pdf: false })
+}
+
+// 打印PDF
+const printToPDF = () => {
+
+}
+
 const initDialog = (params: any) => {
   // 从路由中获取参数
   id.value = params.id !== undefined ? params.id : ''
diff --git a/src/views/resource/customer/suggestForm/detail.vue b/src/views/resource/customer/suggestForm/detail.vue
index a3324f0..5a315ea 100644
--- a/src/views/resource/customer/suggestForm/detail.vue
+++ b/src/views/resource/customer/suggestForm/detail.vue
@@ -3,14 +3,15 @@
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerInfo } from '../info/customer-info'
 import type { ICustomerSuggestInfo } from './customer-suggest'
-import SuggestApprovalDialog from './suggestApprovalDialog.vue'
-import FilterCustomer from './filterCustomer.vue'
-import FilterCustomerDept from './filterCustomerDept.vue'
-import { getDictByCode } from '@/api/system/dict'
 import type { IDictType } from '@/commonInterface/resource-interface'
-import useUserStore from '@/store/modules/user'
-import { deleteSuggestFormRevoked, failUpdateSuggest, saveSuggestForm, submitSuggestForm, updateDraftSuggest } from '@/api/resource/suggestForm'
 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 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'
 
 // 从路由中传过来的参数
 const type = ref<string>('')
@@ -162,6 +163,7 @@
       id.value = res.data.id
 
       type.value = 'update'
+      status.value = '1' // 保存成功后进入草稿箱 为了不显示审批详情
     }
     else {
       // 提示失败信息
@@ -315,6 +317,38 @@
   }
 }
 
+// 取消
+const noteRevokeHandler = (param: any) => {
+  revokeApproval(param).then((res) => {
+    if (res.code === 200) {
+      ElMessage.success('流程取消成功')
+    }
+    else {
+      ElMessage.error(`流程取消失败：${res.message}`)
+    }
+    // 关闭弹窗
+    apprDial.value.handleClose()
+
+    cancelButtVisable.value = false
+  })
+}
+
+// 拒绝
+const noteRefuseHandler = (param: any) => {
+  refuseApproval(param).then((res) => {
+    if (res.code === 200) {
+      ElMessage.success('拒绝审批完成')
+    }
+    else {
+      ElMessage.error(`拒绝审批失败：${res.message}`)
+    }
+    // 关闭弹窗
+    apprDial.value.handleClose()
+
+    flowButtsVisable.value = false
+  })
+}
+
 // 显示筛选委托方名录的弹窗
 const showFilterCustomer = () => {
   refCustomerFilter.value.showOrHideFilterDialog(true)
@@ -505,25 +539,37 @@
                 <el-input v-model="suggestInfo.formNo" placeholder="登记表编号，保存后自动生成" :disabled="true" />
               </el-form-item>
               <el-form-item label="创建人">
-                <el-input v-model="suggestInfo.createUserName" :readonly="true" />
+                <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" :readonly="true" :disabled="type === 'detail'" @click="showFilterCustomer" />
+                <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>
 
               <el-form-item label="创建时间">
-                <el-input v-model="suggestInfo.createTime" :readonly="true" />
+                <el-input v-model="suggestInfo.createTime" :disabled="true" />
               </el-form-item>
             </el-col>
 
             <el-col :span="6">
               <el-form-item label="意见反馈部门" prop="customerDeptId">
-                <el-input v-model="suggestInfo.customerDeptName" :readonly="true" :disabled="type === 'detail'" @click="showFilterCustomerDept" />
+                <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>
             </el-col>
@@ -552,15 +598,18 @@
       </template>
     </el-form>
 
-    <suggest-approval-dialog ref="apprDial" @on-success="approvalSuccessHandler" />
+    <approval-dialog
+      ref="apprDial"
+      @on-success="approvalSuccessHandler"
+      @on-refuse="noteRefuseHandler"
+      @on-revoke="noteRevokeHandler"
+    />
 
     <filter-customer ref="refCustomerFilter" @record-selected="customerSelectedHandler" />
     <filter-customer-dept ref="refCustomerDeptFilter" @record-selected="customerDeptSelectedHandler" />
 
-    <template v-if="current === 'suggest-approval'">
-      <detail-page title="审批详情">
-        审批详情
-      </detail-page>
+    <template v-if="current === 'suggest-approval' && status !== '1'">
+      <approval-record-table :process-id="suggestInfo.processId" />
     </template>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/suggestForm/list.vue b/src/views/resource/customer/suggestForm/list.vue
index ef6128e..a3ae9cf 100644
--- a/src/views/resource/customer/suggestForm/list.vue
+++ b/src/views/resource/customer/suggestForm/list.vue
@@ -1,15 +1,13 @@
 <!-- 委托方意见登记表列表 -->
 <script name="SuggestFormList" lang="ts" setup>
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { DateModelType } from 'element-plus'
-import dayjs from 'dayjs'
 import type{ ICustomerSuggestInfo, IListQuery } from './customer-suggest'
-import SuggestApprovalDialog from './suggestApprovalDialog.vue'
+import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { deleteSuggestFormDraft, deleteSuggestFormRevoked, getSuggestFormList } from '@/api/resource/suggestForm'
+import { deleteSuggestFormDraft, deleteSuggestFormRevoked, getSuggestFormList, refuseApproval, revokeApproval } from '@/api/resource/suggestForm'
 import { getDictByCode } from '@/api/system/dict'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
-import type { IDictType } from '@/commonInterface/resource-interface'
 
 // 定义常量
 const buttonBoxActive = 'suggestFormApproval' // 存储在sessionstorage里面的字段名，用于记录右上角buttonbox点击状态
@@ -22,7 +20,7 @@
 const active = ref('')
 const menu = ref<IMenu[]>([]) // 审批状态按钮组合
 const approvalStatusList = ref<String[]>([
-  '全部', '已审批', '草稿箱', '待审批', '审批中', '已通过', '未通过', '已取消', '我的审批单',
+  '全部', '已审批', '待审批', '审批', '草稿箱', '审批中', '已通过', '未通过', '已取消',
 ])
 
 // 弹窗子组件
@@ -216,15 +214,48 @@
   fetchData(true)
 }
 
+// 取消
+const noteRevokeHandler = (param: any) => {
+  revokeApproval(param).then((res) => {
+    if (res.code === 200) {
+      ElMessage.success('流程取消成功')
+    }
+    else {
+      ElMessage.error(`流程取消失败：${res.message}`)
+    }
+    // 关闭弹窗
+    apprDial.value.handleClose()
+
+    fetchData(true)
+  })
+}
+
+// 拒绝
+const noteRefuseHandler = (param: any) => {
+  refuseApproval(param).then((res) => {
+    if (res.code === 200) {
+      ElMessage.success('拒绝审批完成')
+    }
+    else {
+      ElMessage.error(`拒绝审批失败：${res.message}`)
+    }
+    // 关闭弹窗
+    apprDial.value.handleClose()
+
+    fetchData(true)
+  })
+}
+
 // 初始化流程审批状态按钮
 const getApprovalStatusDict = async () => {
   await getDictByCode('approvalStatus').then((res) => {
     if (res.code === 200) {
-      res.data.forEach((item: IDictType) => {
-        if (approvalStatusList.value.includes(item.name)) {
+      approvalStatusList.value.forEach((item) => {
+        const tempFindData = res.data.find((e: { name: string; value: string }) => e.name === item)
+        if (tempFindData) {
           menu.value.push({
-            name: item.name,
-            id: `${item.value}`,
+            name: tempFindData.name,
+            id: `${tempFindData.value}`,
           })
         }
       })
@@ -308,7 +339,7 @@
               </el-button>
 
               <el-button v-else size="small" type="primary" link @click="detail(row)">
-                查看2
+                查看
               </el-button>
 
               <el-button v-if="(active === '0' || active === '1' || active === '6') && proxy.hasPerm(`/resource/customer/suggestForm/del`)" size="small" type="danger" link @click="deleteSuggestById(row)">
@@ -335,7 +366,12 @@
     </table-container>
 
     <!-- 审批单弹窗 -->
-    <suggest-approval-dialog ref="apprDial" @on-success="afterApprovalHandler" />
+    <approval-dialog
+      ref="apprDial"
+      @on-success="afterApprovalHandler"
+      @on-refuse="noteRefuseHandler"
+      @on-revoke="noteRevokeHandler"
+    />
 
     <!-- 右上角按钮集合 -->
     <button-box :active="active" :menu="menu" @change-current-button="changeCurrentButton" />

diff --git a/src/views/resource/customer/suggestForm/approvedDetail.vue b/src/views/resource/customer/suggestForm/approvedDetail.vue
index bfd6c1d..5ac027f 100644
--- a/src/views/resource/customer/suggestForm/approvedDetail.vue
+++ b/src/views/resource/customer/suggestForm/approvedDetail.vue
@@ -20,6 +20,16 @@
   ElMessage.success('打印成功')
 }
 
+// 打印Word
+const printToWord = () => {
+  // exportFile({ id: noticeInfo.value.id, pdf: false })
+}
+
+// 打印PDF
+const printToPDF = () => {
+
+}
+
 const initDialog = (params: any) => {
   // 从路由中获取参数
   id.value = params.id !== undefined ? params.id : ''
diff --git a/src/views/resource/customer/suggestForm/detail.vue b/src/views/resource/customer/suggestForm/detail.vue
index a3324f0..5a315ea 100644
--- a/src/views/resource/customer/suggestForm/detail.vue
+++ b/src/views/resource/customer/suggestForm/detail.vue
@@ -3,14 +3,15 @@
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerInfo } from '../info/customer-info'
 import type { ICustomerSuggestInfo } from './customer-suggest'
-import SuggestApprovalDialog from './suggestApprovalDialog.vue'
-import FilterCustomer from './filterCustomer.vue'
-import FilterCustomerDept from './filterCustomerDept.vue'
-import { getDictByCode } from '@/api/system/dict'
 import type { IDictType } from '@/commonInterface/resource-interface'
-import useUserStore from '@/store/modules/user'
-import { deleteSuggestFormRevoked, failUpdateSuggest, saveSuggestForm, submitSuggestForm, updateDraftSuggest } from '@/api/resource/suggestForm'
 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 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'
 
 // 从路由中传过来的参数
 const type = ref<string>('')
@@ -162,6 +163,7 @@
       id.value = res.data.id
 
       type.value = 'update'
+      status.value = '1' // 保存成功后进入草稿箱 为了不显示审批详情
     }
     else {
       // 提示失败信息
@@ -315,6 +317,38 @@
   }
 }
 
+// 取消
+const noteRevokeHandler = (param: any) => {
+  revokeApproval(param).then((res) => {
+    if (res.code === 200) {
+      ElMessage.success('流程取消成功')
+    }
+    else {
+      ElMessage.error(`流程取消失败：${res.message}`)
+    }
+    // 关闭弹窗
+    apprDial.value.handleClose()
+
+    cancelButtVisable.value = false
+  })
+}
+
+// 拒绝
+const noteRefuseHandler = (param: any) => {
+  refuseApproval(param).then((res) => {
+    if (res.code === 200) {
+      ElMessage.success('拒绝审批完成')
+    }
+    else {
+      ElMessage.error(`拒绝审批失败：${res.message}`)
+    }
+    // 关闭弹窗
+    apprDial.value.handleClose()
+
+    flowButtsVisable.value = false
+  })
+}
+
 // 显示筛选委托方名录的弹窗
 const showFilterCustomer = () => {
   refCustomerFilter.value.showOrHideFilterDialog(true)
@@ -505,25 +539,37 @@
                 <el-input v-model="suggestInfo.formNo" placeholder="登记表编号，保存后自动生成" :disabled="true" />
               </el-form-item>
               <el-form-item label="创建人">
-                <el-input v-model="suggestInfo.createUserName" :readonly="true" />
+                <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" :readonly="true" :disabled="type === 'detail'" @click="showFilterCustomer" />
+                <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>
 
               <el-form-item label="创建时间">
-                <el-input v-model="suggestInfo.createTime" :readonly="true" />
+                <el-input v-model="suggestInfo.createTime" :disabled="true" />
               </el-form-item>
             </el-col>
 
             <el-col :span="6">
               <el-form-item label="意见反馈部门" prop="customerDeptId">
-                <el-input v-model="suggestInfo.customerDeptName" :readonly="true" :disabled="type === 'detail'" @click="showFilterCustomerDept" />
+                <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>
             </el-col>
@@ -552,15 +598,18 @@
       </template>
     </el-form>
 
-    <suggest-approval-dialog ref="apprDial" @on-success="approvalSuccessHandler" />
+    <approval-dialog
+      ref="apprDial"
+      @on-success="approvalSuccessHandler"
+      @on-refuse="noteRefuseHandler"
+      @on-revoke="noteRevokeHandler"
+    />
 
     <filter-customer ref="refCustomerFilter" @record-selected="customerSelectedHandler" />
     <filter-customer-dept ref="refCustomerDeptFilter" @record-selected="customerDeptSelectedHandler" />
 
-    <template v-if="current === 'suggest-approval'">
-      <detail-page title="审批详情">
-        审批详情
-      </detail-page>
+    <template v-if="current === 'suggest-approval' && status !== '1'">
+      <approval-record-table :process-id="suggestInfo.processId" />
     </template>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/suggestForm/list.vue b/src/views/resource/customer/suggestForm/list.vue
index ef6128e..a3ae9cf 100644
--- a/src/views/resource/customer/suggestForm/list.vue
+++ b/src/views/resource/customer/suggestForm/list.vue
@@ -1,15 +1,13 @@
 <!-- 委托方意见登记表列表 -->
 <script name="SuggestFormList" lang="ts" setup>
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { DateModelType } from 'element-plus'
-import dayjs from 'dayjs'
 import type{ ICustomerSuggestInfo, IListQuery } from './customer-suggest'
-import SuggestApprovalDialog from './suggestApprovalDialog.vue'
+import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { deleteSuggestFormDraft, deleteSuggestFormRevoked, getSuggestFormList } from '@/api/resource/suggestForm'
+import { deleteSuggestFormDraft, deleteSuggestFormRevoked, getSuggestFormList, refuseApproval, revokeApproval } from '@/api/resource/suggestForm'
 import { getDictByCode } from '@/api/system/dict'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
-import type { IDictType } from '@/commonInterface/resource-interface'
 
 // 定义常量
 const buttonBoxActive = 'suggestFormApproval' // 存储在sessionstorage里面的字段名，用于记录右上角buttonbox点击状态
@@ -22,7 +20,7 @@
 const active = ref('')
 const menu = ref<IMenu[]>([]) // 审批状态按钮组合
 const approvalStatusList = ref<String[]>([
-  '全部', '已审批', '草稿箱', '待审批', '审批中', '已通过', '未通过', '已取消', '我的审批单',
+  '全部', '已审批', '待审批', '审批', '草稿箱', '审批中', '已通过', '未通过', '已取消',
 ])
 
 // 弹窗子组件
@@ -216,15 +214,48 @@
   fetchData(true)
 }
 
+// 取消
+const noteRevokeHandler = (param: any) => {
+  revokeApproval(param).then((res) => {
+    if (res.code === 200) {
+      ElMessage.success('流程取消成功')
+    }
+    else {
+      ElMessage.error(`流程取消失败：${res.message}`)
+    }
+    // 关闭弹窗
+    apprDial.value.handleClose()
+
+    fetchData(true)
+  })
+}
+
+// 拒绝
+const noteRefuseHandler = (param: any) => {
+  refuseApproval(param).then((res) => {
+    if (res.code === 200) {
+      ElMessage.success('拒绝审批完成')
+    }
+    else {
+      ElMessage.error(`拒绝审批失败：${res.message}`)
+    }
+    // 关闭弹窗
+    apprDial.value.handleClose()
+
+    fetchData(true)
+  })
+}
+
 // 初始化流程审批状态按钮
 const getApprovalStatusDict = async () => {
   await getDictByCode('approvalStatus').then((res) => {
     if (res.code === 200) {
-      res.data.forEach((item: IDictType) => {
-        if (approvalStatusList.value.includes(item.name)) {
+      approvalStatusList.value.forEach((item) => {
+        const tempFindData = res.data.find((e: { name: string; value: string }) => e.name === item)
+        if (tempFindData) {
           menu.value.push({
-            name: item.name,
-            id: `${item.value}`,
+            name: tempFindData.name,
+            id: `${tempFindData.value}`,
           })
         }
       })
@@ -308,7 +339,7 @@
               </el-button>
 
               <el-button v-else size="small" type="primary" link @click="detail(row)">
-                查看2
+                查看
               </el-button>
 
               <el-button v-if="(active === '0' || active === '1' || active === '6') && proxy.hasPerm(`/resource/customer/suggestForm/del`)" size="small" type="danger" link @click="deleteSuggestById(row)">
@@ -335,7 +366,12 @@
     </table-container>
 
     <!-- 审批单弹窗 -->
-    <suggest-approval-dialog ref="apprDial" @on-success="afterApprovalHandler" />
+    <approval-dialog
+      ref="apprDial"
+      @on-success="afterApprovalHandler"
+      @on-refuse="noteRefuseHandler"
+      @on-revoke="noteRevokeHandler"
+    />
 
     <!-- 右上角按钮集合 -->
     <button-box :active="active" :menu="menu" @change-current-button="changeCurrentButton" />
diff --git a/src/views/resource/customer/suggestForm/suggestApprovalDialog.vue b/src/views/resource/customer/suggestForm/suggestApprovalDialog.vue
deleted file mode 100644
index ef060a4..0000000
--- a/src/views/resource/customer/suggestForm/suggestApprovalDialog.vue
+++ /dev/null
@@ -1,213 +0,0 @@
-<!-- 审批弹窗 -->
-<script lang="ts" setup name="SuggestApprovalDialog">
-import type { FormInstance, FormRules } from 'element-plus'
-import { ElMessage } from 'element-plus'
-import dayjs from 'dayjs'
-import useUserStore from '@/store/modules/user'
-import { submitApproval } from '@/api/approval'
-import { refuseApproval, revokeApproval } from '@/api/resource/suggestForm'
-/**
- * 审批弹窗
- */
-defineProps({
-  /**
-   * 提示文字
-   */
-  title: {
-    type: String,
-    default: '审批操作',
-  },
-})
-const emit = defineEmits(['onSuccess'])
-// 弹窗显示状态
-const dialogVisible = ref(false)
-// 默认表单
-const defaultFormData = {
-  type: '', // 审批类型
-  id: '', // 委托方id
-  taskId: '', // 任务id
-  processId: '', // 流程id 用于取消
-  comments: '', // 备注
-  user: '', // 当前用户
-  approvalTime: '', // 当前时间
-}
-// 弹窗类型 agree同意 refuse拒绝 reject驳回 revoke取消
-const type = ref('agree')
-// 表单数据对象
-const formData = reactive({ ...defaultFormData })
-
-// 保存按钮加载状态
-const btnLoading = ref(false)
-
-// 获取用户信息
-const userInfo = useUserStore()
-
-// ---------------表单提交--------------------------------
-// 表单对象
-const dataFormRef = ref<FormInstance>()
-// 校验规则
-const rules: FormRules = reactive({
-  comments: [{ required: true, message: '审批结论必填', trigger: ['blur', 'change'] }],
-})
-
-// 同意
-const agree = () => {
-  submitApproval('agree', { taskId: formData.taskId, comments: formData.comments }).then((res) => {
-    ElMessage.success('审批完成')
-    btnLoading.value = false
-    dialogVisible.value = false
-    emit('onSuccess', 'agree')
-  }).catch((_) => {
-    btnLoading.value = false
-  })
-}
-
-// 拒绝
-const refuse = () => {
-  refuseApproval({
-    id: formData.id,
-    taskId: formData.taskId,
-    comments: formData.comments,
-  }).then((res) => {
-    ElMessage.success('审批完成')
-    btnLoading.value = false
-    dialogVisible.value = false
-    emit('onSuccess', 'refuse')
-  })
-}
-
-// 取消（撤回）
-const revoke = () => {
-  revokeApproval({
-    id: formData.id,
-    processInstanceId: formData.processId,
-    comments: formData.comments,
-  }).then((res) => {
-    ElMessage.success('取消成功')
-    btnLoading.value = false
-    dialogVisible.value = false
-    emit('onSuccess', 'revoke')
-  })
-}
-
-/**
- * 初始化审批弹窗
- * @param type 审批类型
- * @param taskId 任务id
- */
-function initDialog(type: string, customerId: string, taskId: string, processId: string) {
-  formData.type = type
-  formData.id = customerId
-  formData.taskId = taskId
-  formData.processId = processId
-  formData.user = userInfo.name
-  formData.approvalTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
-  formData.comments = ''
-  dialogVisible.value = true
-}
-// 提交表单
-function submitForm() {
-  if (dataFormRef) {
-    dataFormRef.value?.validate((valid: boolean) => {
-      if (valid) {
-        btnLoading.value = true
-        switch (formData.type) {
-          case 'agree':
-            agree()
-            break
-          case 'refuse':
-            refuse()
-            break
-
-          case 'revoke':
-            revoke()
-            break
-        }
-      }
-    })
-  }
-}
-// 关闭弹窗
-function handleClose() {
-  dialogVisible.value = false
-}
-
-// ----------------------- 以下是暴露的方法内容 ----------------------------
-defineExpose({ initDialog })
-</script>
-
-<template>
-  <el-dialog
-    v-model="dialogVisible"
-    title="审批操作"
-    width="600"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="dataFormRef"
-      label-position="left"
-      label-width="80px"
-      :model="formData"
-      :rules="rules"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="formData.type" disabled>
-              <el-radio v-show="formData.type === 'agree'" label="agree" size="large">
-                同意
-              </el-radio>
-              <el-radio v-show="formData.type === 'refuse'" label="refuse" size="large">
-                拒绝
-              </el-radio>
-              <el-radio v-show="formData.type === 'revoke'" label="revoke" size="large">
-                取消
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:" props="comments">
-            <el-input
-              v-model="formData.comments"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="formData.user"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="formData.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" :loading="btnLoading" @click="submitForm">
-        提交
-      </el-button>
-      <el-button type="info" @click="handleClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
-</template>