diff --git a/public/config/customApproval.json b/public/config/customApproval.json
index 205ac21..d69296d 100644
--- a/public/config/customApproval.json
+++ b/public/config/customApproval.json
@@ -1,7 +1,22 @@
 {
-  "approvalLastNameDescribe": "审批流程最后一个节点的名字，用来判断审批自选的时候是否是最后一个节点",
+  "approvalLastName--Describe": "审批流程最后一个节点的名字，用来判断审批自选的时候是否是最后一个节点",
   "approvalLastName": {
-    "standardCheckRecordDescribe": "核查记录",
-    "standardCheckRecord": "技术负责人"
+    "standardCheckRecord--Describe": "核查记录",
+    "standardCheckRecord": "技术负责人",
+
+    "noveltySearch--Describe": "测试校准检定方法查新记录表",
+    "noveltySearch": "审核人",
+
+    "fileChange--Describe": "文件更改申请单",
+    "fileChange": "主任",
+
+    "methodConfirm--Describe": "方法确认登记表",
+    "methodConfirm": "技术负责人",
+
+    "softwareReviewReport--Describe": "软件评审报告",
+    "softwareReviewReport": "技术负责人",
+
+    "resistance--Describe": "实验室接地电阻记录",
+    "resistance": "审核人"
   }
 }

diff --git a/public/config/customApproval.json b/public/config/customApproval.json
index 205ac21..d69296d 100644
--- a/public/config/customApproval.json
+++ b/public/config/customApproval.json
@@ -1,7 +1,22 @@
 {
-  "approvalLastNameDescribe": "审批流程最后一个节点的名字，用来判断审批自选的时候是否是最后一个节点",
+  "approvalLastName--Describe": "审批流程最后一个节点的名字，用来判断审批自选的时候是否是最后一个节点",
   "approvalLastName": {
-    "standardCheckRecordDescribe": "核查记录",
-    "standardCheckRecord": "技术负责人"
+    "standardCheckRecord--Describe": "核查记录",
+    "standardCheckRecord": "技术负责人",
+
+    "noveltySearch--Describe": "测试校准检定方法查新记录表",
+    "noveltySearch": "审核人",
+
+    "fileChange--Describe": "文件更改申请单",
+    "fileChange": "主任",
+
+    "methodConfirm--Describe": "方法确认登记表",
+    "methodConfirm": "技术负责人",
+
+    "softwareReviewReport--Describe": "软件评审报告",
+    "softwareReviewReport": "技术负责人",
+
+    "resistance--Describe": "实验室接地电阻记录",
+    "resistance": "审核人"
   }
 }
diff --git a/src/views/resource/environment/resistance/edit.vue b/src/views/resource/environment/resistance/edit.vue
index dd62bd1..fd06d64 100644
--- a/src/views/resource/environment/resistance/edit.vue
+++ b/src/views/resource/environment/resistance/edit.vue
@@ -2,7 +2,9 @@
 <script name="EnvironmentResistanceDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IResistanceRecord } from './resistance-interface'
-import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
+import customApproval from '/public/config/customApproval.json'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { detailResistance, draftDeleteResistance, failUpdateResistance, refuseApprovalResistance, revokeApprovalResistance, saveResistance, submitResistance, updateResistance } from '@/api/resource/environmentTest'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
@@ -37,7 +39,7 @@
 const approvalDialog = ref()
 const testRecordRef = ref()
 
-const recordForm = ref<IResistanceRecord>({
+const recordForm: any = ref({
   id: '',
   recordNo: '',
   recordName: '实验室接地电阻记录',
@@ -241,9 +243,14 @@
     }
   })
 }
-
-// 提交按钮
-const submitButtonHandler = async () => {
+// -----------------------------------提交-------------------------------------------------------
+const selectApproverRef = ref() // 审批人自选组件ref
+// 选好审批人
+const confirmSelectApprover = async (approverList: string[] = []) => {
+  if (!approverList.length) {
+    ElMessage.warning('无审批人，无法提交！')
+    return false
+  }
   if (recordForm.value === null || recordForm.value.processId === undefined || recordForm.value.processId === '') {
     // 流程id为空 表示还未进入流程中 直接提交
     ElMessageBox.confirm(`是否提交实验室接地电阻记录 ${recordForm.value.recordNo}`, '提示', {
@@ -259,6 +266,8 @@
       submitResistance({
         formId: SCHEDULE.LAB_RESISTANCE_RECORD_APPROVAL,
         id: recordForm.value.id,
+        processId: recordForm.value.processId,
+        assignees: approverList,
       }).then((res) => {
         if (res.code === 200) {
           ElMessage.success(`实验室接地电阻记录 ${recordForm.value.recordNo} 提交成功`)
@@ -282,7 +291,12 @@
           text: '加载中...',
           background: 'rgba(255, 255, 255, 0.6)',
         })
-        failUpdateResistance(recordForm.value).then((res) => {
+        const params = {
+          ...recordForm.value,
+          processId: recordForm.value.processId,
+          assignees: approverList,
+        }
+        failUpdateResistance(params).then((res) => {
           if (res.code === 200) {
           // 提示保存成功
             ElMessage.success('保存成功')
@@ -302,6 +316,12 @@
     })
   }
 }
+// 提交按钮
+const submitButtonHandler = () => {
+  selectApproverRef.value.initDialog()
+}
+
+// ---------------------------------------------------------------------------------------------
 
 // 根据id查询详情
 const detailById = async (id: string) => {
@@ -312,7 +332,10 @@
   })
   await detailResistance({ id }).then((res) => {
     if (res.code === 200) {
-      recordForm.value = res.data
+      // recordForm.value = res.data
+      for (const key in recordForm.value) {
+        recordForm.value[key] = res.data[key]
+      }
       if (recordForm.value.taskId === '') {
         recordForm.value.taskId = sessionStorage.getItem('resistanceRecordTaskId')!
       }
@@ -328,12 +351,12 @@
 // ------------------------------------------------审批----------------------------------------
 // 流程审批-拒绝
 const approvalRefuseHandler = () => {
-  approvalDialog.value.initDialog('refuse', recordForm.value.id, recordForm.value.taskId || route.query.taskId, '')
+  approvalDialog.value.initDialog('refuse', recordForm.value.taskId || route.query.taskId, recordForm.value.id)
 }
 
 // 流程审批-同意
 const approvalAgreeHandler = () => {
-  approvalDialog.value.initDialog('agree', recordForm.value.id, recordForm.value.taskId || route.query.taskId, '')
+  approvalDialog.value.initDialog('agree', recordForm.value.taskId || route.query.taskId, recordForm.value.id, recordForm.value.processId || route.query.processId)
 }
 
 // 取消流程
@@ -393,7 +416,12 @@
 }
 
 // 拒绝
-const refuseHandler = (param: any) => {
+const refuseHandler = (comments: string, taskId: string, id: string) => {
+  const param = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
   refuseApprovalResistance(param).then((res) => {
     if (res.code === 200) {
       ElMessage.success('拒绝审批完成')
@@ -401,9 +429,6 @@
     else {
       ElMessage.error(`拒绝审批失败：${res.message}`)
     }
-    // 关闭弹窗
-    approvalDialog.value.handleClose()
-
     flowButtsVisable.value = false
   })
 }
@@ -661,10 +686,14 @@
       </detail-block>
     </el-form>
 
-    <approval-dialog
+    <!-- <approval-dialog
       ref="approvalDialog"
       @on-success="approvalSuccessHandler" @on-refuse="refuseHandler" @on-revoke="revokeHandler"
-    />
+    /> -->
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialog" :last-name="customApproval.approvalLastName.resistance" @on-success="approvalSuccessHandler" @refuse="refuseHandler" />
+    <!-- 选择审批人弹窗 -->
+    <select-approver-dialog ref="selectApproverRef" @confirm="confirmSelectApprover" />
 
     <template v-if="current === 'resistance-approval' && status !== '1'">
       <approval-record-table :process-id="recordForm.processId" />

diff --git a/public/config/customApproval.json b/public/config/customApproval.json
index 205ac21..d69296d 100644
--- a/public/config/customApproval.json
+++ b/public/config/customApproval.json
@@ -1,7 +1,22 @@
 {
-  "approvalLastNameDescribe": "审批流程最后一个节点的名字，用来判断审批自选的时候是否是最后一个节点",
+  "approvalLastName--Describe": "审批流程最后一个节点的名字，用来判断审批自选的时候是否是最后一个节点",
   "approvalLastName": {
-    "standardCheckRecordDescribe": "核查记录",
-    "standardCheckRecord": "技术负责人"
+    "standardCheckRecord--Describe": "核查记录",
+    "standardCheckRecord": "技术负责人",
+
+    "noveltySearch--Describe": "测试校准检定方法查新记录表",
+    "noveltySearch": "审核人",
+
+    "fileChange--Describe": "文件更改申请单",
+    "fileChange": "主任",
+
+    "methodConfirm--Describe": "方法确认登记表",
+    "methodConfirm": "技术负责人",
+
+    "softwareReviewReport--Describe": "软件评审报告",
+    "softwareReviewReport": "技术负责人",
+
+    "resistance--Describe": "实验室接地电阻记录",
+    "resistance": "审核人"
   }
 }
diff --git a/src/views/resource/environment/resistance/edit.vue b/src/views/resource/environment/resistance/edit.vue
index dd62bd1..fd06d64 100644
--- a/src/views/resource/environment/resistance/edit.vue
+++ b/src/views/resource/environment/resistance/edit.vue
@@ -2,7 +2,9 @@
 <script name="EnvironmentResistanceDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IResistanceRecord } from './resistance-interface'
-import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
+import customApproval from '/public/config/customApproval.json'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { detailResistance, draftDeleteResistance, failUpdateResistance, refuseApprovalResistance, revokeApprovalResistance, saveResistance, submitResistance, updateResistance } from '@/api/resource/environmentTest'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
@@ -37,7 +39,7 @@
 const approvalDialog = ref()
 const testRecordRef = ref()
 
-const recordForm = ref<IResistanceRecord>({
+const recordForm: any = ref({
   id: '',
   recordNo: '',
   recordName: '实验室接地电阻记录',
@@ -241,9 +243,14 @@
     }
   })
 }
-
-// 提交按钮
-const submitButtonHandler = async () => {
+// -----------------------------------提交-------------------------------------------------------
+const selectApproverRef = ref() // 审批人自选组件ref
+// 选好审批人
+const confirmSelectApprover = async (approverList: string[] = []) => {
+  if (!approverList.length) {
+    ElMessage.warning('无审批人，无法提交！')
+    return false
+  }
   if (recordForm.value === null || recordForm.value.processId === undefined || recordForm.value.processId === '') {
     // 流程id为空 表示还未进入流程中 直接提交
     ElMessageBox.confirm(`是否提交实验室接地电阻记录 ${recordForm.value.recordNo}`, '提示', {
@@ -259,6 +266,8 @@
       submitResistance({
         formId: SCHEDULE.LAB_RESISTANCE_RECORD_APPROVAL,
         id: recordForm.value.id,
+        processId: recordForm.value.processId,
+        assignees: approverList,
       }).then((res) => {
         if (res.code === 200) {
           ElMessage.success(`实验室接地电阻记录 ${recordForm.value.recordNo} 提交成功`)
@@ -282,7 +291,12 @@
           text: '加载中...',
           background: 'rgba(255, 255, 255, 0.6)',
         })
-        failUpdateResistance(recordForm.value).then((res) => {
+        const params = {
+          ...recordForm.value,
+          processId: recordForm.value.processId,
+          assignees: approverList,
+        }
+        failUpdateResistance(params).then((res) => {
           if (res.code === 200) {
           // 提示保存成功
             ElMessage.success('保存成功')
@@ -302,6 +316,12 @@
     })
   }
 }
+// 提交按钮
+const submitButtonHandler = () => {
+  selectApproverRef.value.initDialog()
+}
+
+// ---------------------------------------------------------------------------------------------
 
 // 根据id查询详情
 const detailById = async (id: string) => {
@@ -312,7 +332,10 @@
   })
   await detailResistance({ id }).then((res) => {
     if (res.code === 200) {
-      recordForm.value = res.data
+      // recordForm.value = res.data
+      for (const key in recordForm.value) {
+        recordForm.value[key] = res.data[key]
+      }
       if (recordForm.value.taskId === '') {
         recordForm.value.taskId = sessionStorage.getItem('resistanceRecordTaskId')!
       }
@@ -328,12 +351,12 @@
 // ------------------------------------------------审批----------------------------------------
 // 流程审批-拒绝
 const approvalRefuseHandler = () => {
-  approvalDialog.value.initDialog('refuse', recordForm.value.id, recordForm.value.taskId || route.query.taskId, '')
+  approvalDialog.value.initDialog('refuse', recordForm.value.taskId || route.query.taskId, recordForm.value.id)
 }
 
 // 流程审批-同意
 const approvalAgreeHandler = () => {
-  approvalDialog.value.initDialog('agree', recordForm.value.id, recordForm.value.taskId || route.query.taskId, '')
+  approvalDialog.value.initDialog('agree', recordForm.value.taskId || route.query.taskId, recordForm.value.id, recordForm.value.processId || route.query.processId)
 }
 
 // 取消流程
@@ -393,7 +416,12 @@
 }
 
 // 拒绝
-const refuseHandler = (param: any) => {
+const refuseHandler = (comments: string, taskId: string, id: string) => {
+  const param = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
   refuseApprovalResistance(param).then((res) => {
     if (res.code === 200) {
       ElMessage.success('拒绝审批完成')
@@ -401,9 +429,6 @@
     else {
       ElMessage.error(`拒绝审批失败：${res.message}`)
     }
-    // 关闭弹窗
-    approvalDialog.value.handleClose()
-
     flowButtsVisable.value = false
   })
 }
@@ -661,10 +686,14 @@
       </detail-block>
     </el-form>
 
-    <approval-dialog
+    <!-- <approval-dialog
       ref="approvalDialog"
       @on-success="approvalSuccessHandler" @on-refuse="refuseHandler" @on-revoke="revokeHandler"
-    />
+    /> -->
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialog" :last-name="customApproval.approvalLastName.resistance" @on-success="approvalSuccessHandler" @refuse="refuseHandler" />
+    <!-- 选择审批人弹窗 -->
+    <select-approver-dialog ref="selectApproverRef" @confirm="confirmSelectApprover" />
 
     <template v-if="current === 'resistance-approval' && status !== '1'">
       <approval-record-table :process-id="recordForm.processId" />
diff --git a/src/views/resource/environment/resistance/list.vue b/src/views/resource/environment/resistance/list.vue
index f3e768e..439b574 100644
--- a/src/views/resource/environment/resistance/list.vue
+++ b/src/views/resource/environment/resistance/list.vue
@@ -3,7 +3,7 @@
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IListQuery, IResistanceRecord } from './resistance-interface'
-import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -13,7 +13,8 @@
 import { exportFile } from '@/utils/exportUtils'
 import { printPdf } from '@/utils/printUtils'
 import useBridgeCount from '@/components/buttonBox/useBridgeCount'
-
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
+import customApproval from '/public/config/customApproval.json'
 // 定义常量
 const buttonBoxActive = 'labResistanceRecordApproval' // 存储在sessionstorage里面的字段名，用于记录右上角buttonbox点击状态
 
@@ -240,12 +241,12 @@
 
 // 流程审批-同意
 const approvalAgreeHandler = (row: IResistanceRecord) => {
-  apprDial.value.initDialog('agree', row.id, row.taskId, '')
+  apprDial.value.initDialog('agree', row.taskId, row.id, row.processId)
 }
 
 // 流程审批-拒绝
 const approvalRefuseHandler = (row: IResistanceRecord) => {
-  apprDial.value.initDialog('refuse', row.id, row.taskId, '')
+  apprDial.value.initDialog('refuse', row.taskId, row.id)
 }
 
 // 取消（撤回审批单）
@@ -287,7 +288,12 @@
 }
 
 // 拒绝
-const refuseHandler = (param: any) => {
+const refuseHandler = (comments: string, taskId: string, id: string) => {
+  const param = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
   refuseApprovalResistance(param).then((res) => {
     if (res.code === 200) {
       ElMessage.success('拒绝审批完成')
@@ -295,8 +301,6 @@
     else {
       ElMessage.error(`拒绝审批失败：${res.message}`)
     }
-    // 关闭弹窗
-    apprDial.value.handleClose()
 
     fetchData(true)
   })
@@ -505,10 +509,18 @@
     </table-container>
 
     <!-- 审批单弹窗 -->
-    <approval-dialog
+    <!-- <approval-dialog
       ref="apprDial"
       @on-success="afterApprovalHandler"
       @on-refuse="refuseHandler"
+    /> -->
+
+    <!-- 审批弹窗-审批人自选 -->
+    <approval-dialog
+      ref="apprDial"
+      :last-name="customApproval.approvalLastName.resistance"
+      @on-success="afterApprovalHandler"
+      @refuse="refuseHandler"
     />
 
     <!-- 右上角按钮集合 -->

diff --git a/public/config/customApproval.json b/public/config/customApproval.json
index 205ac21..d69296d 100644
--- a/public/config/customApproval.json
+++ b/public/config/customApproval.json
@@ -1,7 +1,22 @@
 {
-  "approvalLastNameDescribe": "审批流程最后一个节点的名字，用来判断审批自选的时候是否是最后一个节点",
+  "approvalLastName--Describe": "审批流程最后一个节点的名字，用来判断审批自选的时候是否是最后一个节点",
   "approvalLastName": {
-    "standardCheckRecordDescribe": "核查记录",
-    "standardCheckRecord": "技术负责人"
+    "standardCheckRecord--Describe": "核查记录",
+    "standardCheckRecord": "技术负责人",
+
+    "noveltySearch--Describe": "测试校准检定方法查新记录表",
+    "noveltySearch": "审核人",
+
+    "fileChange--Describe": "文件更改申请单",
+    "fileChange": "主任",
+
+    "methodConfirm--Describe": "方法确认登记表",
+    "methodConfirm": "技术负责人",
+
+    "softwareReviewReport--Describe": "软件评审报告",
+    "softwareReviewReport": "技术负责人",
+
+    "resistance--Describe": "实验室接地电阻记录",
+    "resistance": "审核人"
   }
 }
diff --git a/src/views/resource/environment/resistance/edit.vue b/src/views/resource/environment/resistance/edit.vue
index dd62bd1..fd06d64 100644
--- a/src/views/resource/environment/resistance/edit.vue
+++ b/src/views/resource/environment/resistance/edit.vue
@@ -2,7 +2,9 @@
 <script name="EnvironmentResistanceDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IResistanceRecord } from './resistance-interface'
-import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
+import customApproval from '/public/config/customApproval.json'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { detailResistance, draftDeleteResistance, failUpdateResistance, refuseApprovalResistance, revokeApprovalResistance, saveResistance, submitResistance, updateResistance } from '@/api/resource/environmentTest'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
@@ -37,7 +39,7 @@
 const approvalDialog = ref()
 const testRecordRef = ref()
 
-const recordForm = ref<IResistanceRecord>({
+const recordForm: any = ref({
   id: '',
   recordNo: '',
   recordName: '实验室接地电阻记录',
@@ -241,9 +243,14 @@
     }
   })
 }
-
-// 提交按钮
-const submitButtonHandler = async () => {
+// -----------------------------------提交-------------------------------------------------------
+const selectApproverRef = ref() // 审批人自选组件ref
+// 选好审批人
+const confirmSelectApprover = async (approverList: string[] = []) => {
+  if (!approverList.length) {
+    ElMessage.warning('无审批人，无法提交！')
+    return false
+  }
   if (recordForm.value === null || recordForm.value.processId === undefined || recordForm.value.processId === '') {
     // 流程id为空 表示还未进入流程中 直接提交
     ElMessageBox.confirm(`是否提交实验室接地电阻记录 ${recordForm.value.recordNo}`, '提示', {
@@ -259,6 +266,8 @@
       submitResistance({
         formId: SCHEDULE.LAB_RESISTANCE_RECORD_APPROVAL,
         id: recordForm.value.id,
+        processId: recordForm.value.processId,
+        assignees: approverList,
       }).then((res) => {
         if (res.code === 200) {
           ElMessage.success(`实验室接地电阻记录 ${recordForm.value.recordNo} 提交成功`)
@@ -282,7 +291,12 @@
           text: '加载中...',
           background: 'rgba(255, 255, 255, 0.6)',
         })
-        failUpdateResistance(recordForm.value).then((res) => {
+        const params = {
+          ...recordForm.value,
+          processId: recordForm.value.processId,
+          assignees: approverList,
+        }
+        failUpdateResistance(params).then((res) => {
           if (res.code === 200) {
           // 提示保存成功
             ElMessage.success('保存成功')
@@ -302,6 +316,12 @@
     })
   }
 }
+// 提交按钮
+const submitButtonHandler = () => {
+  selectApproverRef.value.initDialog()
+}
+
+// ---------------------------------------------------------------------------------------------
 
 // 根据id查询详情
 const detailById = async (id: string) => {
@@ -312,7 +332,10 @@
   })
   await detailResistance({ id }).then((res) => {
     if (res.code === 200) {
-      recordForm.value = res.data
+      // recordForm.value = res.data
+      for (const key in recordForm.value) {
+        recordForm.value[key] = res.data[key]
+      }
       if (recordForm.value.taskId === '') {
         recordForm.value.taskId = sessionStorage.getItem('resistanceRecordTaskId')!
       }
@@ -328,12 +351,12 @@
 // ------------------------------------------------审批----------------------------------------
 // 流程审批-拒绝
 const approvalRefuseHandler = () => {
-  approvalDialog.value.initDialog('refuse', recordForm.value.id, recordForm.value.taskId || route.query.taskId, '')
+  approvalDialog.value.initDialog('refuse', recordForm.value.taskId || route.query.taskId, recordForm.value.id)
 }
 
 // 流程审批-同意
 const approvalAgreeHandler = () => {
-  approvalDialog.value.initDialog('agree', recordForm.value.id, recordForm.value.taskId || route.query.taskId, '')
+  approvalDialog.value.initDialog('agree', recordForm.value.taskId || route.query.taskId, recordForm.value.id, recordForm.value.processId || route.query.processId)
 }
 
 // 取消流程
@@ -393,7 +416,12 @@
 }
 
 // 拒绝
-const refuseHandler = (param: any) => {
+const refuseHandler = (comments: string, taskId: string, id: string) => {
+  const param = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
   refuseApprovalResistance(param).then((res) => {
     if (res.code === 200) {
       ElMessage.success('拒绝审批完成')
@@ -401,9 +429,6 @@
     else {
       ElMessage.error(`拒绝审批失败：${res.message}`)
     }
-    // 关闭弹窗
-    approvalDialog.value.handleClose()
-
     flowButtsVisable.value = false
   })
 }
@@ -661,10 +686,14 @@
       </detail-block>
     </el-form>
 
-    <approval-dialog
+    <!-- <approval-dialog
       ref="approvalDialog"
       @on-success="approvalSuccessHandler" @on-refuse="refuseHandler" @on-revoke="revokeHandler"
-    />
+    /> -->
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialog" :last-name="customApproval.approvalLastName.resistance" @on-success="approvalSuccessHandler" @refuse="refuseHandler" />
+    <!-- 选择审批人弹窗 -->
+    <select-approver-dialog ref="selectApproverRef" @confirm="confirmSelectApprover" />
 
     <template v-if="current === 'resistance-approval' && status !== '1'">
       <approval-record-table :process-id="recordForm.processId" />
diff --git a/src/views/resource/environment/resistance/list.vue b/src/views/resource/environment/resistance/list.vue
index f3e768e..439b574 100644
--- a/src/views/resource/environment/resistance/list.vue
+++ b/src/views/resource/environment/resistance/list.vue
@@ -3,7 +3,7 @@
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IListQuery, IResistanceRecord } from './resistance-interface'
-import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -13,7 +13,8 @@
 import { exportFile } from '@/utils/exportUtils'
 import { printPdf } from '@/utils/printUtils'
 import useBridgeCount from '@/components/buttonBox/useBridgeCount'
-
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
+import customApproval from '/public/config/customApproval.json'
 // 定义常量
 const buttonBoxActive = 'labResistanceRecordApproval' // 存储在sessionstorage里面的字段名，用于记录右上角buttonbox点击状态
 
@@ -240,12 +241,12 @@
 
 // 流程审批-同意
 const approvalAgreeHandler = (row: IResistanceRecord) => {
-  apprDial.value.initDialog('agree', row.id, row.taskId, '')
+  apprDial.value.initDialog('agree', row.taskId, row.id, row.processId)
 }
 
 // 流程审批-拒绝
 const approvalRefuseHandler = (row: IResistanceRecord) => {
-  apprDial.value.initDialog('refuse', row.id, row.taskId, '')
+  apprDial.value.initDialog('refuse', row.taskId, row.id)
 }
 
 // 取消（撤回审批单）
@@ -287,7 +288,12 @@
 }
 
 // 拒绝
-const refuseHandler = (param: any) => {
+const refuseHandler = (comments: string, taskId: string, id: string) => {
+  const param = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
   refuseApprovalResistance(param).then((res) => {
     if (res.code === 200) {
       ElMessage.success('拒绝审批完成')
@@ -295,8 +301,6 @@
     else {
       ElMessage.error(`拒绝审批失败：${res.message}`)
     }
-    // 关闭弹窗
-    apprDial.value.handleClose()
 
     fetchData(true)
   })
@@ -505,10 +509,18 @@
     </table-container>
 
     <!-- 审批单弹窗 -->
-    <approval-dialog
+    <!-- <approval-dialog
       ref="apprDial"
       @on-success="afterApprovalHandler"
       @on-refuse="refuseHandler"
+    /> -->
+
+    <!-- 审批弹窗-审批人自选 -->
+    <approval-dialog
+      ref="apprDial"
+      :last-name="customApproval.approvalLastName.resistance"
+      @on-success="afterApprovalHandler"
+      @refuse="refuseHandler"
     />
 
     <!-- 右上角按钮集合 -->
diff --git a/src/views/resource/file/change/detail.vue b/src/views/resource/file/change/detail.vue
index 3efc9ab..a0c7c5d 100644
--- a/src/views/resource/file/change/detail.vue
+++ b/src/views/resource/file/change/detail.vue
@@ -5,7 +5,9 @@
 import FileSelectDialog from './dialog/selectSysFileDialog.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
+import customApproval from '/public/config/customApproval.json'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
 import useUserStore from '@/store/modules/user' // 用户信息
 
@@ -292,8 +294,14 @@
   })
 }
 
-// 提交按钮
-const submitButtonHandler = async () => {
+// -----------------------------------提交-------------------------------------------------------
+const selectApproverRef = ref() // 审批人自选组件ref
+// 选好审批人
+const confirmSelectApprover = async (approverList: string[] = []) => {
+  if (!approverList.length) {
+    ElMessage.warning('无审批人，无法提交！')
+    return false
+  }
   if (changeForm.value === null || changeForm.value.processId === undefined || changeForm.value.processId === '') {
     // 流程id为空 表示还未进入流程中 直接提交
     ElMessageBox.confirm(`是否提交文件更改申请单 ${changeForm.value.formNo}`, '提示', {
@@ -309,6 +317,8 @@
       submitChangeForm({
         formId: flowFormId,
         id: changeForm.value.id,
+        processId: changeForm.value.processId,
+        assignees: approverList,
       }).then((res) => {
         if (res.code === 200) {
           ElMessage.success('提交成功')
@@ -333,7 +343,12 @@
           text: '加载中...',
           background: 'rgba(255, 255, 255, 0.6)',
         })
-        failUpdateChangeForm(changeForm.value).then((res) => {
+        const params = {
+          ...changeForm.value,
+          processId: changeForm.value.processId,
+          assignees: approverList,
+        }
+        failUpdateChangeForm(params).then((res) => {
           if (res.code === 200) {
           // 提示保存成功
             ElMessage.success('提交成功')
@@ -354,7 +369,11 @@
     })
   }
 }
-
+// 提交按钮
+const submitButtonHandler = () => {
+  selectApproverRef.value.initDialog()
+}
+// ----------------------------------------------------------------------------------------------
 // 选定文件返回
 const appendFileToList = (listParam: any) => {
   listParam.forEach((item: any) => {
@@ -374,12 +393,12 @@
 
 // 流程审批-同意
 const approvalAgreeHandler = () => {
-  apprDial.value.initDialog('agree', changeForm.value.id, changeForm.value.taskId || route.query.taskId, '')
+  apprDial.value.initDialog('agree', changeForm.value.taskId || route.query.taskId, changeForm.value.id, changeForm.value.processId || route.query.processId)
 }
 
 // 流程审批-拒绝
 const approvalRefuseHandler = () => {
-  apprDial.value.initDialog('refuse', changeForm.value.id, changeForm.value.taskId || route.query.taskId, '')
+  apprDial.value.initDialog('refuse', changeForm.value.taskId || route.query.taskId, changeForm.value.id)
 }
 
 // 取消（撤回审批单）
@@ -443,7 +462,12 @@
 }
 
 // 拒绝
-const refuseHandler = (param: any) => {
+const refuseHandler = (comments: string, taskId: string, id: string) => {
+  const param = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
   refuseApproval(param).then((res) => {
     if (res.code === 200) {
       ElMessage.success('拒绝审批完成')
@@ -451,9 +475,6 @@
     else {
       ElMessage.error(`拒绝审批失败：${res.message}`)
     }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
     flowButtsVisable.value = false
   })
 }
@@ -710,11 +731,15 @@
       </detail-block>
     </el-form>
 
-    <approval-dialog
+    <!-- <approval-dialog
       ref="apprDial"
       @on-success="approvalSuccessHandler"
       @on-refuse="refuseHandler"
-    />
+    /> -->
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="apprDial" :last-name="customApproval.approvalLastName.fileChange" @on-success="approvalSuccessHandler" @refuse="refuseHandler" />
+    <!-- 选择审批人弹窗 -->
+    <select-approver-dialog ref="selectApproverRef" @confirm="confirmSelectApprover" />
 
     <file-select-dialog ref="refFileSelect" @confirm="appendFileToList" />
 

diff --git a/public/config/customApproval.json b/public/config/customApproval.json
index 205ac21..d69296d 100644
--- a/public/config/customApproval.json
+++ b/public/config/customApproval.json
@@ -1,7 +1,22 @@
 {
-  "approvalLastNameDescribe": "审批流程最后一个节点的名字，用来判断审批自选的时候是否是最后一个节点",
+  "approvalLastName--Describe": "审批流程最后一个节点的名字，用来判断审批自选的时候是否是最后一个节点",
   "approvalLastName": {
-    "standardCheckRecordDescribe": "核查记录",
-    "standardCheckRecord": "技术负责人"
+    "standardCheckRecord--Describe": "核查记录",
+    "standardCheckRecord": "技术负责人",
+
+    "noveltySearch--Describe": "测试校准检定方法查新记录表",
+    "noveltySearch": "审核人",
+
+    "fileChange--Describe": "文件更改申请单",
+    "fileChange": "主任",
+
+    "methodConfirm--Describe": "方法确认登记表",
+    "methodConfirm": "技术负责人",
+
+    "softwareReviewReport--Describe": "软件评审报告",
+    "softwareReviewReport": "技术负责人",
+
+    "resistance--Describe": "实验室接地电阻记录",
+    "resistance": "审核人"
   }
 }
diff --git a/src/views/resource/environment/resistance/edit.vue b/src/views/resource/environment/resistance/edit.vue
index dd62bd1..fd06d64 100644
--- a/src/views/resource/environment/resistance/edit.vue
+++ b/src/views/resource/environment/resistance/edit.vue
@@ -2,7 +2,9 @@
 <script name="EnvironmentResistanceDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IResistanceRecord } from './resistance-interface'
-import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
+import customApproval from '/public/config/customApproval.json'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { detailResistance, draftDeleteResistance, failUpdateResistance, refuseApprovalResistance, revokeApprovalResistance, saveResistance, submitResistance, updateResistance } from '@/api/resource/environmentTest'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
@@ -37,7 +39,7 @@
 const approvalDialog = ref()
 const testRecordRef = ref()
 
-const recordForm = ref<IResistanceRecord>({
+const recordForm: any = ref({
   id: '',
   recordNo: '',
   recordName: '实验室接地电阻记录',
@@ -241,9 +243,14 @@
     }
   })
 }
-
-// 提交按钮
-const submitButtonHandler = async () => {
+// -----------------------------------提交-------------------------------------------------------
+const selectApproverRef = ref() // 审批人自选组件ref
+// 选好审批人
+const confirmSelectApprover = async (approverList: string[] = []) => {
+  if (!approverList.length) {
+    ElMessage.warning('无审批人，无法提交！')
+    return false
+  }
   if (recordForm.value === null || recordForm.value.processId === undefined || recordForm.value.processId === '') {
     // 流程id为空 表示还未进入流程中 直接提交
     ElMessageBox.confirm(`是否提交实验室接地电阻记录 ${recordForm.value.recordNo}`, '提示', {
@@ -259,6 +266,8 @@
       submitResistance({
         formId: SCHEDULE.LAB_RESISTANCE_RECORD_APPROVAL,
         id: recordForm.value.id,
+        processId: recordForm.value.processId,
+        assignees: approverList,
       }).then((res) => {
         if (res.code === 200) {
           ElMessage.success(`实验室接地电阻记录 ${recordForm.value.recordNo} 提交成功`)
@@ -282,7 +291,12 @@
           text: '加载中...',
           background: 'rgba(255, 255, 255, 0.6)',
         })
-        failUpdateResistance(recordForm.value).then((res) => {
+        const params = {
+          ...recordForm.value,
+          processId: recordForm.value.processId,
+          assignees: approverList,
+        }
+        failUpdateResistance(params).then((res) => {
           if (res.code === 200) {
           // 提示保存成功
             ElMessage.success('保存成功')
@@ -302,6 +316,12 @@
     })
   }
 }
+// 提交按钮
+const submitButtonHandler = () => {
+  selectApproverRef.value.initDialog()
+}
+
+// ---------------------------------------------------------------------------------------------
 
 // 根据id查询详情
 const detailById = async (id: string) => {
@@ -312,7 +332,10 @@
   })
   await detailResistance({ id }).then((res) => {
     if (res.code === 200) {
-      recordForm.value = res.data
+      // recordForm.value = res.data
+      for (const key in recordForm.value) {
+        recordForm.value[key] = res.data[key]
+      }
       if (recordForm.value.taskId === '') {
         recordForm.value.taskId = sessionStorage.getItem('resistanceRecordTaskId')!
       }
@@ -328,12 +351,12 @@
 // ------------------------------------------------审批----------------------------------------
 // 流程审批-拒绝
 const approvalRefuseHandler = () => {
-  approvalDialog.value.initDialog('refuse', recordForm.value.id, recordForm.value.taskId || route.query.taskId, '')
+  approvalDialog.value.initDialog('refuse', recordForm.value.taskId || route.query.taskId, recordForm.value.id)
 }
 
 // 流程审批-同意
 const approvalAgreeHandler = () => {
-  approvalDialog.value.initDialog('agree', recordForm.value.id, recordForm.value.taskId || route.query.taskId, '')
+  approvalDialog.value.initDialog('agree', recordForm.value.taskId || route.query.taskId, recordForm.value.id, recordForm.value.processId || route.query.processId)
 }
 
 // 取消流程
@@ -393,7 +416,12 @@
 }
 
 // 拒绝
-const refuseHandler = (param: any) => {
+const refuseHandler = (comments: string, taskId: string, id: string) => {
+  const param = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
   refuseApprovalResistance(param).then((res) => {
     if (res.code === 200) {
       ElMessage.success('拒绝审批完成')
@@ -401,9 +429,6 @@
     else {
       ElMessage.error(`拒绝审批失败：${res.message}`)
     }
-    // 关闭弹窗
-    approvalDialog.value.handleClose()
-
     flowButtsVisable.value = false
   })
 }
@@ -661,10 +686,14 @@
       </detail-block>
     </el-form>
 
-    <approval-dialog
+    <!-- <approval-dialog
       ref="approvalDialog"
       @on-success="approvalSuccessHandler" @on-refuse="refuseHandler" @on-revoke="revokeHandler"
-    />
+    /> -->
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialog" :last-name="customApproval.approvalLastName.resistance" @on-success="approvalSuccessHandler" @refuse="refuseHandler" />
+    <!-- 选择审批人弹窗 -->
+    <select-approver-dialog ref="selectApproverRef" @confirm="confirmSelectApprover" />
 
     <template v-if="current === 'resistance-approval' && status !== '1'">
       <approval-record-table :process-id="recordForm.processId" />
diff --git a/src/views/resource/environment/resistance/list.vue b/src/views/resource/environment/resistance/list.vue
index f3e768e..439b574 100644
--- a/src/views/resource/environment/resistance/list.vue
+++ b/src/views/resource/environment/resistance/list.vue
@@ -3,7 +3,7 @@
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IListQuery, IResistanceRecord } from './resistance-interface'
-import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -13,7 +13,8 @@
 import { exportFile } from '@/utils/exportUtils'
 import { printPdf } from '@/utils/printUtils'
 import useBridgeCount from '@/components/buttonBox/useBridgeCount'
-
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
+import customApproval from '/public/config/customApproval.json'
 // 定义常量
 const buttonBoxActive = 'labResistanceRecordApproval' // 存储在sessionstorage里面的字段名，用于记录右上角buttonbox点击状态
 
@@ -240,12 +241,12 @@
 
 // 流程审批-同意
 const approvalAgreeHandler = (row: IResistanceRecord) => {
-  apprDial.value.initDialog('agree', row.id, row.taskId, '')
+  apprDial.value.initDialog('agree', row.taskId, row.id, row.processId)
 }
 
 // 流程审批-拒绝
 const approvalRefuseHandler = (row: IResistanceRecord) => {
-  apprDial.value.initDialog('refuse', row.id, row.taskId, '')
+  apprDial.value.initDialog('refuse', row.taskId, row.id)
 }
 
 // 取消（撤回审批单）
@@ -287,7 +288,12 @@
 }
 
 // 拒绝
-const refuseHandler = (param: any) => {
+const refuseHandler = (comments: string, taskId: string, id: string) => {
+  const param = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
   refuseApprovalResistance(param).then((res) => {
     if (res.code === 200) {
       ElMessage.success('拒绝审批完成')
@@ -295,8 +301,6 @@
     else {
       ElMessage.error(`拒绝审批失败：${res.message}`)
     }
-    // 关闭弹窗
-    apprDial.value.handleClose()
 
     fetchData(true)
   })
@@ -505,10 +509,18 @@
     </table-container>
 
     <!-- 审批单弹窗 -->
-    <approval-dialog
+    <!-- <approval-dialog
       ref="apprDial"
       @on-success="afterApprovalHandler"
       @on-refuse="refuseHandler"
+    /> -->
+
+    <!-- 审批弹窗-审批人自选 -->
+    <approval-dialog
+      ref="apprDial"
+      :last-name="customApproval.approvalLastName.resistance"
+      @on-success="afterApprovalHandler"
+      @refuse="refuseHandler"
     />
 
     <!-- 右上角按钮集合 -->
diff --git a/src/views/resource/file/change/detail.vue b/src/views/resource/file/change/detail.vue
index 3efc9ab..a0c7c5d 100644
--- a/src/views/resource/file/change/detail.vue
+++ b/src/views/resource/file/change/detail.vue
@@ -5,7 +5,9 @@
 import FileSelectDialog from './dialog/selectSysFileDialog.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
+import customApproval from '/public/config/customApproval.json'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
 import useUserStore from '@/store/modules/user' // 用户信息
 
@@ -292,8 +294,14 @@
   })
 }
 
-// 提交按钮
-const submitButtonHandler = async () => {
+// -----------------------------------提交-------------------------------------------------------
+const selectApproverRef = ref() // 审批人自选组件ref
+// 选好审批人
+const confirmSelectApprover = async (approverList: string[] = []) => {
+  if (!approverList.length) {
+    ElMessage.warning('无审批人，无法提交！')
+    return false
+  }
   if (changeForm.value === null || changeForm.value.processId === undefined || changeForm.value.processId === '') {
     // 流程id为空 表示还未进入流程中 直接提交
     ElMessageBox.confirm(`是否提交文件更改申请单 ${changeForm.value.formNo}`, '提示', {
@@ -309,6 +317,8 @@
       submitChangeForm({
         formId: flowFormId,
         id: changeForm.value.id,
+        processId: changeForm.value.processId,
+        assignees: approverList,
       }).then((res) => {
         if (res.code === 200) {
           ElMessage.success('提交成功')
@@ -333,7 +343,12 @@
           text: '加载中...',
           background: 'rgba(255, 255, 255, 0.6)',
         })
-        failUpdateChangeForm(changeForm.value).then((res) => {
+        const params = {
+          ...changeForm.value,
+          processId: changeForm.value.processId,
+          assignees: approverList,
+        }
+        failUpdateChangeForm(params).then((res) => {
           if (res.code === 200) {
           // 提示保存成功
             ElMessage.success('提交成功')
@@ -354,7 +369,11 @@
     })
   }
 }
-
+// 提交按钮
+const submitButtonHandler = () => {
+  selectApproverRef.value.initDialog()
+}
+// ----------------------------------------------------------------------------------------------
 // 选定文件返回
 const appendFileToList = (listParam: any) => {
   listParam.forEach((item: any) => {
@@ -374,12 +393,12 @@
 
 // 流程审批-同意
 const approvalAgreeHandler = () => {
-  apprDial.value.initDialog('agree', changeForm.value.id, changeForm.value.taskId || route.query.taskId, '')
+  apprDial.value.initDialog('agree', changeForm.value.taskId || route.query.taskId, changeForm.value.id, changeForm.value.processId || route.query.processId)
 }
 
 // 流程审批-拒绝
 const approvalRefuseHandler = () => {
-  apprDial.value.initDialog('refuse', changeForm.value.id, changeForm.value.taskId || route.query.taskId, '')
+  apprDial.value.initDialog('refuse', changeForm.value.taskId || route.query.taskId, changeForm.value.id)
 }
 
 // 取消（撤回审批单）
@@ -443,7 +462,12 @@
 }
 
 // 拒绝
-const refuseHandler = (param: any) => {
+const refuseHandler = (comments: string, taskId: string, id: string) => {
+  const param = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
   refuseApproval(param).then((res) => {
     if (res.code === 200) {
       ElMessage.success('拒绝审批完成')
@@ -451,9 +475,6 @@
     else {
       ElMessage.error(`拒绝审批失败：${res.message}`)
     }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
     flowButtsVisable.value = false
   })
 }
@@ -710,11 +731,15 @@
       </detail-block>
     </el-form>
 
-    <approval-dialog
+    <!-- <approval-dialog
       ref="apprDial"
       @on-success="approvalSuccessHandler"
       @on-refuse="refuseHandler"
-    />
+    /> -->
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="apprDial" :last-name="customApproval.approvalLastName.fileChange" @on-success="approvalSuccessHandler" @refuse="refuseHandler" />
+    <!-- 选择审批人弹窗 -->
+    <select-approver-dialog ref="selectApproverRef" @confirm="confirmSelectApprover" />
 
     <file-select-dialog ref="refFileSelect" @confirm="appendFileToList" />
 
diff --git a/src/views/resource/file/change/list.vue b/src/views/resource/file/change/list.vue
index 71d8624..d6c4606 100644
--- a/src/views/resource/file/change/list.vue
+++ b/src/views/resource/file/change/list.vue
@@ -3,7 +3,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { DateModelType } from 'element-plus'
 import type { IFileChangeForm, IListQuery } from './change-interface'
-import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { deptType } from '@/global'
@@ -11,6 +11,8 @@
 import { getDictByCode } from '@/api/system/dict'
 import { draftDelete, exportFileChangeList, getFileChangeFormList, refuseApproval, revokeApproval, revokeDelete } from '@/api/resource/fileChange'
 import useBridgeCount from '@/components/buttonBox/useBridgeCount'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
+import customApproval from '/public/config/customApproval.json'
 
 // 定义常量
 const buttonBoxActive = 'fileChangeApproval' // 存储在sessionstorage里面的字段名，用于记录右上角buttonbox点击状态
@@ -280,12 +282,12 @@
 
 // 流程审批-同意
 const approvalAgreeHandler = (row: IFileChangeForm) => {
-  apprDial.value.initDialog('agree', row.id, row.taskId, '')
+  apprDial.value.initDialog('agree', row.taskId, row.id, row.processId)
 }
 
 // 流程审批-拒绝
 const approvalRefuseHandler = (row: IFileChangeForm) => {
-  apprDial.value.initDialog('refuse', row.id, row.taskId, '')
+  apprDial.value.initDialog('refuse', row.taskId, row.id)
 }
 
 // 取消（撤回审批单）
@@ -321,7 +323,12 @@
 }
 
 // 拒绝
-const changeFormRefuseHandler = (param: any) => {
+const changeFormRefuseHandler = (comments: string, taskId: string, id: string) => {
+  const param = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
   refuseApproval(param).then((res) => {
     if (res.code === 200) {
       ElMessage.success('拒绝审批完成')
@@ -329,9 +336,6 @@
     else {
       ElMessage.error(`拒绝审批失败：${res.message}`)
     }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
     fetchData(true)
   })
 }
@@ -551,12 +555,19 @@
     </table-container>
 
     <!-- 审批单弹窗 -->
-    <approval-dialog
+    <!-- <approval-dialog
       ref="apprDial"
       @on-success="afterApprovalHandler"
       @on-refuse="changeFormRefuseHandler"
-    />
+    /> -->
 
+    <!-- 审批弹窗-审批人自选 -->
+    <approval-dialog
+      ref="apprDial"
+      :last-name="customApproval.approvalLastName.fileChange"
+      @on-success="afterApprovalHandler"
+      @refuse="changeFormRefuseHandler"
+    />
     <!-- 右上角按钮集合 -->
     <button-box :active="active" :total-refuse="totalRefuse" :total-approval="totalApproval" :total-to-approval="totalToApproval" :menu="menu" @change-current-button="changeCurrentButton" />
   </app-container>

diff --git a/public/config/customApproval.json b/public/config/customApproval.json
index 205ac21..d69296d 100644
--- a/public/config/customApproval.json
+++ b/public/config/customApproval.json
@@ -1,7 +1,22 @@
 {
-  "approvalLastNameDescribe": "审批流程最后一个节点的名字，用来判断审批自选的时候是否是最后一个节点",
+  "approvalLastName--Describe": "审批流程最后一个节点的名字，用来判断审批自选的时候是否是最后一个节点",
   "approvalLastName": {
-    "standardCheckRecordDescribe": "核查记录",
-    "standardCheckRecord": "技术负责人"
+    "standardCheckRecord--Describe": "核查记录",
+    "standardCheckRecord": "技术负责人",
+
+    "noveltySearch--Describe": "测试校准检定方法查新记录表",
+    "noveltySearch": "审核人",
+
+    "fileChange--Describe": "文件更改申请单",
+    "fileChange": "主任",
+
+    "methodConfirm--Describe": "方法确认登记表",
+    "methodConfirm": "技术负责人",
+
+    "softwareReviewReport--Describe": "软件评审报告",
+    "softwareReviewReport": "技术负责人",
+
+    "resistance--Describe": "实验室接地电阻记录",
+    "resistance": "审核人"
   }
 }
diff --git a/src/views/resource/environment/resistance/edit.vue b/src/views/resource/environment/resistance/edit.vue
index dd62bd1..fd06d64 100644
--- a/src/views/resource/environment/resistance/edit.vue
+++ b/src/views/resource/environment/resistance/edit.vue
@@ -2,7 +2,9 @@
 <script name="EnvironmentResistanceDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IResistanceRecord } from './resistance-interface'
-import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
+import customApproval from '/public/config/customApproval.json'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { detailResistance, draftDeleteResistance, failUpdateResistance, refuseApprovalResistance, revokeApprovalResistance, saveResistance, submitResistance, updateResistance } from '@/api/resource/environmentTest'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
@@ -37,7 +39,7 @@
 const approvalDialog = ref()
 const testRecordRef = ref()
 
-const recordForm = ref<IResistanceRecord>({
+const recordForm: any = ref({
   id: '',
   recordNo: '',
   recordName: '实验室接地电阻记录',
@@ -241,9 +243,14 @@
     }
   })
 }
-
-// 提交按钮
-const submitButtonHandler = async () => {
+// -----------------------------------提交-------------------------------------------------------
+const selectApproverRef = ref() // 审批人自选组件ref
+// 选好审批人
+const confirmSelectApprover = async (approverList: string[] = []) => {
+  if (!approverList.length) {
+    ElMessage.warning('无审批人，无法提交！')
+    return false
+  }
   if (recordForm.value === null || recordForm.value.processId === undefined || recordForm.value.processId === '') {
     // 流程id为空 表示还未进入流程中 直接提交
     ElMessageBox.confirm(`是否提交实验室接地电阻记录 ${recordForm.value.recordNo}`, '提示', {
@@ -259,6 +266,8 @@
       submitResistance({
         formId: SCHEDULE.LAB_RESISTANCE_RECORD_APPROVAL,
         id: recordForm.value.id,
+        processId: recordForm.value.processId,
+        assignees: approverList,
       }).then((res) => {
         if (res.code === 200) {
           ElMessage.success(`实验室接地电阻记录 ${recordForm.value.recordNo} 提交成功`)
@@ -282,7 +291,12 @@
           text: '加载中...',
           background: 'rgba(255, 255, 255, 0.6)',
         })
-        failUpdateResistance(recordForm.value).then((res) => {
+        const params = {
+          ...recordForm.value,
+          processId: recordForm.value.processId,
+          assignees: approverList,
+        }
+        failUpdateResistance(params).then((res) => {
           if (res.code === 200) {
           // 提示保存成功
             ElMessage.success('保存成功')
@@ -302,6 +316,12 @@
     })
   }
 }
+// 提交按钮
+const submitButtonHandler = () => {
+  selectApproverRef.value.initDialog()
+}
+
+// ---------------------------------------------------------------------------------------------
 
 // 根据id查询详情
 const detailById = async (id: string) => {
@@ -312,7 +332,10 @@
   })
   await detailResistance({ id }).then((res) => {
     if (res.code === 200) {
-      recordForm.value = res.data
+      // recordForm.value = res.data
+      for (const key in recordForm.value) {
+        recordForm.value[key] = res.data[key]
+      }
       if (recordForm.value.taskId === '') {
         recordForm.value.taskId = sessionStorage.getItem('resistanceRecordTaskId')!
       }
@@ -328,12 +351,12 @@
 // ------------------------------------------------审批----------------------------------------
 // 流程审批-拒绝
 const approvalRefuseHandler = () => {
-  approvalDialog.value.initDialog('refuse', recordForm.value.id, recordForm.value.taskId || route.query.taskId, '')
+  approvalDialog.value.initDialog('refuse', recordForm.value.taskId || route.query.taskId, recordForm.value.id)
 }
 
 // 流程审批-同意
 const approvalAgreeHandler = () => {
-  approvalDialog.value.initDialog('agree', recordForm.value.id, recordForm.value.taskId || route.query.taskId, '')
+  approvalDialog.value.initDialog('agree', recordForm.value.taskId || route.query.taskId, recordForm.value.id, recordForm.value.processId || route.query.processId)
 }
 
 // 取消流程
@@ -393,7 +416,12 @@
 }
 
 // 拒绝
-const refuseHandler = (param: any) => {
+const refuseHandler = (comments: string, taskId: string, id: string) => {
+  const param = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
   refuseApprovalResistance(param).then((res) => {
     if (res.code === 200) {
       ElMessage.success('拒绝审批完成')
@@ -401,9 +429,6 @@
     else {
       ElMessage.error(`拒绝审批失败：${res.message}`)
     }
-    // 关闭弹窗
-    approvalDialog.value.handleClose()
-
     flowButtsVisable.value = false
   })
 }
@@ -661,10 +686,14 @@
       </detail-block>
     </el-form>
 
-    <approval-dialog
+    <!-- <approval-dialog
       ref="approvalDialog"
       @on-success="approvalSuccessHandler" @on-refuse="refuseHandler" @on-revoke="revokeHandler"
-    />
+    /> -->
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialog" :last-name="customApproval.approvalLastName.resistance" @on-success="approvalSuccessHandler" @refuse="refuseHandler" />
+    <!-- 选择审批人弹窗 -->
+    <select-approver-dialog ref="selectApproverRef" @confirm="confirmSelectApprover" />
 
     <template v-if="current === 'resistance-approval' && status !== '1'">
       <approval-record-table :process-id="recordForm.processId" />
diff --git a/src/views/resource/environment/resistance/list.vue b/src/views/resource/environment/resistance/list.vue
index f3e768e..439b574 100644
--- a/src/views/resource/environment/resistance/list.vue
+++ b/src/views/resource/environment/resistance/list.vue
@@ -3,7 +3,7 @@
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IListQuery, IResistanceRecord } from './resistance-interface'
-import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -13,7 +13,8 @@
 import { exportFile } from '@/utils/exportUtils'
 import { printPdf } from '@/utils/printUtils'
 import useBridgeCount from '@/components/buttonBox/useBridgeCount'
-
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
+import customApproval from '/public/config/customApproval.json'
 // 定义常量
 const buttonBoxActive = 'labResistanceRecordApproval' // 存储在sessionstorage里面的字段名，用于记录右上角buttonbox点击状态
 
@@ -240,12 +241,12 @@
 
 // 流程审批-同意
 const approvalAgreeHandler = (row: IResistanceRecord) => {
-  apprDial.value.initDialog('agree', row.id, row.taskId, '')
+  apprDial.value.initDialog('agree', row.taskId, row.id, row.processId)
 }
 
 // 流程审批-拒绝
 const approvalRefuseHandler = (row: IResistanceRecord) => {
-  apprDial.value.initDialog('refuse', row.id, row.taskId, '')
+  apprDial.value.initDialog('refuse', row.taskId, row.id)
 }
 
 // 取消（撤回审批单）
@@ -287,7 +288,12 @@
 }
 
 // 拒绝
-const refuseHandler = (param: any) => {
+const refuseHandler = (comments: string, taskId: string, id: string) => {
+  const param = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
   refuseApprovalResistance(param).then((res) => {
     if (res.code === 200) {
       ElMessage.success('拒绝审批完成')
@@ -295,8 +301,6 @@
     else {
       ElMessage.error(`拒绝审批失败：${res.message}`)
     }
-    // 关闭弹窗
-    apprDial.value.handleClose()
 
     fetchData(true)
   })
@@ -505,10 +509,18 @@
     </table-container>
 
     <!-- 审批单弹窗 -->
-    <approval-dialog
+    <!-- <approval-dialog
       ref="apprDial"
       @on-success="afterApprovalHandler"
       @on-refuse="refuseHandler"
+    /> -->
+
+    <!-- 审批弹窗-审批人自选 -->
+    <approval-dialog
+      ref="apprDial"
+      :last-name="customApproval.approvalLastName.resistance"
+      @on-success="afterApprovalHandler"
+      @refuse="refuseHandler"
     />
 
     <!-- 右上角按钮集合 -->
diff --git a/src/views/resource/file/change/detail.vue b/src/views/resource/file/change/detail.vue
index 3efc9ab..a0c7c5d 100644
--- a/src/views/resource/file/change/detail.vue
+++ b/src/views/resource/file/change/detail.vue
@@ -5,7 +5,9 @@
 import FileSelectDialog from './dialog/selectSysFileDialog.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
+import customApproval from '/public/config/customApproval.json'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
 import useUserStore from '@/store/modules/user' // 用户信息
 
@@ -292,8 +294,14 @@
   })
 }
 
-// 提交按钮
-const submitButtonHandler = async () => {
+// -----------------------------------提交-------------------------------------------------------
+const selectApproverRef = ref() // 审批人自选组件ref
+// 选好审批人
+const confirmSelectApprover = async (approverList: string[] = []) => {
+  if (!approverList.length) {
+    ElMessage.warning('无审批人，无法提交！')
+    return false
+  }
   if (changeForm.value === null || changeForm.value.processId === undefined || changeForm.value.processId === '') {
     // 流程id为空 表示还未进入流程中 直接提交
     ElMessageBox.confirm(`是否提交文件更改申请单 ${changeForm.value.formNo}`, '提示', {
@@ -309,6 +317,8 @@
       submitChangeForm({
         formId: flowFormId,
         id: changeForm.value.id,
+        processId: changeForm.value.processId,
+        assignees: approverList,
       }).then((res) => {
         if (res.code === 200) {
           ElMessage.success('提交成功')
@@ -333,7 +343,12 @@
           text: '加载中...',
           background: 'rgba(255, 255, 255, 0.6)',
         })
-        failUpdateChangeForm(changeForm.value).then((res) => {
+        const params = {
+          ...changeForm.value,
+          processId: changeForm.value.processId,
+          assignees: approverList,
+        }
+        failUpdateChangeForm(params).then((res) => {
           if (res.code === 200) {
           // 提示保存成功
             ElMessage.success('提交成功')
@@ -354,7 +369,11 @@
     })
   }
 }
-
+// 提交按钮
+const submitButtonHandler = () => {
+  selectApproverRef.value.initDialog()
+}
+// ----------------------------------------------------------------------------------------------
 // 选定文件返回
 const appendFileToList = (listParam: any) => {
   listParam.forEach((item: any) => {
@@ -374,12 +393,12 @@
 
 // 流程审批-同意
 const approvalAgreeHandler = () => {
-  apprDial.value.initDialog('agree', changeForm.value.id, changeForm.value.taskId || route.query.taskId, '')
+  apprDial.value.initDialog('agree', changeForm.value.taskId || route.query.taskId, changeForm.value.id, changeForm.value.processId || route.query.processId)
 }
 
 // 流程审批-拒绝
 const approvalRefuseHandler = () => {
-  apprDial.value.initDialog('refuse', changeForm.value.id, changeForm.value.taskId || route.query.taskId, '')
+  apprDial.value.initDialog('refuse', changeForm.value.taskId || route.query.taskId, changeForm.value.id)
 }
 
 // 取消（撤回审批单）
@@ -443,7 +462,12 @@
 }
 
 // 拒绝
-const refuseHandler = (param: any) => {
+const refuseHandler = (comments: string, taskId: string, id: string) => {
+  const param = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
   refuseApproval(param).then((res) => {
     if (res.code === 200) {
       ElMessage.success('拒绝审批完成')
@@ -451,9 +475,6 @@
     else {
       ElMessage.error(`拒绝审批失败：${res.message}`)
     }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
     flowButtsVisable.value = false
   })
 }
@@ -710,11 +731,15 @@
       </detail-block>
     </el-form>
 
-    <approval-dialog
+    <!-- <approval-dialog
       ref="apprDial"
       @on-success="approvalSuccessHandler"
       @on-refuse="refuseHandler"
-    />
+    /> -->
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="apprDial" :last-name="customApproval.approvalLastName.fileChange" @on-success="approvalSuccessHandler" @refuse="refuseHandler" />
+    <!-- 选择审批人弹窗 -->
+    <select-approver-dialog ref="selectApproverRef" @confirm="confirmSelectApprover" />
 
     <file-select-dialog ref="refFileSelect" @confirm="appendFileToList" />
 
diff --git a/src/views/resource/file/change/list.vue b/src/views/resource/file/change/list.vue
index 71d8624..d6c4606 100644
--- a/src/views/resource/file/change/list.vue
+++ b/src/views/resource/file/change/list.vue
@@ -3,7 +3,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { DateModelType } from 'element-plus'
 import type { IFileChangeForm, IListQuery } from './change-interface'
-import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { deptType } from '@/global'
@@ -11,6 +11,8 @@
 import { getDictByCode } from '@/api/system/dict'
 import { draftDelete, exportFileChangeList, getFileChangeFormList, refuseApproval, revokeApproval, revokeDelete } from '@/api/resource/fileChange'
 import useBridgeCount from '@/components/buttonBox/useBridgeCount'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
+import customApproval from '/public/config/customApproval.json'
 
 // 定义常量
 const buttonBoxActive = 'fileChangeApproval' // 存储在sessionstorage里面的字段名，用于记录右上角buttonbox点击状态
@@ -280,12 +282,12 @@
 
 // 流程审批-同意
 const approvalAgreeHandler = (row: IFileChangeForm) => {
-  apprDial.value.initDialog('agree', row.id, row.taskId, '')
+  apprDial.value.initDialog('agree', row.taskId, row.id, row.processId)
 }
 
 // 流程审批-拒绝
 const approvalRefuseHandler = (row: IFileChangeForm) => {
-  apprDial.value.initDialog('refuse', row.id, row.taskId, '')
+  apprDial.value.initDialog('refuse', row.taskId, row.id)
 }
 
 // 取消（撤回审批单）
@@ -321,7 +323,12 @@
 }
 
 // 拒绝
-const changeFormRefuseHandler = (param: any) => {
+const changeFormRefuseHandler = (comments: string, taskId: string, id: string) => {
+  const param = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
   refuseApproval(param).then((res) => {
     if (res.code === 200) {
       ElMessage.success('拒绝审批完成')
@@ -329,9 +336,6 @@
     else {
       ElMessage.error(`拒绝审批失败：${res.message}`)
     }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
     fetchData(true)
   })
 }
@@ -551,12 +555,19 @@
     </table-container>
 
     <!-- 审批单弹窗 -->
-    <approval-dialog
+    <!-- <approval-dialog
       ref="apprDial"
       @on-success="afterApprovalHandler"
       @on-refuse="changeFormRefuseHandler"
-    />
+    /> -->
 
+    <!-- 审批弹窗-审批人自选 -->
+    <approval-dialog
+      ref="apprDial"
+      :last-name="customApproval.approvalLastName.fileChange"
+      @on-success="afterApprovalHandler"
+      @refuse="changeFormRefuseHandler"
+    />
     <!-- 右上角按钮集合 -->
     <button-box :active="active" :total-refuse="totalRefuse" :total-approval="totalApproval" :total-to-approval="totalToApproval" :menu="menu" @change-current-button="changeCurrentButton" />
   </app-container>
diff --git a/src/views/resource/file/methodConfirm/detail.vue b/src/views/resource/file/methodConfirm/detail.vue
index f38d52c..949e446 100644
--- a/src/views/resource/file/methodConfirm/detail.vue
+++ b/src/views/resource/file/methodConfirm/detail.vue
@@ -8,7 +8,9 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IFileInfo as IMethodFileInfo } from '@/views/resource/technology/method/method-interface'
 import { getFileMethodList } from '@/api/resource/fileTechnology'
-import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
+import customApproval from '/public/config/customApproval.json'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
@@ -269,8 +271,14 @@
   })
 }
 
-// 提交按钮
-const submitButtonHandler = async () => {
+// -----------------------------------提交-------------------------------------------------------
+const selectApproverRef = ref() // 审批人自选组件ref
+// 选好审批人
+const confirmSelectApprover = async (approverList: string[] = []) => {
+  if (!approverList.length) {
+    ElMessage.warning('无审批人，无法提交！')
+    return false
+  }
   if (methodConfirm.value === null || methodConfirm.value.processId === undefined || methodConfirm.value.processId === '') {
     // 流程id为空 表示还未进入流程中 直接提交
     ElMessageBox.confirm(`是否提交方法确认登记表 ${methodConfirm.value.formNo}`, '提示', {
@@ -281,6 +289,8 @@
       submitMethodConfirm({
         formId: flowFormId,
         id: methodConfirm.value.id,
+        processId: methodConfirm.value.processId,
+        assignees: approverList,
       }).then((res) => {
         if (res.code === 200) {
           ElMessage.success(`方法确认登记表 ${methodConfirm.value.formNo} 提交成功`)
@@ -298,7 +308,12 @@
     // 之前已经在流程中的表单 保存提交
     await methodConfirmRef.value.validate((valid: boolean) => {
       if (valid === true) {
-        failUpdateMethodConfirm(methodConfirm.value).then((res) => {
+        const param = {
+          ...methodConfirm.value,
+          processId: methodConfirm.value.processId,
+          assignees: approverList,
+        }
+        failUpdateMethodConfirm(param).then((res) => {
           if (res.code === 200) {
             // 提示保存成功
             ElMessage.success(`方法确认登记表 ${methodConfirm.value.formNo} 提交成功`)
@@ -315,6 +330,11 @@
     })
   }
 }
+// 提交按钮
+const submitButtonHandler = () => {
+  selectApproverRef.value.initDialog()
+}
+// -----------------------------------提交-------------------------------------------------------
 
 // 显示筛选委托方名录的弹窗
 const showFilterMethod = () => {
@@ -378,17 +398,30 @@
 }
 // 流程审批-同意
 const approvalAgreeHandler = () => {
-  apprDial.value.initDialog('agree', methodConfirm.value.id, methodConfirm.value.taskId || route.query.taskId, '')
+  apprDial.value.initDialog('agree', methodConfirm.value.taskId || route.query.taskId, methodConfirm.value.id, methodConfirm.value.processId || route.query.processId)
 }
 
 // 流程审批-拒绝
 const approvalRefuseHandler = () => {
-  apprDial.value.initDialog('refuse', methodConfirm.value.id, methodConfirm.value.taskId || route.query.taskId, '')
+  apprDial.value.initDialog('refuse', methodConfirm.value.taskId || route.query.taskId, methodConfirm.value.id)
 }
 
 // 取消（撤回审批单）
 const revokeClickedHandler = () => {
-  apprDial.value.initDialog('revoke', methodConfirm.value.id, methodConfirm.value.taskId || route.query.taskId, methodConfirm.value.processId || route.query.processId)
+  const param = {
+    processInstanceId: methodConfirm.value.processId || route.query.processId!,
+    comments: '',
+    id: id.value,
+  }
+  revokeApproval(param).then((res) => {
+    if (res.code === 200) {
+      ElMessage.success('流程取消成功')
+    }
+    else {
+      ElMessage.error(`流程取消失败：${res.message}`)
+    }
+    cancelButtVisable.value = false
+  })
 }
 
 // 删除（只有已取消的可以在详情中删除）
@@ -424,24 +457,13 @@
   }
 }
 
-// 取消
-const revokeHandler = (param: any) => {
-  revokeApproval(param).then((res) => {
-    if (res.code === 200) {
-      ElMessage.success('流程取消成功')
-    }
-    else {
-      ElMessage.error(`流程取消失败：${res.message}`)
-    }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
-    cancelButtVisable.value = false
-  })
-}
-
 // 拒绝
-const refuseHandler = (param: any) => {
+const refuseHandler = (comments: string, taskId: string, id: string) => {
+  const param = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
   refuseApproval(param).then((res) => {
     if (res.code === 200) {
       ElMessage.success('拒绝审批完成')
@@ -449,9 +471,6 @@
     else {
       ElMessage.error(`拒绝审批失败：${res.message}`)
     }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
     flowButtsVisable.value = false
   })
 }
@@ -867,10 +886,15 @@
       </template>
     </el-form>
 
-    <approval-dialog
+    <!-- <approval-dialog
       ref="apprDial" @on-success="approvalSuccessHandler" @on-refuse="refuseHandler"
       @on-revoke="revokeHandler"
-    />
+    /> -->
+
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="apprDial" :last-name="customApproval.approvalLastName.methodConfirm" @on-success="approvalSuccessHandler" @refuse="refuseHandler" />
+    <!-- 选择审批人弹窗 -->
+    <select-approver-dialog ref="selectApproverRef" @confirm="confirmSelectApprover" />
 
     <file-select-dialog ref="refFileSelect" @confirm="methodFileSelected" />
 

diff --git a/public/config/customApproval.json b/public/config/customApproval.json
index 205ac21..d69296d 100644
--- a/public/config/customApproval.json
+++ b/public/config/customApproval.json
@@ -1,7 +1,22 @@
 {
-  "approvalLastNameDescribe": "审批流程最后一个节点的名字，用来判断审批自选的时候是否是最后一个节点",
+  "approvalLastName--Describe": "审批流程最后一个节点的名字，用来判断审批自选的时候是否是最后一个节点",
   "approvalLastName": {
-    "standardCheckRecordDescribe": "核查记录",
-    "standardCheckRecord": "技术负责人"
+    "standardCheckRecord--Describe": "核查记录",
+    "standardCheckRecord": "技术负责人",
+
+    "noveltySearch--Describe": "测试校准检定方法查新记录表",
+    "noveltySearch": "审核人",
+
+    "fileChange--Describe": "文件更改申请单",
+    "fileChange": "主任",
+
+    "methodConfirm--Describe": "方法确认登记表",
+    "methodConfirm": "技术负责人",
+
+    "softwareReviewReport--Describe": "软件评审报告",
+    "softwareReviewReport": "技术负责人",
+
+    "resistance--Describe": "实验室接地电阻记录",
+    "resistance": "审核人"
   }
 }
diff --git a/src/views/resource/environment/resistance/edit.vue b/src/views/resource/environment/resistance/edit.vue
index dd62bd1..fd06d64 100644
--- a/src/views/resource/environment/resistance/edit.vue
+++ b/src/views/resource/environment/resistance/edit.vue
@@ -2,7 +2,9 @@
 <script name="EnvironmentResistanceDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IResistanceRecord } from './resistance-interface'
-import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
+import customApproval from '/public/config/customApproval.json'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { detailResistance, draftDeleteResistance, failUpdateResistance, refuseApprovalResistance, revokeApprovalResistance, saveResistance, submitResistance, updateResistance } from '@/api/resource/environmentTest'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
@@ -37,7 +39,7 @@
 const approvalDialog = ref()
 const testRecordRef = ref()
 
-const recordForm = ref<IResistanceRecord>({
+const recordForm: any = ref({
   id: '',
   recordNo: '',
   recordName: '实验室接地电阻记录',
@@ -241,9 +243,14 @@
     }
   })
 }
-
-// 提交按钮
-const submitButtonHandler = async () => {
+// -----------------------------------提交-------------------------------------------------------
+const selectApproverRef = ref() // 审批人自选组件ref
+// 选好审批人
+const confirmSelectApprover = async (approverList: string[] = []) => {
+  if (!approverList.length) {
+    ElMessage.warning('无审批人，无法提交！')
+    return false
+  }
   if (recordForm.value === null || recordForm.value.processId === undefined || recordForm.value.processId === '') {
     // 流程id为空 表示还未进入流程中 直接提交
     ElMessageBox.confirm(`是否提交实验室接地电阻记录 ${recordForm.value.recordNo}`, '提示', {
@@ -259,6 +266,8 @@
       submitResistance({
         formId: SCHEDULE.LAB_RESISTANCE_RECORD_APPROVAL,
         id: recordForm.value.id,
+        processId: recordForm.value.processId,
+        assignees: approverList,
       }).then((res) => {
         if (res.code === 200) {
           ElMessage.success(`实验室接地电阻记录 ${recordForm.value.recordNo} 提交成功`)
@@ -282,7 +291,12 @@
           text: '加载中...',
           background: 'rgba(255, 255, 255, 0.6)',
         })
-        failUpdateResistance(recordForm.value).then((res) => {
+        const params = {
+          ...recordForm.value,
+          processId: recordForm.value.processId,
+          assignees: approverList,
+        }
+        failUpdateResistance(params).then((res) => {
           if (res.code === 200) {
           // 提示保存成功
             ElMessage.success('保存成功')
@@ -302,6 +316,12 @@
     })
   }
 }
+// 提交按钮
+const submitButtonHandler = () => {
+  selectApproverRef.value.initDialog()
+}
+
+// ---------------------------------------------------------------------------------------------
 
 // 根据id查询详情
 const detailById = async (id: string) => {
@@ -312,7 +332,10 @@
   })
   await detailResistance({ id }).then((res) => {
     if (res.code === 200) {
-      recordForm.value = res.data
+      // recordForm.value = res.data
+      for (const key in recordForm.value) {
+        recordForm.value[key] = res.data[key]
+      }
       if (recordForm.value.taskId === '') {
         recordForm.value.taskId = sessionStorage.getItem('resistanceRecordTaskId')!
       }
@@ -328,12 +351,12 @@
 // ------------------------------------------------审批----------------------------------------
 // 流程审批-拒绝
 const approvalRefuseHandler = () => {
-  approvalDialog.value.initDialog('refuse', recordForm.value.id, recordForm.value.taskId || route.query.taskId, '')
+  approvalDialog.value.initDialog('refuse', recordForm.value.taskId || route.query.taskId, recordForm.value.id)
 }
 
 // 流程审批-同意
 const approvalAgreeHandler = () => {
-  approvalDialog.value.initDialog('agree', recordForm.value.id, recordForm.value.taskId || route.query.taskId, '')
+  approvalDialog.value.initDialog('agree', recordForm.value.taskId || route.query.taskId, recordForm.value.id, recordForm.value.processId || route.query.processId)
 }
 
 // 取消流程
@@ -393,7 +416,12 @@
 }
 
 // 拒绝
-const refuseHandler = (param: any) => {
+const refuseHandler = (comments: string, taskId: string, id: string) => {
+  const param = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
   refuseApprovalResistance(param).then((res) => {
     if (res.code === 200) {
       ElMessage.success('拒绝审批完成')
@@ -401,9 +429,6 @@
     else {
       ElMessage.error(`拒绝审批失败：${res.message}`)
     }
-    // 关闭弹窗
-    approvalDialog.value.handleClose()
-
     flowButtsVisable.value = false
   })
 }
@@ -661,10 +686,14 @@
       </detail-block>
     </el-form>
 
-    <approval-dialog
+    <!-- <approval-dialog
       ref="approvalDialog"
       @on-success="approvalSuccessHandler" @on-refuse="refuseHandler" @on-revoke="revokeHandler"
-    />
+    /> -->
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialog" :last-name="customApproval.approvalLastName.resistance" @on-success="approvalSuccessHandler" @refuse="refuseHandler" />
+    <!-- 选择审批人弹窗 -->
+    <select-approver-dialog ref="selectApproverRef" @confirm="confirmSelectApprover" />
 
     <template v-if="current === 'resistance-approval' && status !== '1'">
       <approval-record-table :process-id="recordForm.processId" />
diff --git a/src/views/resource/environment/resistance/list.vue b/src/views/resource/environment/resistance/list.vue
index f3e768e..439b574 100644
--- a/src/views/resource/environment/resistance/list.vue
+++ b/src/views/resource/environment/resistance/list.vue
@@ -3,7 +3,7 @@
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IListQuery, IResistanceRecord } from './resistance-interface'
-import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -13,7 +13,8 @@
 import { exportFile } from '@/utils/exportUtils'
 import { printPdf } from '@/utils/printUtils'
 import useBridgeCount from '@/components/buttonBox/useBridgeCount'
-
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
+import customApproval from '/public/config/customApproval.json'
 // 定义常量
 const buttonBoxActive = 'labResistanceRecordApproval' // 存储在sessionstorage里面的字段名，用于记录右上角buttonbox点击状态
 
@@ -240,12 +241,12 @@
 
 // 流程审批-同意
 const approvalAgreeHandler = (row: IResistanceRecord) => {
-  apprDial.value.initDialog('agree', row.id, row.taskId, '')
+  apprDial.value.initDialog('agree', row.taskId, row.id, row.processId)
 }
 
 // 流程审批-拒绝
 const approvalRefuseHandler = (row: IResistanceRecord) => {
-  apprDial.value.initDialog('refuse', row.id, row.taskId, '')
+  apprDial.value.initDialog('refuse', row.taskId, row.id)
 }
 
 // 取消（撤回审批单）
@@ -287,7 +288,12 @@
 }
 
 // 拒绝
-const refuseHandler = (param: any) => {
+const refuseHandler = (comments: string, taskId: string, id: string) => {
+  const param = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
   refuseApprovalResistance(param).then((res) => {
     if (res.code === 200) {
       ElMessage.success('拒绝审批完成')
@@ -295,8 +301,6 @@
     else {
       ElMessage.error(`拒绝审批失败：${res.message}`)
     }
-    // 关闭弹窗
-    apprDial.value.handleClose()
 
     fetchData(true)
   })
@@ -505,10 +509,18 @@
     </table-container>
 
     <!-- 审批单弹窗 -->
-    <approval-dialog
+    <!-- <approval-dialog
       ref="apprDial"
       @on-success="afterApprovalHandler"
       @on-refuse="refuseHandler"
+    /> -->
+
+    <!-- 审批弹窗-审批人自选 -->
+    <approval-dialog
+      ref="apprDial"
+      :last-name="customApproval.approvalLastName.resistance"
+      @on-success="afterApprovalHandler"
+      @refuse="refuseHandler"
     />
 
     <!-- 右上角按钮集合 -->
diff --git a/src/views/resource/file/change/detail.vue b/src/views/resource/file/change/detail.vue
index 3efc9ab..a0c7c5d 100644
--- a/src/views/resource/file/change/detail.vue
+++ b/src/views/resource/file/change/detail.vue
@@ -5,7 +5,9 @@
 import FileSelectDialog from './dialog/selectSysFileDialog.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
+import customApproval from '/public/config/customApproval.json'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
 import useUserStore from '@/store/modules/user' // 用户信息
 
@@ -292,8 +294,14 @@
   })
 }
 
-// 提交按钮
-const submitButtonHandler = async () => {
+// -----------------------------------提交-------------------------------------------------------
+const selectApproverRef = ref() // 审批人自选组件ref
+// 选好审批人
+const confirmSelectApprover = async (approverList: string[] = []) => {
+  if (!approverList.length) {
+    ElMessage.warning('无审批人，无法提交！')
+    return false
+  }
   if (changeForm.value === null || changeForm.value.processId === undefined || changeForm.value.processId === '') {
     // 流程id为空 表示还未进入流程中 直接提交
     ElMessageBox.confirm(`是否提交文件更改申请单 ${changeForm.value.formNo}`, '提示', {
@@ -309,6 +317,8 @@
       submitChangeForm({
         formId: flowFormId,
         id: changeForm.value.id,
+        processId: changeForm.value.processId,
+        assignees: approverList,
       }).then((res) => {
         if (res.code === 200) {
           ElMessage.success('提交成功')
@@ -333,7 +343,12 @@
           text: '加载中...',
           background: 'rgba(255, 255, 255, 0.6)',
         })
-        failUpdateChangeForm(changeForm.value).then((res) => {
+        const params = {
+          ...changeForm.value,
+          processId: changeForm.value.processId,
+          assignees: approverList,
+        }
+        failUpdateChangeForm(params).then((res) => {
           if (res.code === 200) {
           // 提示保存成功
             ElMessage.success('提交成功')
@@ -354,7 +369,11 @@
     })
   }
 }
-
+// 提交按钮
+const submitButtonHandler = () => {
+  selectApproverRef.value.initDialog()
+}
+// ----------------------------------------------------------------------------------------------
 // 选定文件返回
 const appendFileToList = (listParam: any) => {
   listParam.forEach((item: any) => {
@@ -374,12 +393,12 @@
 
 // 流程审批-同意
 const approvalAgreeHandler = () => {
-  apprDial.value.initDialog('agree', changeForm.value.id, changeForm.value.taskId || route.query.taskId, '')
+  apprDial.value.initDialog('agree', changeForm.value.taskId || route.query.taskId, changeForm.value.id, changeForm.value.processId || route.query.processId)
 }
 
 // 流程审批-拒绝
 const approvalRefuseHandler = () => {
-  apprDial.value.initDialog('refuse', changeForm.value.id, changeForm.value.taskId || route.query.taskId, '')
+  apprDial.value.initDialog('refuse', changeForm.value.taskId || route.query.taskId, changeForm.value.id)
 }
 
 // 取消（撤回审批单）
@@ -443,7 +462,12 @@
 }
 
 // 拒绝
-const refuseHandler = (param: any) => {
+const refuseHandler = (comments: string, taskId: string, id: string) => {
+  const param = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
   refuseApproval(param).then((res) => {
     if (res.code === 200) {
       ElMessage.success('拒绝审批完成')
@@ -451,9 +475,6 @@
     else {
       ElMessage.error(`拒绝审批失败：${res.message}`)
     }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
     flowButtsVisable.value = false
   })
 }
@@ -710,11 +731,15 @@
       </detail-block>
     </el-form>
 
-    <approval-dialog
+    <!-- <approval-dialog
       ref="apprDial"
       @on-success="approvalSuccessHandler"
       @on-refuse="refuseHandler"
-    />
+    /> -->
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="apprDial" :last-name="customApproval.approvalLastName.fileChange" @on-success="approvalSuccessHandler" @refuse="refuseHandler" />
+    <!-- 选择审批人弹窗 -->
+    <select-approver-dialog ref="selectApproverRef" @confirm="confirmSelectApprover" />
 
     <file-select-dialog ref="refFileSelect" @confirm="appendFileToList" />
 
diff --git a/src/views/resource/file/change/list.vue b/src/views/resource/file/change/list.vue
index 71d8624..d6c4606 100644
--- a/src/views/resource/file/change/list.vue
+++ b/src/views/resource/file/change/list.vue
@@ -3,7 +3,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { DateModelType } from 'element-plus'
 import type { IFileChangeForm, IListQuery } from './change-interface'
-import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { deptType } from '@/global'
@@ -11,6 +11,8 @@
 import { getDictByCode } from '@/api/system/dict'
 import { draftDelete, exportFileChangeList, getFileChangeFormList, refuseApproval, revokeApproval, revokeDelete } from '@/api/resource/fileChange'
 import useBridgeCount from '@/components/buttonBox/useBridgeCount'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
+import customApproval from '/public/config/customApproval.json'
 
 // 定义常量
 const buttonBoxActive = 'fileChangeApproval' // 存储在sessionstorage里面的字段名，用于记录右上角buttonbox点击状态
@@ -280,12 +282,12 @@
 
 // 流程审批-同意
 const approvalAgreeHandler = (row: IFileChangeForm) => {
-  apprDial.value.initDialog('agree', row.id, row.taskId, '')
+  apprDial.value.initDialog('agree', row.taskId, row.id, row.processId)
 }
 
 // 流程审批-拒绝
 const approvalRefuseHandler = (row: IFileChangeForm) => {
-  apprDial.value.initDialog('refuse', row.id, row.taskId, '')
+  apprDial.value.initDialog('refuse', row.taskId, row.id)
 }
 
 // 取消（撤回审批单）
@@ -321,7 +323,12 @@
 }
 
 // 拒绝
-const changeFormRefuseHandler = (param: any) => {
+const changeFormRefuseHandler = (comments: string, taskId: string, id: string) => {
+  const param = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
   refuseApproval(param).then((res) => {
     if (res.code === 200) {
       ElMessage.success('拒绝审批完成')
@@ -329,9 +336,6 @@
     else {
       ElMessage.error(`拒绝审批失败：${res.message}`)
     }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
     fetchData(true)
   })
 }
@@ -551,12 +555,19 @@
     </table-container>
 
     <!-- 审批单弹窗 -->
-    <approval-dialog
+    <!-- <approval-dialog
       ref="apprDial"
       @on-success="afterApprovalHandler"
       @on-refuse="changeFormRefuseHandler"
-    />
+    /> -->
 
+    <!-- 审批弹窗-审批人自选 -->
+    <approval-dialog
+      ref="apprDial"
+      :last-name="customApproval.approvalLastName.fileChange"
+      @on-success="afterApprovalHandler"
+      @refuse="changeFormRefuseHandler"
+    />
     <!-- 右上角按钮集合 -->
     <button-box :active="active" :total-refuse="totalRefuse" :total-approval="totalApproval" :total-to-approval="totalToApproval" :menu="menu" @change-current-button="changeCurrentButton" />
   </app-container>
diff --git a/src/views/resource/file/methodConfirm/detail.vue b/src/views/resource/file/methodConfirm/detail.vue
index f38d52c..949e446 100644
--- a/src/views/resource/file/methodConfirm/detail.vue
+++ b/src/views/resource/file/methodConfirm/detail.vue
@@ -8,7 +8,9 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IFileInfo as IMethodFileInfo } from '@/views/resource/technology/method/method-interface'
 import { getFileMethodList } from '@/api/resource/fileTechnology'
-import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
+import customApproval from '/public/config/customApproval.json'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
@@ -269,8 +271,14 @@
   })
 }
 
-// 提交按钮
-const submitButtonHandler = async () => {
+// -----------------------------------提交-------------------------------------------------------
+const selectApproverRef = ref() // 审批人自选组件ref
+// 选好审批人
+const confirmSelectApprover = async (approverList: string[] = []) => {
+  if (!approverList.length) {
+    ElMessage.warning('无审批人，无法提交！')
+    return false
+  }
   if (methodConfirm.value === null || methodConfirm.value.processId === undefined || methodConfirm.value.processId === '') {
     // 流程id为空 表示还未进入流程中 直接提交
     ElMessageBox.confirm(`是否提交方法确认登记表 ${methodConfirm.value.formNo}`, '提示', {
@@ -281,6 +289,8 @@
       submitMethodConfirm({
         formId: flowFormId,
         id: methodConfirm.value.id,
+        processId: methodConfirm.value.processId,
+        assignees: approverList,
       }).then((res) => {
         if (res.code === 200) {
           ElMessage.success(`方法确认登记表 ${methodConfirm.value.formNo} 提交成功`)
@@ -298,7 +308,12 @@
     // 之前已经在流程中的表单 保存提交
     await methodConfirmRef.value.validate((valid: boolean) => {
       if (valid === true) {
-        failUpdateMethodConfirm(methodConfirm.value).then((res) => {
+        const param = {
+          ...methodConfirm.value,
+          processId: methodConfirm.value.processId,
+          assignees: approverList,
+        }
+        failUpdateMethodConfirm(param).then((res) => {
           if (res.code === 200) {
             // 提示保存成功
             ElMessage.success(`方法确认登记表 ${methodConfirm.value.formNo} 提交成功`)
@@ -315,6 +330,11 @@
     })
   }
 }
+// 提交按钮
+const submitButtonHandler = () => {
+  selectApproverRef.value.initDialog()
+}
+// -----------------------------------提交-------------------------------------------------------
 
 // 显示筛选委托方名录的弹窗
 const showFilterMethod = () => {
@@ -378,17 +398,30 @@
 }
 // 流程审批-同意
 const approvalAgreeHandler = () => {
-  apprDial.value.initDialog('agree', methodConfirm.value.id, methodConfirm.value.taskId || route.query.taskId, '')
+  apprDial.value.initDialog('agree', methodConfirm.value.taskId || route.query.taskId, methodConfirm.value.id, methodConfirm.value.processId || route.query.processId)
 }
 
 // 流程审批-拒绝
 const approvalRefuseHandler = () => {
-  apprDial.value.initDialog('refuse', methodConfirm.value.id, methodConfirm.value.taskId || route.query.taskId, '')
+  apprDial.value.initDialog('refuse', methodConfirm.value.taskId || route.query.taskId, methodConfirm.value.id)
 }
 
 // 取消（撤回审批单）
 const revokeClickedHandler = () => {
-  apprDial.value.initDialog('revoke', methodConfirm.value.id, methodConfirm.value.taskId || route.query.taskId, methodConfirm.value.processId || route.query.processId)
+  const param = {
+    processInstanceId: methodConfirm.value.processId || route.query.processId!,
+    comments: '',
+    id: id.value,
+  }
+  revokeApproval(param).then((res) => {
+    if (res.code === 200) {
+      ElMessage.success('流程取消成功')
+    }
+    else {
+      ElMessage.error(`流程取消失败：${res.message}`)
+    }
+    cancelButtVisable.value = false
+  })
 }
 
 // 删除（只有已取消的可以在详情中删除）
@@ -424,24 +457,13 @@
   }
 }
 
-// 取消
-const revokeHandler = (param: any) => {
-  revokeApproval(param).then((res) => {
-    if (res.code === 200) {
-      ElMessage.success('流程取消成功')
-    }
-    else {
-      ElMessage.error(`流程取消失败：${res.message}`)
-    }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
-    cancelButtVisable.value = false
-  })
-}
-
 // 拒绝
-const refuseHandler = (param: any) => {
+const refuseHandler = (comments: string, taskId: string, id: string) => {
+  const param = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
   refuseApproval(param).then((res) => {
     if (res.code === 200) {
       ElMessage.success('拒绝审批完成')
@@ -449,9 +471,6 @@
     else {
       ElMessage.error(`拒绝审批失败：${res.message}`)
     }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
     flowButtsVisable.value = false
   })
 }
@@ -867,10 +886,15 @@
       </template>
     </el-form>
 
-    <approval-dialog
+    <!-- <approval-dialog
       ref="apprDial" @on-success="approvalSuccessHandler" @on-refuse="refuseHandler"
       @on-revoke="revokeHandler"
-    />
+    /> -->
+
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="apprDial" :last-name="customApproval.approvalLastName.methodConfirm" @on-success="approvalSuccessHandler" @refuse="refuseHandler" />
+    <!-- 选择审批人弹窗 -->
+    <select-approver-dialog ref="selectApproverRef" @confirm="confirmSelectApprover" />
 
     <file-select-dialog ref="refFileSelect" @confirm="methodFileSelected" />
 
diff --git a/src/views/resource/file/methodConfirm/list.vue b/src/views/resource/file/methodConfirm/list.vue
index 973683c..2d9ea42 100644
--- a/src/views/resource/file/methodConfirm/list.vue
+++ b/src/views/resource/file/methodConfirm/list.vue
@@ -6,11 +6,12 @@
 import type { IMenu } from '@/components/buttonBox/buttonBox'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IDictType } from '@/commonInterface/resource-interface'
-import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import { getDictByCode } from '@/api/system/dict'
 import { draftDelete, getMethodConfirmList, refuseApproval, revokeApproval, revokeDelete } from '@/api/resource/fileConfirm'
 import useBridgeCount from '@/components/buttonBox/useBridgeCount'
-
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
+import customApproval from '/public/config/customApproval.json'
 // 定义常量
 const buttonBoxActive = 'fileMethodConfirm' // 存储在sessionstorage里面的字段名，用于记录右上角buttonbox点击状态
 const flowFormId = 'zyglffqrdjb' // 资源管理 - 方法确认登记表
@@ -249,17 +250,30 @@
 
 // 流程审批-同意
 const approvalAgreeHandler = (row: IFileMethodConfirm) => {
-  apprDial.value.initDialog('agree', row.id, row.taskId, '')
+  apprDial.value.initDialog('agree', row.taskId, row.id, row.processId)
 }
 
 // 流程审批-拒绝
 const approvalRefuseHandler = (row: IFileMethodConfirm) => {
-  apprDial.value.initDialog('refuse', row.id, row.taskId, '')
+  apprDial.value.initDialog('refuse', row.taskId, row.id)
 }
 
 // 取消（撤回审批单）
 const revokeApprById = (row: IFileMethodConfirm) => {
-  apprDial.value.initDialog('revoke', row.id, row.taskId, row.processId)
+  const params = {
+    processInstanceId: row.processId!,
+    comments: '',
+    id: row.id,
+  }
+  revokeApproval(params).then((res) => {
+    if (res.code === 200) {
+      ElMessage.success('流程取消成功')
+    }
+    else {
+      ElMessage.error(`流程取消失败：${res.message}`)
+    }
+    fetchData(true)
+  })
 }
 
 // 流程操作之后刷新
@@ -267,24 +281,13 @@
   fetchData(true)
 }
 
-// 取消
-const approvalFormRevokeHandler = (param: any) => {
-  revokeApproval(param).then((res) => {
-    if (res.code === 200) {
-      ElMessage.success('流程取消成功')
-    }
-    else {
-      ElMessage.error(`流程取消失败：${res.message}`)
-    }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
-    fetchData(true)
-  })
-}
-
 // 拒绝
-const approvalFormRefuseHandler = (param: any) => {
+const approvalFormRefuseHandler = (comments: string, taskId: string, id: string) => {
+  const param = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
   refuseApproval(param).then((res) => {
     if (res.code === 200) {
       ElMessage.success('拒绝审批完成')
@@ -292,9 +295,6 @@
     else {
       ElMessage.error(`拒绝审批失败：${res.message}`)
     }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
     fetchData(true)
   })
 }
@@ -481,11 +481,19 @@
     </table-container>
 
     <!-- 审批单弹窗 -->
-    <approval-dialog
+    <!-- <approval-dialog
       ref="apprDial"
       @on-success="afterApprovalHandler"
       @on-refuse="approvalFormRefuseHandler"
       @on-revoke="approvalFormRevokeHandler"
+    /> -->
+
+    <!-- 审批弹窗-审批人自选 -->
+    <approval-dialog
+      ref="apprDial"
+      :last-name="customApproval.approvalLastName.methodConfirm"
+      @on-success="afterApprovalHandler"
+      @refuse="approvalFormRefuseHandler"
     />
 
     <!-- 右上角按钮集合 -->

diff --git a/public/config/customApproval.json b/public/config/customApproval.json
index 205ac21..d69296d 100644
--- a/public/config/customApproval.json
+++ b/public/config/customApproval.json
@@ -1,7 +1,22 @@
 {
-  "approvalLastNameDescribe": "审批流程最后一个节点的名字，用来判断审批自选的时候是否是最后一个节点",
+  "approvalLastName--Describe": "审批流程最后一个节点的名字，用来判断审批自选的时候是否是最后一个节点",
   "approvalLastName": {
-    "standardCheckRecordDescribe": "核查记录",
-    "standardCheckRecord": "技术负责人"
+    "standardCheckRecord--Describe": "核查记录",
+    "standardCheckRecord": "技术负责人",
+
+    "noveltySearch--Describe": "测试校准检定方法查新记录表",
+    "noveltySearch": "审核人",
+
+    "fileChange--Describe": "文件更改申请单",
+    "fileChange": "主任",
+
+    "methodConfirm--Describe": "方法确认登记表",
+    "methodConfirm": "技术负责人",
+
+    "softwareReviewReport--Describe": "软件评审报告",
+    "softwareReviewReport": "技术负责人",
+
+    "resistance--Describe": "实验室接地电阻记录",
+    "resistance": "审核人"
   }
 }
diff --git a/src/views/resource/environment/resistance/edit.vue b/src/views/resource/environment/resistance/edit.vue
index dd62bd1..fd06d64 100644
--- a/src/views/resource/environment/resistance/edit.vue
+++ b/src/views/resource/environment/resistance/edit.vue
@@ -2,7 +2,9 @@
 <script name="EnvironmentResistanceDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IResistanceRecord } from './resistance-interface'
-import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
+import customApproval from '/public/config/customApproval.json'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { detailResistance, draftDeleteResistance, failUpdateResistance, refuseApprovalResistance, revokeApprovalResistance, saveResistance, submitResistance, updateResistance } from '@/api/resource/environmentTest'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
@@ -37,7 +39,7 @@
 const approvalDialog = ref()
 const testRecordRef = ref()
 
-const recordForm = ref<IResistanceRecord>({
+const recordForm: any = ref({
   id: '',
   recordNo: '',
   recordName: '实验室接地电阻记录',
@@ -241,9 +243,14 @@
     }
   })
 }
-
-// 提交按钮
-const submitButtonHandler = async () => {
+// -----------------------------------提交-------------------------------------------------------
+const selectApproverRef = ref() // 审批人自选组件ref
+// 选好审批人
+const confirmSelectApprover = async (approverList: string[] = []) => {
+  if (!approverList.length) {
+    ElMessage.warning('无审批人，无法提交！')
+    return false
+  }
   if (recordForm.value === null || recordForm.value.processId === undefined || recordForm.value.processId === '') {
     // 流程id为空 表示还未进入流程中 直接提交
     ElMessageBox.confirm(`是否提交实验室接地电阻记录 ${recordForm.value.recordNo}`, '提示', {
@@ -259,6 +266,8 @@
       submitResistance({
         formId: SCHEDULE.LAB_RESISTANCE_RECORD_APPROVAL,
         id: recordForm.value.id,
+        processId: recordForm.value.processId,
+        assignees: approverList,
       }).then((res) => {
         if (res.code === 200) {
           ElMessage.success(`实验室接地电阻记录 ${recordForm.value.recordNo} 提交成功`)
@@ -282,7 +291,12 @@
           text: '加载中...',
           background: 'rgba(255, 255, 255, 0.6)',
         })
-        failUpdateResistance(recordForm.value).then((res) => {
+        const params = {
+          ...recordForm.value,
+          processId: recordForm.value.processId,
+          assignees: approverList,
+        }
+        failUpdateResistance(params).then((res) => {
           if (res.code === 200) {
           // 提示保存成功
             ElMessage.success('保存成功')
@@ -302,6 +316,12 @@
     })
   }
 }
+// 提交按钮
+const submitButtonHandler = () => {
+  selectApproverRef.value.initDialog()
+}
+
+// ---------------------------------------------------------------------------------------------
 
 // 根据id查询详情
 const detailById = async (id: string) => {
@@ -312,7 +332,10 @@
   })
   await detailResistance({ id }).then((res) => {
     if (res.code === 200) {
-      recordForm.value = res.data
+      // recordForm.value = res.data
+      for (const key in recordForm.value) {
+        recordForm.value[key] = res.data[key]
+      }
       if (recordForm.value.taskId === '') {
         recordForm.value.taskId = sessionStorage.getItem('resistanceRecordTaskId')!
       }
@@ -328,12 +351,12 @@
 // ------------------------------------------------审批----------------------------------------
 // 流程审批-拒绝
 const approvalRefuseHandler = () => {
-  approvalDialog.value.initDialog('refuse', recordForm.value.id, recordForm.value.taskId || route.query.taskId, '')
+  approvalDialog.value.initDialog('refuse', recordForm.value.taskId || route.query.taskId, recordForm.value.id)
 }
 
 // 流程审批-同意
 const approvalAgreeHandler = () => {
-  approvalDialog.value.initDialog('agree', recordForm.value.id, recordForm.value.taskId || route.query.taskId, '')
+  approvalDialog.value.initDialog('agree', recordForm.value.taskId || route.query.taskId, recordForm.value.id, recordForm.value.processId || route.query.processId)
 }
 
 // 取消流程
@@ -393,7 +416,12 @@
 }
 
 // 拒绝
-const refuseHandler = (param: any) => {
+const refuseHandler = (comments: string, taskId: string, id: string) => {
+  const param = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
   refuseApprovalResistance(param).then((res) => {
     if (res.code === 200) {
       ElMessage.success('拒绝审批完成')
@@ -401,9 +429,6 @@
     else {
       ElMessage.error(`拒绝审批失败：${res.message}`)
     }
-    // 关闭弹窗
-    approvalDialog.value.handleClose()
-
     flowButtsVisable.value = false
   })
 }
@@ -661,10 +686,14 @@
       </detail-block>
     </el-form>
 
-    <approval-dialog
+    <!-- <approval-dialog
       ref="approvalDialog"
       @on-success="approvalSuccessHandler" @on-refuse="refuseHandler" @on-revoke="revokeHandler"
-    />
+    /> -->
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialog" :last-name="customApproval.approvalLastName.resistance" @on-success="approvalSuccessHandler" @refuse="refuseHandler" />
+    <!-- 选择审批人弹窗 -->
+    <select-approver-dialog ref="selectApproverRef" @confirm="confirmSelectApprover" />
 
     <template v-if="current === 'resistance-approval' && status !== '1'">
       <approval-record-table :process-id="recordForm.processId" />
diff --git a/src/views/resource/environment/resistance/list.vue b/src/views/resource/environment/resistance/list.vue
index f3e768e..439b574 100644
--- a/src/views/resource/environment/resistance/list.vue
+++ b/src/views/resource/environment/resistance/list.vue
@@ -3,7 +3,7 @@
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IListQuery, IResistanceRecord } from './resistance-interface'
-import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -13,7 +13,8 @@
 import { exportFile } from '@/utils/exportUtils'
 import { printPdf } from '@/utils/printUtils'
 import useBridgeCount from '@/components/buttonBox/useBridgeCount'
-
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
+import customApproval from '/public/config/customApproval.json'
 // 定义常量
 const buttonBoxActive = 'labResistanceRecordApproval' // 存储在sessionstorage里面的字段名，用于记录右上角buttonbox点击状态
 
@@ -240,12 +241,12 @@
 
 // 流程审批-同意
 const approvalAgreeHandler = (row: IResistanceRecord) => {
-  apprDial.value.initDialog('agree', row.id, row.taskId, '')
+  apprDial.value.initDialog('agree', row.taskId, row.id, row.processId)
 }
 
 // 流程审批-拒绝
 const approvalRefuseHandler = (row: IResistanceRecord) => {
-  apprDial.value.initDialog('refuse', row.id, row.taskId, '')
+  apprDial.value.initDialog('refuse', row.taskId, row.id)
 }
 
 // 取消（撤回审批单）
@@ -287,7 +288,12 @@
 }
 
 // 拒绝
-const refuseHandler = (param: any) => {
+const refuseHandler = (comments: string, taskId: string, id: string) => {
+  const param = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
   refuseApprovalResistance(param).then((res) => {
     if (res.code === 200) {
       ElMessage.success('拒绝审批完成')
@@ -295,8 +301,6 @@
     else {
       ElMessage.error(`拒绝审批失败：${res.message}`)
     }
-    // 关闭弹窗
-    apprDial.value.handleClose()
 
     fetchData(true)
   })
@@ -505,10 +509,18 @@
     </table-container>
 
     <!-- 审批单弹窗 -->
-    <approval-dialog
+    <!-- <approval-dialog
       ref="apprDial"
       @on-success="afterApprovalHandler"
       @on-refuse="refuseHandler"
+    /> -->
+
+    <!-- 审批弹窗-审批人自选 -->
+    <approval-dialog
+      ref="apprDial"
+      :last-name="customApproval.approvalLastName.resistance"
+      @on-success="afterApprovalHandler"
+      @refuse="refuseHandler"
     />
 
     <!-- 右上角按钮集合 -->
diff --git a/src/views/resource/file/change/detail.vue b/src/views/resource/file/change/detail.vue
index 3efc9ab..a0c7c5d 100644
--- a/src/views/resource/file/change/detail.vue
+++ b/src/views/resource/file/change/detail.vue
@@ -5,7 +5,9 @@
 import FileSelectDialog from './dialog/selectSysFileDialog.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
+import customApproval from '/public/config/customApproval.json'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
 import useUserStore from '@/store/modules/user' // 用户信息
 
@@ -292,8 +294,14 @@
   })
 }
 
-// 提交按钮
-const submitButtonHandler = async () => {
+// -----------------------------------提交-------------------------------------------------------
+const selectApproverRef = ref() // 审批人自选组件ref
+// 选好审批人
+const confirmSelectApprover = async (approverList: string[] = []) => {
+  if (!approverList.length) {
+    ElMessage.warning('无审批人，无法提交！')
+    return false
+  }
   if (changeForm.value === null || changeForm.value.processId === undefined || changeForm.value.processId === '') {
     // 流程id为空 表示还未进入流程中 直接提交
     ElMessageBox.confirm(`是否提交文件更改申请单 ${changeForm.value.formNo}`, '提示', {
@@ -309,6 +317,8 @@
       submitChangeForm({
         formId: flowFormId,
         id: changeForm.value.id,
+        processId: changeForm.value.processId,
+        assignees: approverList,
       }).then((res) => {
         if (res.code === 200) {
           ElMessage.success('提交成功')
@@ -333,7 +343,12 @@
           text: '加载中...',
           background: 'rgba(255, 255, 255, 0.6)',
         })
-        failUpdateChangeForm(changeForm.value).then((res) => {
+        const params = {
+          ...changeForm.value,
+          processId: changeForm.value.processId,
+          assignees: approverList,
+        }
+        failUpdateChangeForm(params).then((res) => {
           if (res.code === 200) {
           // 提示保存成功
             ElMessage.success('提交成功')
@@ -354,7 +369,11 @@
     })
   }
 }
-
+// 提交按钮
+const submitButtonHandler = () => {
+  selectApproverRef.value.initDialog()
+}
+// ----------------------------------------------------------------------------------------------
 // 选定文件返回
 const appendFileToList = (listParam: any) => {
   listParam.forEach((item: any) => {
@@ -374,12 +393,12 @@
 
 // 流程审批-同意
 const approvalAgreeHandler = () => {
-  apprDial.value.initDialog('agree', changeForm.value.id, changeForm.value.taskId || route.query.taskId, '')
+  apprDial.value.initDialog('agree', changeForm.value.taskId || route.query.taskId, changeForm.value.id, changeForm.value.processId || route.query.processId)
 }
 
 // 流程审批-拒绝
 const approvalRefuseHandler = () => {
-  apprDial.value.initDialog('refuse', changeForm.value.id, changeForm.value.taskId || route.query.taskId, '')
+  apprDial.value.initDialog('refuse', changeForm.value.taskId || route.query.taskId, changeForm.value.id)
 }
 
 // 取消（撤回审批单）
@@ -443,7 +462,12 @@
 }
 
 // 拒绝
-const refuseHandler = (param: any) => {
+const refuseHandler = (comments: string, taskId: string, id: string) => {
+  const param = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
   refuseApproval(param).then((res) => {
     if (res.code === 200) {
       ElMessage.success('拒绝审批完成')
@@ -451,9 +475,6 @@
     else {
       ElMessage.error(`拒绝审批失败：${res.message}`)
     }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
     flowButtsVisable.value = false
   })
 }
@@ -710,11 +731,15 @@
       </detail-block>
     </el-form>
 
-    <approval-dialog
+    <!-- <approval-dialog
       ref="apprDial"
       @on-success="approvalSuccessHandler"
       @on-refuse="refuseHandler"
-    />
+    /> -->
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="apprDial" :last-name="customApproval.approvalLastName.fileChange" @on-success="approvalSuccessHandler" @refuse="refuseHandler" />
+    <!-- 选择审批人弹窗 -->
+    <select-approver-dialog ref="selectApproverRef" @confirm="confirmSelectApprover" />
 
     <file-select-dialog ref="refFileSelect" @confirm="appendFileToList" />
 
diff --git a/src/views/resource/file/change/list.vue b/src/views/resource/file/change/list.vue
index 71d8624..d6c4606 100644
--- a/src/views/resource/file/change/list.vue
+++ b/src/views/resource/file/change/list.vue
@@ -3,7 +3,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { DateModelType } from 'element-plus'
 import type { IFileChangeForm, IListQuery } from './change-interface'
-import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { deptType } from '@/global'
@@ -11,6 +11,8 @@
 import { getDictByCode } from '@/api/system/dict'
 import { draftDelete, exportFileChangeList, getFileChangeFormList, refuseApproval, revokeApproval, revokeDelete } from '@/api/resource/fileChange'
 import useBridgeCount from '@/components/buttonBox/useBridgeCount'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
+import customApproval from '/public/config/customApproval.json'
 
 // 定义常量
 const buttonBoxActive = 'fileChangeApproval' // 存储在sessionstorage里面的字段名，用于记录右上角buttonbox点击状态
@@ -280,12 +282,12 @@
 
 // 流程审批-同意
 const approvalAgreeHandler = (row: IFileChangeForm) => {
-  apprDial.value.initDialog('agree', row.id, row.taskId, '')
+  apprDial.value.initDialog('agree', row.taskId, row.id, row.processId)
 }
 
 // 流程审批-拒绝
 const approvalRefuseHandler = (row: IFileChangeForm) => {
-  apprDial.value.initDialog('refuse', row.id, row.taskId, '')
+  apprDial.value.initDialog('refuse', row.taskId, row.id)
 }
 
 // 取消（撤回审批单）
@@ -321,7 +323,12 @@
 }
 
 // 拒绝
-const changeFormRefuseHandler = (param: any) => {
+const changeFormRefuseHandler = (comments: string, taskId: string, id: string) => {
+  const param = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
   refuseApproval(param).then((res) => {
     if (res.code === 200) {
       ElMessage.success('拒绝审批完成')
@@ -329,9 +336,6 @@
     else {
       ElMessage.error(`拒绝审批失败：${res.message}`)
     }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
     fetchData(true)
   })
 }
@@ -551,12 +555,19 @@
     </table-container>
 
     <!-- 审批单弹窗 -->
-    <approval-dialog
+    <!-- <approval-dialog
       ref="apprDial"
       @on-success="afterApprovalHandler"
       @on-refuse="changeFormRefuseHandler"
-    />
+    /> -->
 
+    <!-- 审批弹窗-审批人自选 -->
+    <approval-dialog
+      ref="apprDial"
+      :last-name="customApproval.approvalLastName.fileChange"
+      @on-success="afterApprovalHandler"
+      @refuse="changeFormRefuseHandler"
+    />
     <!-- 右上角按钮集合 -->
     <button-box :active="active" :total-refuse="totalRefuse" :total-approval="totalApproval" :total-to-approval="totalToApproval" :menu="menu" @change-current-button="changeCurrentButton" />
   </app-container>
diff --git a/src/views/resource/file/methodConfirm/detail.vue b/src/views/resource/file/methodConfirm/detail.vue
index f38d52c..949e446 100644
--- a/src/views/resource/file/methodConfirm/detail.vue
+++ b/src/views/resource/file/methodConfirm/detail.vue
@@ -8,7 +8,9 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IFileInfo as IMethodFileInfo } from '@/views/resource/technology/method/method-interface'
 import { getFileMethodList } from '@/api/resource/fileTechnology'
-import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
+import customApproval from '/public/config/customApproval.json'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
@@ -269,8 +271,14 @@
   })
 }
 
-// 提交按钮
-const submitButtonHandler = async () => {
+// -----------------------------------提交-------------------------------------------------------
+const selectApproverRef = ref() // 审批人自选组件ref
+// 选好审批人
+const confirmSelectApprover = async (approverList: string[] = []) => {
+  if (!approverList.length) {
+    ElMessage.warning('无审批人，无法提交！')
+    return false
+  }
   if (methodConfirm.value === null || methodConfirm.value.processId === undefined || methodConfirm.value.processId === '') {
     // 流程id为空 表示还未进入流程中 直接提交
     ElMessageBox.confirm(`是否提交方法确认登记表 ${methodConfirm.value.formNo}`, '提示', {
@@ -281,6 +289,8 @@
       submitMethodConfirm({
         formId: flowFormId,
         id: methodConfirm.value.id,
+        processId: methodConfirm.value.processId,
+        assignees: approverList,
       }).then((res) => {
         if (res.code === 200) {
           ElMessage.success(`方法确认登记表 ${methodConfirm.value.formNo} 提交成功`)
@@ -298,7 +308,12 @@
     // 之前已经在流程中的表单 保存提交
     await methodConfirmRef.value.validate((valid: boolean) => {
       if (valid === true) {
-        failUpdateMethodConfirm(methodConfirm.value).then((res) => {
+        const param = {
+          ...methodConfirm.value,
+          processId: methodConfirm.value.processId,
+          assignees: approverList,
+        }
+        failUpdateMethodConfirm(param).then((res) => {
           if (res.code === 200) {
             // 提示保存成功
             ElMessage.success(`方法确认登记表 ${methodConfirm.value.formNo} 提交成功`)
@@ -315,6 +330,11 @@
     })
   }
 }
+// 提交按钮
+const submitButtonHandler = () => {
+  selectApproverRef.value.initDialog()
+}
+// -----------------------------------提交-------------------------------------------------------
 
 // 显示筛选委托方名录的弹窗
 const showFilterMethod = () => {
@@ -378,17 +398,30 @@
 }
 // 流程审批-同意
 const approvalAgreeHandler = () => {
-  apprDial.value.initDialog('agree', methodConfirm.value.id, methodConfirm.value.taskId || route.query.taskId, '')
+  apprDial.value.initDialog('agree', methodConfirm.value.taskId || route.query.taskId, methodConfirm.value.id, methodConfirm.value.processId || route.query.processId)
 }
 
 // 流程审批-拒绝
 const approvalRefuseHandler = () => {
-  apprDial.value.initDialog('refuse', methodConfirm.value.id, methodConfirm.value.taskId || route.query.taskId, '')
+  apprDial.value.initDialog('refuse', methodConfirm.value.taskId || route.query.taskId, methodConfirm.value.id)
 }
 
 // 取消（撤回审批单）
 const revokeClickedHandler = () => {
-  apprDial.value.initDialog('revoke', methodConfirm.value.id, methodConfirm.value.taskId || route.query.taskId, methodConfirm.value.processId || route.query.processId)
+  const param = {
+    processInstanceId: methodConfirm.value.processId || route.query.processId!,
+    comments: '',
+    id: id.value,
+  }
+  revokeApproval(param).then((res) => {
+    if (res.code === 200) {
+      ElMessage.success('流程取消成功')
+    }
+    else {
+      ElMessage.error(`流程取消失败：${res.message}`)
+    }
+    cancelButtVisable.value = false
+  })
 }
 
 // 删除（只有已取消的可以在详情中删除）
@@ -424,24 +457,13 @@
   }
 }
 
-// 取消
-const revokeHandler = (param: any) => {
-  revokeApproval(param).then((res) => {
-    if (res.code === 200) {
-      ElMessage.success('流程取消成功')
-    }
-    else {
-      ElMessage.error(`流程取消失败：${res.message}`)
-    }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
-    cancelButtVisable.value = false
-  })
-}
-
 // 拒绝
-const refuseHandler = (param: any) => {
+const refuseHandler = (comments: string, taskId: string, id: string) => {
+  const param = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
   refuseApproval(param).then((res) => {
     if (res.code === 200) {
       ElMessage.success('拒绝审批完成')
@@ -449,9 +471,6 @@
     else {
       ElMessage.error(`拒绝审批失败：${res.message}`)
     }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
     flowButtsVisable.value = false
   })
 }
@@ -867,10 +886,15 @@
       </template>
     </el-form>
 
-    <approval-dialog
+    <!-- <approval-dialog
       ref="apprDial" @on-success="approvalSuccessHandler" @on-refuse="refuseHandler"
       @on-revoke="revokeHandler"
-    />
+    /> -->
+
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="apprDial" :last-name="customApproval.approvalLastName.methodConfirm" @on-success="approvalSuccessHandler" @refuse="refuseHandler" />
+    <!-- 选择审批人弹窗 -->
+    <select-approver-dialog ref="selectApproverRef" @confirm="confirmSelectApprover" />
 
     <file-select-dialog ref="refFileSelect" @confirm="methodFileSelected" />
 
diff --git a/src/views/resource/file/methodConfirm/list.vue b/src/views/resource/file/methodConfirm/list.vue
index 973683c..2d9ea42 100644
--- a/src/views/resource/file/methodConfirm/list.vue
+++ b/src/views/resource/file/methodConfirm/list.vue
@@ -6,11 +6,12 @@
 import type { IMenu } from '@/components/buttonBox/buttonBox'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IDictType } from '@/commonInterface/resource-interface'
-import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import { getDictByCode } from '@/api/system/dict'
 import { draftDelete, getMethodConfirmList, refuseApproval, revokeApproval, revokeDelete } from '@/api/resource/fileConfirm'
 import useBridgeCount from '@/components/buttonBox/useBridgeCount'
-
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
+import customApproval from '/public/config/customApproval.json'
 // 定义常量
 const buttonBoxActive = 'fileMethodConfirm' // 存储在sessionstorage里面的字段名，用于记录右上角buttonbox点击状态
 const flowFormId = 'zyglffqrdjb' // 资源管理 - 方法确认登记表
@@ -249,17 +250,30 @@
 
 // 流程审批-同意
 const approvalAgreeHandler = (row: IFileMethodConfirm) => {
-  apprDial.value.initDialog('agree', row.id, row.taskId, '')
+  apprDial.value.initDialog('agree', row.taskId, row.id, row.processId)
 }
 
 // 流程审批-拒绝
 const approvalRefuseHandler = (row: IFileMethodConfirm) => {
-  apprDial.value.initDialog('refuse', row.id, row.taskId, '')
+  apprDial.value.initDialog('refuse', row.taskId, row.id)
 }
 
 // 取消（撤回审批单）
 const revokeApprById = (row: IFileMethodConfirm) => {
-  apprDial.value.initDialog('revoke', row.id, row.taskId, row.processId)
+  const params = {
+    processInstanceId: row.processId!,
+    comments: '',
+    id: row.id,
+  }
+  revokeApproval(params).then((res) => {
+    if (res.code === 200) {
+      ElMessage.success('流程取消成功')
+    }
+    else {
+      ElMessage.error(`流程取消失败：${res.message}`)
+    }
+    fetchData(true)
+  })
 }
 
 // 流程操作之后刷新
@@ -267,24 +281,13 @@
   fetchData(true)
 }
 
-// 取消
-const approvalFormRevokeHandler = (param: any) => {
-  revokeApproval(param).then((res) => {
-    if (res.code === 200) {
-      ElMessage.success('流程取消成功')
-    }
-    else {
-      ElMessage.error(`流程取消失败：${res.message}`)
-    }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
-    fetchData(true)
-  })
-}
-
 // 拒绝
-const approvalFormRefuseHandler = (param: any) => {
+const approvalFormRefuseHandler = (comments: string, taskId: string, id: string) => {
+  const param = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
   refuseApproval(param).then((res) => {
     if (res.code === 200) {
       ElMessage.success('拒绝审批完成')
@@ -292,9 +295,6 @@
     else {
       ElMessage.error(`拒绝审批失败：${res.message}`)
     }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
     fetchData(true)
   })
 }
@@ -481,11 +481,19 @@
     </table-container>
 
     <!-- 审批单弹窗 -->
-    <approval-dialog
+    <!-- <approval-dialog
       ref="apprDial"
       @on-success="afterApprovalHandler"
       @on-refuse="approvalFormRefuseHandler"
       @on-revoke="approvalFormRevokeHandler"
+    /> -->
+
+    <!-- 审批弹窗-审批人自选 -->
+    <approval-dialog
+      ref="apprDial"
+      :last-name="customApproval.approvalLastName.methodConfirm"
+      @on-success="afterApprovalHandler"
+      @refuse="approvalFormRefuseHandler"
     />
 
     <!-- 右上角按钮集合 -->
diff --git a/src/views/resource/file/noveltySearch/detail.vue b/src/views/resource/file/noveltySearch/detail.vue
index 19bdf70..116ea3e 100644
--- a/src/views/resource/file/noveltySearch/detail.vue
+++ b/src/views/resource/file/noveltySearch/detail.vue
@@ -1,4 +1,4 @@
-<!-- 委托方意见登记表详情 -->
+<!-- 测试校准检定方法查新记录表详情 -->
 <script name="FileNoveltySearchDetail" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import { Close } from '@element-plus/icons-vue'
@@ -9,7 +9,9 @@
 import type { IDictType } from '@/commonInterface/resource-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IFileInfo as IMethodFileInfo } from '@/views/resource/technology/method/method-interface'
-import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
+import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
+import customApproval from '/public/config/customApproval.json'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
@@ -279,8 +281,14 @@
   })
 }
 
-// 提交按钮
-const submitButtonHandler = async () => {
+// -----------------------------------提交-------------------------------------------------------
+const selectApproverRef = ref() // 审批人自选组件ref
+// 选好审批人
+const confirmSelectApprover = async (approverList: string[] = []) => {
+  if (!approverList.length) {
+    ElMessage.warning('无审批人，无法提交！')
+    return false
+  }
   if (novelty.value === null || novelty.value.processId === undefined || novelty.value.processId === '') {
     // 流程id为空 表示还未进入流程中 直接提交
     ElMessageBox.confirm(`是否提交查新记录表 ${novelty.value.formNo}`, '提示', {
@@ -291,6 +299,8 @@
       submitNovelty({
         formId: flowFormId,
         id: novelty.value.id,
+        processId: novelty.value.processId,
+        assignees: approverList,
       }).then((res) => {
         if (res.code === 200) {
           ElMessage.success(`查新记录表 ${novelty.value.formNo} 提交成功`)
@@ -311,7 +321,12 @@
     // 之前已经在流程中的表单 保存提交
     await noveltyRef.value.validate((valid: boolean) => {
       if (valid === true) {
-        failUpdateNovelty(novelty.value).then((res) => {
+        const params = {
+          ...novelty.value,
+          processId: novelty.value.processId,
+          assignees: approverList,
+        }
+        failUpdateNovelty(params).then((res) => {
           if (res.code === 200) {
             // 提示保存成功
             ElMessage.success(`查新记录表 ${novelty.value.formNo} 提交成功`)
@@ -329,6 +344,11 @@
     })
   }
 }
+// 提交按钮
+const submitButtonHandler = () => {
+  selectApproverRef.value.initDialog()
+}
+// ----------------------------------------------------------------------------------------------
 
 // 选定文件返回
 const appendFileToList = (row: IMethodFileInfo, result: string) => {
@@ -347,17 +367,33 @@
 
 // 流程审批-同意
 const approvalAgreeHandler = () => {
-  apprDial.value.initDialog('agree', novelty.value.id, novelty.value.taskId || route.query.taskId, '')
+  apprDial.value.initDialog('agree', novelty.value.taskId || route.query.taskId, novelty.value.id, novelty.value.processId || route.query.processId)
 }
 
 // 流程审批-拒绝
 const approvalRefuseHandler = () => {
-  apprDial.value.initDialog('refuse', novelty.value.id, novelty.value.taskId || route.query.taskId, '')
+  apprDial.value.initDialog('refuse', novelty.value.taskId || route.query.taskId, novelty.value.id)
 }
 
 // 取消（撤回审批单）
 const revokeClickedHandler = () => {
-  apprDial.value.initDialog('revoke', novelty.value.id, novelty.value.taskId || route.query.taskId, novelty.value.processId || route.query.processId)
+  const params = {
+    processInstanceId: novelty.value.processId! || route.query.processId,
+    comments: '',
+    id: novelty.value.id,
+  }
+  revokeApproval(params).then((res) => {
+    if (res.code === 200) {
+      ElMessage.success('流程取消成功')
+    }
+    else {
+      ElMessage.error(`流程取消失败：${res.message}`)
+    }
+    // 关闭弹窗
+    apprDial.value.handleClose()
+
+    cancelButtVisable.value = false
+  })
 }
 
 // 删除（只有已取消的可以在详情中删除）
@@ -385,32 +421,22 @@
 
 // 流程操作之后刷新
 const approvalSuccessHandler = (type: string) => {
-  if (type === 'agree' || type === 'refuse') {
-    flowButtsVisable.value = false
-  }
-  else if (type === 'revoke') {
-    cancelButtVisable.value = false
-  }
-}
-
-// 取消
-const revokeHandler = (param: any) => {
-  revokeApproval(param).then((res) => {
-    if (res.code === 200) {
-      ElMessage.success('流程取消成功')
-    }
-    else {
-      ElMessage.error(`流程取消失败：${res.message}`)
-    }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
-    cancelButtVisable.value = false
-  })
+  flowButtsVisable.value = false
+  // if (type === 'agree' || type === 'refuse') {
+  //   flowButtsVisable.value = false
+  // }
+  // else if (type === 'revoke') {
+  //   cancelButtVisable.value = false
+  // }
 }
 
 // 拒绝
-const refuseHandler = (param: any) => {
+const refuseHandler = (comments: string, taskId: string, id: string) => {
+  const param = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
   refuseApproval(param).then((res) => {
     if (res.code === 200) {
       ElMessage.success('拒绝审批完成')
@@ -418,9 +444,6 @@
     else {
       ElMessage.error(`拒绝审批失败：${res.message}`)
     }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
     flowButtsVisable.value = false
   })
 }
@@ -1059,11 +1082,16 @@
       </detail-page>
     </el-form>
 
-    <approval-dialog
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="apprDial" :last-name="customApproval.approvalLastName.noveltySearch" @on-success="approvalSuccessHandler" @refuse="refuseHandler" />
+    <!-- 选择审批人弹窗 -->
+    <select-approver-dialog ref="selectApproverRef" @confirm="confirmSelectApprover" />
+    <!-- <approval-dialog
       ref="apprDial" @on-success="approvalSuccessHandler" @on-refuse="refuseHandler"
       @on-revoke="revokeHandler"
-    />
-
+    /> -->
+    <!-- 审批弹窗-审批人自选 -->
+    <!-- <approval-dialog ref="approvalDialog" :last-name="customApproval.approvalLastName.noveltySearch" @on-success="afterApprovalHandler" @refuse="noveltyRefuseHandler" /> -->
     <file-select-dialog ref="refFileSelect" @records-selected="appendFileToList" />
 
     <template v-if="current === 'novelty-approval' && status !== '1'">

diff --git a/public/config/customApproval.json b/public/config/customApproval.json
index 205ac21..d69296d 100644
--- a/public/config/customApproval.json
+++ b/public/config/customApproval.json
@@ -1,7 +1,22 @@
 {
-  "approvalLastNameDescribe": "审批流程最后一个节点的名字，用来判断审批自选的时候是否是最后一个节点",
+  "approvalLastName--Describe": "审批流程最后一个节点的名字，用来判断审批自选的时候是否是最后一个节点",
   "approvalLastName": {
-    "standardCheckRecordDescribe": "核查记录",
-    "standardCheckRecord": "技术负责人"
+    "standardCheckRecord--Describe": "核查记录",
+    "standardCheckRecord": "技术负责人",
+
+    "noveltySearch--Describe": "测试校准检定方法查新记录表",
+    "noveltySearch": "审核人",
+
+    "fileChange--Describe": "文件更改申请单",
+    "fileChange": "主任",
+
+    "methodConfirm--Describe": "方法确认登记表",
+    "methodConfirm": "技术负责人",
+
+    "softwareReviewReport--Describe": "软件评审报告",
+    "softwareReviewReport": "技术负责人",
+
+    "resistance--Describe": "实验室接地电阻记录",
+    "resistance": "审核人"
   }
 }
diff --git a/src/views/resource/environment/resistance/edit.vue b/src/views/resource/environment/resistance/edit.vue
index dd62bd1..fd06d64 100644
--- a/src/views/resource/environment/resistance/edit.vue
+++ b/src/views/resource/environment/resistance/edit.vue
@@ -2,7 +2,9 @@
 <script name="EnvironmentResistanceDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IResistanceRecord } from './resistance-interface'
-import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
+import customApproval from '/public/config/customApproval.json'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { detailResistance, draftDeleteResistance, failUpdateResistance, refuseApprovalResistance, revokeApprovalResistance, saveResistance, submitResistance, updateResistance } from '@/api/resource/environmentTest'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
@@ -37,7 +39,7 @@
 const approvalDialog = ref()
 const testRecordRef = ref()
 
-const recordForm = ref<IResistanceRecord>({
+const recordForm: any = ref({
   id: '',
   recordNo: '',
   recordName: '实验室接地电阻记录',
@@ -241,9 +243,14 @@
     }
   })
 }
-
-// 提交按钮
-const submitButtonHandler = async () => {
+// -----------------------------------提交-------------------------------------------------------
+const selectApproverRef = ref() // 审批人自选组件ref
+// 选好审批人
+const confirmSelectApprover = async (approverList: string[] = []) => {
+  if (!approverList.length) {
+    ElMessage.warning('无审批人，无法提交！')
+    return false
+  }
   if (recordForm.value === null || recordForm.value.processId === undefined || recordForm.value.processId === '') {
     // 流程id为空 表示还未进入流程中 直接提交
     ElMessageBox.confirm(`是否提交实验室接地电阻记录 ${recordForm.value.recordNo}`, '提示', {
@@ -259,6 +266,8 @@
       submitResistance({
         formId: SCHEDULE.LAB_RESISTANCE_RECORD_APPROVAL,
         id: recordForm.value.id,
+        processId: recordForm.value.processId,
+        assignees: approverList,
       }).then((res) => {
         if (res.code === 200) {
           ElMessage.success(`实验室接地电阻记录 ${recordForm.value.recordNo} 提交成功`)
@@ -282,7 +291,12 @@
           text: '加载中...',
           background: 'rgba(255, 255, 255, 0.6)',
         })
-        failUpdateResistance(recordForm.value).then((res) => {
+        const params = {
+          ...recordForm.value,
+          processId: recordForm.value.processId,
+          assignees: approverList,
+        }
+        failUpdateResistance(params).then((res) => {
           if (res.code === 200) {
           // 提示保存成功
             ElMessage.success('保存成功')
@@ -302,6 +316,12 @@
     })
   }
 }
+// 提交按钮
+const submitButtonHandler = () => {
+  selectApproverRef.value.initDialog()
+}
+
+// ---------------------------------------------------------------------------------------------
 
 // 根据id查询详情
 const detailById = async (id: string) => {
@@ -312,7 +332,10 @@
   })
   await detailResistance({ id }).then((res) => {
     if (res.code === 200) {
-      recordForm.value = res.data
+      // recordForm.value = res.data
+      for (const key in recordForm.value) {
+        recordForm.value[key] = res.data[key]
+      }
       if (recordForm.value.taskId === '') {
         recordForm.value.taskId = sessionStorage.getItem('resistanceRecordTaskId')!
       }
@@ -328,12 +351,12 @@
 // ------------------------------------------------审批----------------------------------------
 // 流程审批-拒绝
 const approvalRefuseHandler = () => {
-  approvalDialog.value.initDialog('refuse', recordForm.value.id, recordForm.value.taskId || route.query.taskId, '')
+  approvalDialog.value.initDialog('refuse', recordForm.value.taskId || route.query.taskId, recordForm.value.id)
 }
 
 // 流程审批-同意
 const approvalAgreeHandler = () => {
-  approvalDialog.value.initDialog('agree', recordForm.value.id, recordForm.value.taskId || route.query.taskId, '')
+  approvalDialog.value.initDialog('agree', recordForm.value.taskId || route.query.taskId, recordForm.value.id, recordForm.value.processId || route.query.processId)
 }
 
 // 取消流程
@@ -393,7 +416,12 @@
 }
 
 // 拒绝
-const refuseHandler = (param: any) => {
+const refuseHandler = (comments: string, taskId: string, id: string) => {
+  const param = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
   refuseApprovalResistance(param).then((res) => {
     if (res.code === 200) {
       ElMessage.success('拒绝审批完成')
@@ -401,9 +429,6 @@
     else {
       ElMessage.error(`拒绝审批失败：${res.message}`)
     }
-    // 关闭弹窗
-    approvalDialog.value.handleClose()
-
     flowButtsVisable.value = false
   })
 }
@@ -661,10 +686,14 @@
       </detail-block>
     </el-form>
 
-    <approval-dialog
+    <!-- <approval-dialog
       ref="approvalDialog"
       @on-success="approvalSuccessHandler" @on-refuse="refuseHandler" @on-revoke="revokeHandler"
-    />
+    /> -->
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialog" :last-name="customApproval.approvalLastName.resistance" @on-success="approvalSuccessHandler" @refuse="refuseHandler" />
+    <!-- 选择审批人弹窗 -->
+    <select-approver-dialog ref="selectApproverRef" @confirm="confirmSelectApprover" />
 
     <template v-if="current === 'resistance-approval' && status !== '1'">
       <approval-record-table :process-id="recordForm.processId" />
diff --git a/src/views/resource/environment/resistance/list.vue b/src/views/resource/environment/resistance/list.vue
index f3e768e..439b574 100644
--- a/src/views/resource/environment/resistance/list.vue
+++ b/src/views/resource/environment/resistance/list.vue
@@ -3,7 +3,7 @@
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IListQuery, IResistanceRecord } from './resistance-interface'
-import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -13,7 +13,8 @@
 import { exportFile } from '@/utils/exportUtils'
 import { printPdf } from '@/utils/printUtils'
 import useBridgeCount from '@/components/buttonBox/useBridgeCount'
-
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
+import customApproval from '/public/config/customApproval.json'
 // 定义常量
 const buttonBoxActive = 'labResistanceRecordApproval' // 存储在sessionstorage里面的字段名，用于记录右上角buttonbox点击状态
 
@@ -240,12 +241,12 @@
 
 // 流程审批-同意
 const approvalAgreeHandler = (row: IResistanceRecord) => {
-  apprDial.value.initDialog('agree', row.id, row.taskId, '')
+  apprDial.value.initDialog('agree', row.taskId, row.id, row.processId)
 }
 
 // 流程审批-拒绝
 const approvalRefuseHandler = (row: IResistanceRecord) => {
-  apprDial.value.initDialog('refuse', row.id, row.taskId, '')
+  apprDial.value.initDialog('refuse', row.taskId, row.id)
 }
 
 // 取消（撤回审批单）
@@ -287,7 +288,12 @@
 }
 
 // 拒绝
-const refuseHandler = (param: any) => {
+const refuseHandler = (comments: string, taskId: string, id: string) => {
+  const param = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
   refuseApprovalResistance(param).then((res) => {
     if (res.code === 200) {
       ElMessage.success('拒绝审批完成')
@@ -295,8 +301,6 @@
     else {
       ElMessage.error(`拒绝审批失败：${res.message}`)
     }
-    // 关闭弹窗
-    apprDial.value.handleClose()
 
     fetchData(true)
   })
@@ -505,10 +509,18 @@
     </table-container>
 
     <!-- 审批单弹窗 -->
-    <approval-dialog
+    <!-- <approval-dialog
       ref="apprDial"
       @on-success="afterApprovalHandler"
       @on-refuse="refuseHandler"
+    /> -->
+
+    <!-- 审批弹窗-审批人自选 -->
+    <approval-dialog
+      ref="apprDial"
+      :last-name="customApproval.approvalLastName.resistance"
+      @on-success="afterApprovalHandler"
+      @refuse="refuseHandler"
     />
 
     <!-- 右上角按钮集合 -->
diff --git a/src/views/resource/file/change/detail.vue b/src/views/resource/file/change/detail.vue
index 3efc9ab..a0c7c5d 100644
--- a/src/views/resource/file/change/detail.vue
+++ b/src/views/resource/file/change/detail.vue
@@ -5,7 +5,9 @@
 import FileSelectDialog from './dialog/selectSysFileDialog.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
+import customApproval from '/public/config/customApproval.json'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
 import useUserStore from '@/store/modules/user' // 用户信息
 
@@ -292,8 +294,14 @@
   })
 }
 
-// 提交按钮
-const submitButtonHandler = async () => {
+// -----------------------------------提交-------------------------------------------------------
+const selectApproverRef = ref() // 审批人自选组件ref
+// 选好审批人
+const confirmSelectApprover = async (approverList: string[] = []) => {
+  if (!approverList.length) {
+    ElMessage.warning('无审批人，无法提交！')
+    return false
+  }
   if (changeForm.value === null || changeForm.value.processId === undefined || changeForm.value.processId === '') {
     // 流程id为空 表示还未进入流程中 直接提交
     ElMessageBox.confirm(`是否提交文件更改申请单 ${changeForm.value.formNo}`, '提示', {
@@ -309,6 +317,8 @@
       submitChangeForm({
         formId: flowFormId,
         id: changeForm.value.id,
+        processId: changeForm.value.processId,
+        assignees: approverList,
       }).then((res) => {
         if (res.code === 200) {
           ElMessage.success('提交成功')
@@ -333,7 +343,12 @@
           text: '加载中...',
           background: 'rgba(255, 255, 255, 0.6)',
         })
-        failUpdateChangeForm(changeForm.value).then((res) => {
+        const params = {
+          ...changeForm.value,
+          processId: changeForm.value.processId,
+          assignees: approverList,
+        }
+        failUpdateChangeForm(params).then((res) => {
           if (res.code === 200) {
           // 提示保存成功
             ElMessage.success('提交成功')
@@ -354,7 +369,11 @@
     })
   }
 }
-
+// 提交按钮
+const submitButtonHandler = () => {
+  selectApproverRef.value.initDialog()
+}
+// ----------------------------------------------------------------------------------------------
 // 选定文件返回
 const appendFileToList = (listParam: any) => {
   listParam.forEach((item: any) => {
@@ -374,12 +393,12 @@
 
 // 流程审批-同意
 const approvalAgreeHandler = () => {
-  apprDial.value.initDialog('agree', changeForm.value.id, changeForm.value.taskId || route.query.taskId, '')
+  apprDial.value.initDialog('agree', changeForm.value.taskId || route.query.taskId, changeForm.value.id, changeForm.value.processId || route.query.processId)
 }
 
 // 流程审批-拒绝
 const approvalRefuseHandler = () => {
-  apprDial.value.initDialog('refuse', changeForm.value.id, changeForm.value.taskId || route.query.taskId, '')
+  apprDial.value.initDialog('refuse', changeForm.value.taskId || route.query.taskId, changeForm.value.id)
 }
 
 // 取消（撤回审批单）
@@ -443,7 +462,12 @@
 }
 
 // 拒绝
-const refuseHandler = (param: any) => {
+const refuseHandler = (comments: string, taskId: string, id: string) => {
+  const param = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
   refuseApproval(param).then((res) => {
     if (res.code === 200) {
       ElMessage.success('拒绝审批完成')
@@ -451,9 +475,6 @@
     else {
       ElMessage.error(`拒绝审批失败：${res.message}`)
     }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
     flowButtsVisable.value = false
   })
 }
@@ -710,11 +731,15 @@
       </detail-block>
     </el-form>
 
-    <approval-dialog
+    <!-- <approval-dialog
       ref="apprDial"
       @on-success="approvalSuccessHandler"
       @on-refuse="refuseHandler"
-    />
+    /> -->
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="apprDial" :last-name="customApproval.approvalLastName.fileChange" @on-success="approvalSuccessHandler" @refuse="refuseHandler" />
+    <!-- 选择审批人弹窗 -->
+    <select-approver-dialog ref="selectApproverRef" @confirm="confirmSelectApprover" />
 
     <file-select-dialog ref="refFileSelect" @confirm="appendFileToList" />
 
diff --git a/src/views/resource/file/change/list.vue b/src/views/resource/file/change/list.vue
index 71d8624..d6c4606 100644
--- a/src/views/resource/file/change/list.vue
+++ b/src/views/resource/file/change/list.vue
@@ -3,7 +3,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { DateModelType } from 'element-plus'
 import type { IFileChangeForm, IListQuery } from './change-interface'
-import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { deptType } from '@/global'
@@ -11,6 +11,8 @@
 import { getDictByCode } from '@/api/system/dict'
 import { draftDelete, exportFileChangeList, getFileChangeFormList, refuseApproval, revokeApproval, revokeDelete } from '@/api/resource/fileChange'
 import useBridgeCount from '@/components/buttonBox/useBridgeCount'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
+import customApproval from '/public/config/customApproval.json'
 
 // 定义常量
 const buttonBoxActive = 'fileChangeApproval' // 存储在sessionstorage里面的字段名，用于记录右上角buttonbox点击状态
@@ -280,12 +282,12 @@
 
 // 流程审批-同意
 const approvalAgreeHandler = (row: IFileChangeForm) => {
-  apprDial.value.initDialog('agree', row.id, row.taskId, '')
+  apprDial.value.initDialog('agree', row.taskId, row.id, row.processId)
 }
 
 // 流程审批-拒绝
 const approvalRefuseHandler = (row: IFileChangeForm) => {
-  apprDial.value.initDialog('refuse', row.id, row.taskId, '')
+  apprDial.value.initDialog('refuse', row.taskId, row.id)
 }
 
 // 取消（撤回审批单）
@@ -321,7 +323,12 @@
 }
 
 // 拒绝
-const changeFormRefuseHandler = (param: any) => {
+const changeFormRefuseHandler = (comments: string, taskId: string, id: string) => {
+  const param = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
   refuseApproval(param).then((res) => {
     if (res.code === 200) {
       ElMessage.success('拒绝审批完成')
@@ -329,9 +336,6 @@
     else {
       ElMessage.error(`拒绝审批失败：${res.message}`)
     }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
     fetchData(true)
   })
 }
@@ -551,12 +555,19 @@
     </table-container>
 
     <!-- 审批单弹窗 -->
-    <approval-dialog
+    <!-- <approval-dialog
       ref="apprDial"
       @on-success="afterApprovalHandler"
       @on-refuse="changeFormRefuseHandler"
-    />
+    /> -->
 
+    <!-- 审批弹窗-审批人自选 -->
+    <approval-dialog
+      ref="apprDial"
+      :last-name="customApproval.approvalLastName.fileChange"
+      @on-success="afterApprovalHandler"
+      @refuse="changeFormRefuseHandler"
+    />
     <!-- 右上角按钮集合 -->
     <button-box :active="active" :total-refuse="totalRefuse" :total-approval="totalApproval" :total-to-approval="totalToApproval" :menu="menu" @change-current-button="changeCurrentButton" />
   </app-container>
diff --git a/src/views/resource/file/methodConfirm/detail.vue b/src/views/resource/file/methodConfirm/detail.vue
index f38d52c..949e446 100644
--- a/src/views/resource/file/methodConfirm/detail.vue
+++ b/src/views/resource/file/methodConfirm/detail.vue
@@ -8,7 +8,9 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IFileInfo as IMethodFileInfo } from '@/views/resource/technology/method/method-interface'
 import { getFileMethodList } from '@/api/resource/fileTechnology'
-import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
+import customApproval from '/public/config/customApproval.json'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
@@ -269,8 +271,14 @@
   })
 }
 
-// 提交按钮
-const submitButtonHandler = async () => {
+// -----------------------------------提交-------------------------------------------------------
+const selectApproverRef = ref() // 审批人自选组件ref
+// 选好审批人
+const confirmSelectApprover = async (approverList: string[] = []) => {
+  if (!approverList.length) {
+    ElMessage.warning('无审批人，无法提交！')
+    return false
+  }
   if (methodConfirm.value === null || methodConfirm.value.processId === undefined || methodConfirm.value.processId === '') {
     // 流程id为空 表示还未进入流程中 直接提交
     ElMessageBox.confirm(`是否提交方法确认登记表 ${methodConfirm.value.formNo}`, '提示', {
@@ -281,6 +289,8 @@
       submitMethodConfirm({
         formId: flowFormId,
         id: methodConfirm.value.id,
+        processId: methodConfirm.value.processId,
+        assignees: approverList,
       }).then((res) => {
         if (res.code === 200) {
           ElMessage.success(`方法确认登记表 ${methodConfirm.value.formNo} 提交成功`)
@@ -298,7 +308,12 @@
     // 之前已经在流程中的表单 保存提交
     await methodConfirmRef.value.validate((valid: boolean) => {
       if (valid === true) {
-        failUpdateMethodConfirm(methodConfirm.value).then((res) => {
+        const param = {
+          ...methodConfirm.value,
+          processId: methodConfirm.value.processId,
+          assignees: approverList,
+        }
+        failUpdateMethodConfirm(param).then((res) => {
           if (res.code === 200) {
             // 提示保存成功
             ElMessage.success(`方法确认登记表 ${methodConfirm.value.formNo} 提交成功`)
@@ -315,6 +330,11 @@
     })
   }
 }
+// 提交按钮
+const submitButtonHandler = () => {
+  selectApproverRef.value.initDialog()
+}
+// -----------------------------------提交-------------------------------------------------------
 
 // 显示筛选委托方名录的弹窗
 const showFilterMethod = () => {
@@ -378,17 +398,30 @@
 }
 // 流程审批-同意
 const approvalAgreeHandler = () => {
-  apprDial.value.initDialog('agree', methodConfirm.value.id, methodConfirm.value.taskId || route.query.taskId, '')
+  apprDial.value.initDialog('agree', methodConfirm.value.taskId || route.query.taskId, methodConfirm.value.id, methodConfirm.value.processId || route.query.processId)
 }
 
 // 流程审批-拒绝
 const approvalRefuseHandler = () => {
-  apprDial.value.initDialog('refuse', methodConfirm.value.id, methodConfirm.value.taskId || route.query.taskId, '')
+  apprDial.value.initDialog('refuse', methodConfirm.value.taskId || route.query.taskId, methodConfirm.value.id)
 }
 
 // 取消（撤回审批单）
 const revokeClickedHandler = () => {
-  apprDial.value.initDialog('revoke', methodConfirm.value.id, methodConfirm.value.taskId || route.query.taskId, methodConfirm.value.processId || route.query.processId)
+  const param = {
+    processInstanceId: methodConfirm.value.processId || route.query.processId!,
+    comments: '',
+    id: id.value,
+  }
+  revokeApproval(param).then((res) => {
+    if (res.code === 200) {
+      ElMessage.success('流程取消成功')
+    }
+    else {
+      ElMessage.error(`流程取消失败：${res.message}`)
+    }
+    cancelButtVisable.value = false
+  })
 }
 
 // 删除（只有已取消的可以在详情中删除）
@@ -424,24 +457,13 @@
   }
 }
 
-// 取消
-const revokeHandler = (param: any) => {
-  revokeApproval(param).then((res) => {
-    if (res.code === 200) {
-      ElMessage.success('流程取消成功')
-    }
-    else {
-      ElMessage.error(`流程取消失败：${res.message}`)
-    }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
-    cancelButtVisable.value = false
-  })
-}
-
 // 拒绝
-const refuseHandler = (param: any) => {
+const refuseHandler = (comments: string, taskId: string, id: string) => {
+  const param = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
   refuseApproval(param).then((res) => {
     if (res.code === 200) {
       ElMessage.success('拒绝审批完成')
@@ -449,9 +471,6 @@
     else {
       ElMessage.error(`拒绝审批失败：${res.message}`)
     }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
     flowButtsVisable.value = false
   })
 }
@@ -867,10 +886,15 @@
       </template>
     </el-form>
 
-    <approval-dialog
+    <!-- <approval-dialog
       ref="apprDial" @on-success="approvalSuccessHandler" @on-refuse="refuseHandler"
       @on-revoke="revokeHandler"
-    />
+    /> -->
+
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="apprDial" :last-name="customApproval.approvalLastName.methodConfirm" @on-success="approvalSuccessHandler" @refuse="refuseHandler" />
+    <!-- 选择审批人弹窗 -->
+    <select-approver-dialog ref="selectApproverRef" @confirm="confirmSelectApprover" />
 
     <file-select-dialog ref="refFileSelect" @confirm="methodFileSelected" />
 
diff --git a/src/views/resource/file/methodConfirm/list.vue b/src/views/resource/file/methodConfirm/list.vue
index 973683c..2d9ea42 100644
--- a/src/views/resource/file/methodConfirm/list.vue
+++ b/src/views/resource/file/methodConfirm/list.vue
@@ -6,11 +6,12 @@
 import type { IMenu } from '@/components/buttonBox/buttonBox'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IDictType } from '@/commonInterface/resource-interface'
-import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import { getDictByCode } from '@/api/system/dict'
 import { draftDelete, getMethodConfirmList, refuseApproval, revokeApproval, revokeDelete } from '@/api/resource/fileConfirm'
 import useBridgeCount from '@/components/buttonBox/useBridgeCount'
-
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
+import customApproval from '/public/config/customApproval.json'
 // 定义常量
 const buttonBoxActive = 'fileMethodConfirm' // 存储在sessionstorage里面的字段名，用于记录右上角buttonbox点击状态
 const flowFormId = 'zyglffqrdjb' // 资源管理 - 方法确认登记表
@@ -249,17 +250,30 @@
 
 // 流程审批-同意
 const approvalAgreeHandler = (row: IFileMethodConfirm) => {
-  apprDial.value.initDialog('agree', row.id, row.taskId, '')
+  apprDial.value.initDialog('agree', row.taskId, row.id, row.processId)
 }
 
 // 流程审批-拒绝
 const approvalRefuseHandler = (row: IFileMethodConfirm) => {
-  apprDial.value.initDialog('refuse', row.id, row.taskId, '')
+  apprDial.value.initDialog('refuse', row.taskId, row.id)
 }
 
 // 取消（撤回审批单）
 const revokeApprById = (row: IFileMethodConfirm) => {
-  apprDial.value.initDialog('revoke', row.id, row.taskId, row.processId)
+  const params = {
+    processInstanceId: row.processId!,
+    comments: '',
+    id: row.id,
+  }
+  revokeApproval(params).then((res) => {
+    if (res.code === 200) {
+      ElMessage.success('流程取消成功')
+    }
+    else {
+      ElMessage.error(`流程取消失败：${res.message}`)
+    }
+    fetchData(true)
+  })
 }
 
 // 流程操作之后刷新
@@ -267,24 +281,13 @@
   fetchData(true)
 }
 
-// 取消
-const approvalFormRevokeHandler = (param: any) => {
-  revokeApproval(param).then((res) => {
-    if (res.code === 200) {
-      ElMessage.success('流程取消成功')
-    }
-    else {
-      ElMessage.error(`流程取消失败：${res.message}`)
-    }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
-    fetchData(true)
-  })
-}
-
 // 拒绝
-const approvalFormRefuseHandler = (param: any) => {
+const approvalFormRefuseHandler = (comments: string, taskId: string, id: string) => {
+  const param = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
   refuseApproval(param).then((res) => {
     if (res.code === 200) {
       ElMessage.success('拒绝审批完成')
@@ -292,9 +295,6 @@
     else {
       ElMessage.error(`拒绝审批失败：${res.message}`)
     }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
     fetchData(true)
   })
 }
@@ -481,11 +481,19 @@
     </table-container>
 
     <!-- 审批单弹窗 -->
-    <approval-dialog
+    <!-- <approval-dialog
       ref="apprDial"
       @on-success="afterApprovalHandler"
       @on-refuse="approvalFormRefuseHandler"
       @on-revoke="approvalFormRevokeHandler"
+    /> -->
+
+    <!-- 审批弹窗-审批人自选 -->
+    <approval-dialog
+      ref="apprDial"
+      :last-name="customApproval.approvalLastName.methodConfirm"
+      @on-success="afterApprovalHandler"
+      @refuse="approvalFormRefuseHandler"
     />
 
     <!-- 右上角按钮集合 -->
diff --git a/src/views/resource/file/noveltySearch/detail.vue b/src/views/resource/file/noveltySearch/detail.vue
index 19bdf70..116ea3e 100644
--- a/src/views/resource/file/noveltySearch/detail.vue
+++ b/src/views/resource/file/noveltySearch/detail.vue
@@ -1,4 +1,4 @@
-<!-- 委托方意见登记表详情 -->
+<!-- 测试校准检定方法查新记录表详情 -->
 <script name="FileNoveltySearchDetail" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import { Close } from '@element-plus/icons-vue'
@@ -9,7 +9,9 @@
 import type { IDictType } from '@/commonInterface/resource-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IFileInfo as IMethodFileInfo } from '@/views/resource/technology/method/method-interface'
-import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
+import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
+import customApproval from '/public/config/customApproval.json'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
@@ -279,8 +281,14 @@
   })
 }
 
-// 提交按钮
-const submitButtonHandler = async () => {
+// -----------------------------------提交-------------------------------------------------------
+const selectApproverRef = ref() // 审批人自选组件ref
+// 选好审批人
+const confirmSelectApprover = async (approverList: string[] = []) => {
+  if (!approverList.length) {
+    ElMessage.warning('无审批人，无法提交！')
+    return false
+  }
   if (novelty.value === null || novelty.value.processId === undefined || novelty.value.processId === '') {
     // 流程id为空 表示还未进入流程中 直接提交
     ElMessageBox.confirm(`是否提交查新记录表 ${novelty.value.formNo}`, '提示', {
@@ -291,6 +299,8 @@
       submitNovelty({
         formId: flowFormId,
         id: novelty.value.id,
+        processId: novelty.value.processId,
+        assignees: approverList,
       }).then((res) => {
         if (res.code === 200) {
           ElMessage.success(`查新记录表 ${novelty.value.formNo} 提交成功`)
@@ -311,7 +321,12 @@
     // 之前已经在流程中的表单 保存提交
     await noveltyRef.value.validate((valid: boolean) => {
       if (valid === true) {
-        failUpdateNovelty(novelty.value).then((res) => {
+        const params = {
+          ...novelty.value,
+          processId: novelty.value.processId,
+          assignees: approverList,
+        }
+        failUpdateNovelty(params).then((res) => {
           if (res.code === 200) {
             // 提示保存成功
             ElMessage.success(`查新记录表 ${novelty.value.formNo} 提交成功`)
@@ -329,6 +344,11 @@
     })
   }
 }
+// 提交按钮
+const submitButtonHandler = () => {
+  selectApproverRef.value.initDialog()
+}
+// ----------------------------------------------------------------------------------------------
 
 // 选定文件返回
 const appendFileToList = (row: IMethodFileInfo, result: string) => {
@@ -347,17 +367,33 @@
 
 // 流程审批-同意
 const approvalAgreeHandler = () => {
-  apprDial.value.initDialog('agree', novelty.value.id, novelty.value.taskId || route.query.taskId, '')
+  apprDial.value.initDialog('agree', novelty.value.taskId || route.query.taskId, novelty.value.id, novelty.value.processId || route.query.processId)
 }
 
 // 流程审批-拒绝
 const approvalRefuseHandler = () => {
-  apprDial.value.initDialog('refuse', novelty.value.id, novelty.value.taskId || route.query.taskId, '')
+  apprDial.value.initDialog('refuse', novelty.value.taskId || route.query.taskId, novelty.value.id)
 }
 
 // 取消（撤回审批单）
 const revokeClickedHandler = () => {
-  apprDial.value.initDialog('revoke', novelty.value.id, novelty.value.taskId || route.query.taskId, novelty.value.processId || route.query.processId)
+  const params = {
+    processInstanceId: novelty.value.processId! || route.query.processId,
+    comments: '',
+    id: novelty.value.id,
+  }
+  revokeApproval(params).then((res) => {
+    if (res.code === 200) {
+      ElMessage.success('流程取消成功')
+    }
+    else {
+      ElMessage.error(`流程取消失败：${res.message}`)
+    }
+    // 关闭弹窗
+    apprDial.value.handleClose()
+
+    cancelButtVisable.value = false
+  })
 }
 
 // 删除（只有已取消的可以在详情中删除）
@@ -385,32 +421,22 @@
 
 // 流程操作之后刷新
 const approvalSuccessHandler = (type: string) => {
-  if (type === 'agree' || type === 'refuse') {
-    flowButtsVisable.value = false
-  }
-  else if (type === 'revoke') {
-    cancelButtVisable.value = false
-  }
-}
-
-// 取消
-const revokeHandler = (param: any) => {
-  revokeApproval(param).then((res) => {
-    if (res.code === 200) {
-      ElMessage.success('流程取消成功')
-    }
-    else {
-      ElMessage.error(`流程取消失败：${res.message}`)
-    }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
-    cancelButtVisable.value = false
-  })
+  flowButtsVisable.value = false
+  // if (type === 'agree' || type === 'refuse') {
+  //   flowButtsVisable.value = false
+  // }
+  // else if (type === 'revoke') {
+  //   cancelButtVisable.value = false
+  // }
 }
 
 // 拒绝
-const refuseHandler = (param: any) => {
+const refuseHandler = (comments: string, taskId: string, id: string) => {
+  const param = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
   refuseApproval(param).then((res) => {
     if (res.code === 200) {
       ElMessage.success('拒绝审批完成')
@@ -418,9 +444,6 @@
     else {
       ElMessage.error(`拒绝审批失败：${res.message}`)
     }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
     flowButtsVisable.value = false
   })
 }
@@ -1059,11 +1082,16 @@
       </detail-page>
     </el-form>
 
-    <approval-dialog
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="apprDial" :last-name="customApproval.approvalLastName.noveltySearch" @on-success="approvalSuccessHandler" @refuse="refuseHandler" />
+    <!-- 选择审批人弹窗 -->
+    <select-approver-dialog ref="selectApproverRef" @confirm="confirmSelectApprover" />
+    <!-- <approval-dialog
       ref="apprDial" @on-success="approvalSuccessHandler" @on-refuse="refuseHandler"
       @on-revoke="revokeHandler"
-    />
-
+    /> -->
+    <!-- 审批弹窗-审批人自选 -->
+    <!-- <approval-dialog ref="approvalDialog" :last-name="customApproval.approvalLastName.noveltySearch" @on-success="afterApprovalHandler" @refuse="noveltyRefuseHandler" /> -->
     <file-select-dialog ref="refFileSelect" @records-selected="appendFileToList" />
 
     <template v-if="current === 'novelty-approval' && status !== '1'">
diff --git a/src/views/resource/file/noveltySearch/list.vue b/src/views/resource/file/noveltySearch/list.vue
index be0ea46..6f6b973 100644
--- a/src/views/resource/file/noveltySearch/list.vue
+++ b/src/views/resource/file/noveltySearch/list.vue
@@ -255,12 +255,12 @@
 
 // 流程审批-同意
 const approvalAgreeHandler = (row: IMethodNoveltySearch) => {
-  apprDial.value.initDialog('agree', row.id, row.taskId, '')
+  apprDial.value.initDialog('agree', row.taskId, row.id, row.processId)
 }
 
 // 流程审批-拒绝
 const approvalRefuseHandler = (row: IMethodNoveltySearch) => {
-  apprDial.value.initDialog('refuse', row.id, row.taskId, '')
+  apprDial.value.initDialog('refuse', row.taskId, row.id)
 }
 
 // 取消（撤回审批单）
@@ -277,9 +277,6 @@
     else {
       ElMessage.error(`流程取消失败：${res.message}`)
     }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
     fetchData(true)
   })
 }
@@ -290,17 +287,19 @@
 }
 
 // 拒绝
-const noveltyRefuseHandler = (param: any) => {
-  refuseApproval(param).then((res) => {
+const noveltyRefuseHandler = (comments: string, taskId: string, id: string) => {
+  const params = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
+  refuseApproval(params).then((res) => {
     if (res.code === 200) {
       ElMessage.success('拒绝审批完成')
     }
     else {
       ElMessage.error(`拒绝审批失败：${res.message}`)
     }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
     fetchData(true)
   })
 }
@@ -497,7 +496,7 @@
     </table-container>
 
     <!-- 审批弹窗-审批人自选 -->
-    <approval-dialog ref="approvalDialog" :last-name="customApproval.approvalLastName.standardCheckRecord" @on-success="afterApprovalHandler" @refuse="noveltyRefuseHandler" />
+    <approval-dialog ref="apprDial" :last-name="customApproval.approvalLastName.noveltySearch" @on-success="afterApprovalHandler" @refuse="noveltyRefuseHandler" />
 
     <!-- 右上角按钮集合 -->
     <button-box :active="active" :total-refuse="totalRefuse" :total-approval="totalApproval" :total-to-approval="totalToApproval" :menu="menu" @change-current-button="changeCurrentButton" />

diff --git a/public/config/customApproval.json b/public/config/customApproval.json
index 205ac21..d69296d 100644
--- a/public/config/customApproval.json
+++ b/public/config/customApproval.json
@@ -1,7 +1,22 @@
 {
-  "approvalLastNameDescribe": "审批流程最后一个节点的名字，用来判断审批自选的时候是否是最后一个节点",
+  "approvalLastName--Describe": "审批流程最后一个节点的名字，用来判断审批自选的时候是否是最后一个节点",
   "approvalLastName": {
-    "standardCheckRecordDescribe": "核查记录",
-    "standardCheckRecord": "技术负责人"
+    "standardCheckRecord--Describe": "核查记录",
+    "standardCheckRecord": "技术负责人",
+
+    "noveltySearch--Describe": "测试校准检定方法查新记录表",
+    "noveltySearch": "审核人",
+
+    "fileChange--Describe": "文件更改申请单",
+    "fileChange": "主任",
+
+    "methodConfirm--Describe": "方法确认登记表",
+    "methodConfirm": "技术负责人",
+
+    "softwareReviewReport--Describe": "软件评审报告",
+    "softwareReviewReport": "技术负责人",
+
+    "resistance--Describe": "实验室接地电阻记录",
+    "resistance": "审核人"
   }
 }
diff --git a/src/views/resource/environment/resistance/edit.vue b/src/views/resource/environment/resistance/edit.vue
index dd62bd1..fd06d64 100644
--- a/src/views/resource/environment/resistance/edit.vue
+++ b/src/views/resource/environment/resistance/edit.vue
@@ -2,7 +2,9 @@
 <script name="EnvironmentResistanceDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IResistanceRecord } from './resistance-interface'
-import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
+import customApproval from '/public/config/customApproval.json'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { detailResistance, draftDeleteResistance, failUpdateResistance, refuseApprovalResistance, revokeApprovalResistance, saveResistance, submitResistance, updateResistance } from '@/api/resource/environmentTest'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
@@ -37,7 +39,7 @@
 const approvalDialog = ref()
 const testRecordRef = ref()
 
-const recordForm = ref<IResistanceRecord>({
+const recordForm: any = ref({
   id: '',
   recordNo: '',
   recordName: '实验室接地电阻记录',
@@ -241,9 +243,14 @@
     }
   })
 }
-
-// 提交按钮
-const submitButtonHandler = async () => {
+// -----------------------------------提交-------------------------------------------------------
+const selectApproverRef = ref() // 审批人自选组件ref
+// 选好审批人
+const confirmSelectApprover = async (approverList: string[] = []) => {
+  if (!approverList.length) {
+    ElMessage.warning('无审批人，无法提交！')
+    return false
+  }
   if (recordForm.value === null || recordForm.value.processId === undefined || recordForm.value.processId === '') {
     // 流程id为空 表示还未进入流程中 直接提交
     ElMessageBox.confirm(`是否提交实验室接地电阻记录 ${recordForm.value.recordNo}`, '提示', {
@@ -259,6 +266,8 @@
       submitResistance({
         formId: SCHEDULE.LAB_RESISTANCE_RECORD_APPROVAL,
         id: recordForm.value.id,
+        processId: recordForm.value.processId,
+        assignees: approverList,
       }).then((res) => {
         if (res.code === 200) {
           ElMessage.success(`实验室接地电阻记录 ${recordForm.value.recordNo} 提交成功`)
@@ -282,7 +291,12 @@
           text: '加载中...',
           background: 'rgba(255, 255, 255, 0.6)',
         })
-        failUpdateResistance(recordForm.value).then((res) => {
+        const params = {
+          ...recordForm.value,
+          processId: recordForm.value.processId,
+          assignees: approverList,
+        }
+        failUpdateResistance(params).then((res) => {
           if (res.code === 200) {
           // 提示保存成功
             ElMessage.success('保存成功')
@@ -302,6 +316,12 @@
     })
   }
 }
+// 提交按钮
+const submitButtonHandler = () => {
+  selectApproverRef.value.initDialog()
+}
+
+// ---------------------------------------------------------------------------------------------
 
 // 根据id查询详情
 const detailById = async (id: string) => {
@@ -312,7 +332,10 @@
   })
   await detailResistance({ id }).then((res) => {
     if (res.code === 200) {
-      recordForm.value = res.data
+      // recordForm.value = res.data
+      for (const key in recordForm.value) {
+        recordForm.value[key] = res.data[key]
+      }
       if (recordForm.value.taskId === '') {
         recordForm.value.taskId = sessionStorage.getItem('resistanceRecordTaskId')!
       }
@@ -328,12 +351,12 @@
 // ------------------------------------------------审批----------------------------------------
 // 流程审批-拒绝
 const approvalRefuseHandler = () => {
-  approvalDialog.value.initDialog('refuse', recordForm.value.id, recordForm.value.taskId || route.query.taskId, '')
+  approvalDialog.value.initDialog('refuse', recordForm.value.taskId || route.query.taskId, recordForm.value.id)
 }
 
 // 流程审批-同意
 const approvalAgreeHandler = () => {
-  approvalDialog.value.initDialog('agree', recordForm.value.id, recordForm.value.taskId || route.query.taskId, '')
+  approvalDialog.value.initDialog('agree', recordForm.value.taskId || route.query.taskId, recordForm.value.id, recordForm.value.processId || route.query.processId)
 }
 
 // 取消流程
@@ -393,7 +416,12 @@
 }
 
 // 拒绝
-const refuseHandler = (param: any) => {
+const refuseHandler = (comments: string, taskId: string, id: string) => {
+  const param = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
   refuseApprovalResistance(param).then((res) => {
     if (res.code === 200) {
       ElMessage.success('拒绝审批完成')
@@ -401,9 +429,6 @@
     else {
       ElMessage.error(`拒绝审批失败：${res.message}`)
     }
-    // 关闭弹窗
-    approvalDialog.value.handleClose()
-
     flowButtsVisable.value = false
   })
 }
@@ -661,10 +686,14 @@
       </detail-block>
     </el-form>
 
-    <approval-dialog
+    <!-- <approval-dialog
       ref="approvalDialog"
       @on-success="approvalSuccessHandler" @on-refuse="refuseHandler" @on-revoke="revokeHandler"
-    />
+    /> -->
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialog" :last-name="customApproval.approvalLastName.resistance" @on-success="approvalSuccessHandler" @refuse="refuseHandler" />
+    <!-- 选择审批人弹窗 -->
+    <select-approver-dialog ref="selectApproverRef" @confirm="confirmSelectApprover" />
 
     <template v-if="current === 'resistance-approval' && status !== '1'">
       <approval-record-table :process-id="recordForm.processId" />
diff --git a/src/views/resource/environment/resistance/list.vue b/src/views/resource/environment/resistance/list.vue
index f3e768e..439b574 100644
--- a/src/views/resource/environment/resistance/list.vue
+++ b/src/views/resource/environment/resistance/list.vue
@@ -3,7 +3,7 @@
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IListQuery, IResistanceRecord } from './resistance-interface'
-import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -13,7 +13,8 @@
 import { exportFile } from '@/utils/exportUtils'
 import { printPdf } from '@/utils/printUtils'
 import useBridgeCount from '@/components/buttonBox/useBridgeCount'
-
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
+import customApproval from '/public/config/customApproval.json'
 // 定义常量
 const buttonBoxActive = 'labResistanceRecordApproval' // 存储在sessionstorage里面的字段名，用于记录右上角buttonbox点击状态
 
@@ -240,12 +241,12 @@
 
 // 流程审批-同意
 const approvalAgreeHandler = (row: IResistanceRecord) => {
-  apprDial.value.initDialog('agree', row.id, row.taskId, '')
+  apprDial.value.initDialog('agree', row.taskId, row.id, row.processId)
 }
 
 // 流程审批-拒绝
 const approvalRefuseHandler = (row: IResistanceRecord) => {
-  apprDial.value.initDialog('refuse', row.id, row.taskId, '')
+  apprDial.value.initDialog('refuse', row.taskId, row.id)
 }
 
 // 取消（撤回审批单）
@@ -287,7 +288,12 @@
 }
 
 // 拒绝
-const refuseHandler = (param: any) => {
+const refuseHandler = (comments: string, taskId: string, id: string) => {
+  const param = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
   refuseApprovalResistance(param).then((res) => {
     if (res.code === 200) {
       ElMessage.success('拒绝审批完成')
@@ -295,8 +301,6 @@
     else {
       ElMessage.error(`拒绝审批失败：${res.message}`)
     }
-    // 关闭弹窗
-    apprDial.value.handleClose()
 
     fetchData(true)
   })
@@ -505,10 +509,18 @@
     </table-container>
 
     <!-- 审批单弹窗 -->
-    <approval-dialog
+    <!-- <approval-dialog
       ref="apprDial"
       @on-success="afterApprovalHandler"
       @on-refuse="refuseHandler"
+    /> -->
+
+    <!-- 审批弹窗-审批人自选 -->
+    <approval-dialog
+      ref="apprDial"
+      :last-name="customApproval.approvalLastName.resistance"
+      @on-success="afterApprovalHandler"
+      @refuse="refuseHandler"
     />
 
     <!-- 右上角按钮集合 -->
diff --git a/src/views/resource/file/change/detail.vue b/src/views/resource/file/change/detail.vue
index 3efc9ab..a0c7c5d 100644
--- a/src/views/resource/file/change/detail.vue
+++ b/src/views/resource/file/change/detail.vue
@@ -5,7 +5,9 @@
 import FileSelectDialog from './dialog/selectSysFileDialog.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
+import customApproval from '/public/config/customApproval.json'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
 import useUserStore from '@/store/modules/user' // 用户信息
 
@@ -292,8 +294,14 @@
   })
 }
 
-// 提交按钮
-const submitButtonHandler = async () => {
+// -----------------------------------提交-------------------------------------------------------
+const selectApproverRef = ref() // 审批人自选组件ref
+// 选好审批人
+const confirmSelectApprover = async (approverList: string[] = []) => {
+  if (!approverList.length) {
+    ElMessage.warning('无审批人，无法提交！')
+    return false
+  }
   if (changeForm.value === null || changeForm.value.processId === undefined || changeForm.value.processId === '') {
     // 流程id为空 表示还未进入流程中 直接提交
     ElMessageBox.confirm(`是否提交文件更改申请单 ${changeForm.value.formNo}`, '提示', {
@@ -309,6 +317,8 @@
       submitChangeForm({
         formId: flowFormId,
         id: changeForm.value.id,
+        processId: changeForm.value.processId,
+        assignees: approverList,
       }).then((res) => {
         if (res.code === 200) {
           ElMessage.success('提交成功')
@@ -333,7 +343,12 @@
           text: '加载中...',
           background: 'rgba(255, 255, 255, 0.6)',
         })
-        failUpdateChangeForm(changeForm.value).then((res) => {
+        const params = {
+          ...changeForm.value,
+          processId: changeForm.value.processId,
+          assignees: approverList,
+        }
+        failUpdateChangeForm(params).then((res) => {
           if (res.code === 200) {
           // 提示保存成功
             ElMessage.success('提交成功')
@@ -354,7 +369,11 @@
     })
   }
 }
-
+// 提交按钮
+const submitButtonHandler = () => {
+  selectApproverRef.value.initDialog()
+}
+// ----------------------------------------------------------------------------------------------
 // 选定文件返回
 const appendFileToList = (listParam: any) => {
   listParam.forEach((item: any) => {
@@ -374,12 +393,12 @@
 
 // 流程审批-同意
 const approvalAgreeHandler = () => {
-  apprDial.value.initDialog('agree', changeForm.value.id, changeForm.value.taskId || route.query.taskId, '')
+  apprDial.value.initDialog('agree', changeForm.value.taskId || route.query.taskId, changeForm.value.id, changeForm.value.processId || route.query.processId)
 }
 
 // 流程审批-拒绝
 const approvalRefuseHandler = () => {
-  apprDial.value.initDialog('refuse', changeForm.value.id, changeForm.value.taskId || route.query.taskId, '')
+  apprDial.value.initDialog('refuse', changeForm.value.taskId || route.query.taskId, changeForm.value.id)
 }
 
 // 取消（撤回审批单）
@@ -443,7 +462,12 @@
 }
 
 // 拒绝
-const refuseHandler = (param: any) => {
+const refuseHandler = (comments: string, taskId: string, id: string) => {
+  const param = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
   refuseApproval(param).then((res) => {
     if (res.code === 200) {
       ElMessage.success('拒绝审批完成')
@@ -451,9 +475,6 @@
     else {
       ElMessage.error(`拒绝审批失败：${res.message}`)
     }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
     flowButtsVisable.value = false
   })
 }
@@ -710,11 +731,15 @@
       </detail-block>
     </el-form>
 
-    <approval-dialog
+    <!-- <approval-dialog
       ref="apprDial"
       @on-success="approvalSuccessHandler"
       @on-refuse="refuseHandler"
-    />
+    /> -->
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="apprDial" :last-name="customApproval.approvalLastName.fileChange" @on-success="approvalSuccessHandler" @refuse="refuseHandler" />
+    <!-- 选择审批人弹窗 -->
+    <select-approver-dialog ref="selectApproverRef" @confirm="confirmSelectApprover" />
 
     <file-select-dialog ref="refFileSelect" @confirm="appendFileToList" />
 
diff --git a/src/views/resource/file/change/list.vue b/src/views/resource/file/change/list.vue
index 71d8624..d6c4606 100644
--- a/src/views/resource/file/change/list.vue
+++ b/src/views/resource/file/change/list.vue
@@ -3,7 +3,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { DateModelType } from 'element-plus'
 import type { IFileChangeForm, IListQuery } from './change-interface'
-import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { deptType } from '@/global'
@@ -11,6 +11,8 @@
 import { getDictByCode } from '@/api/system/dict'
 import { draftDelete, exportFileChangeList, getFileChangeFormList, refuseApproval, revokeApproval, revokeDelete } from '@/api/resource/fileChange'
 import useBridgeCount from '@/components/buttonBox/useBridgeCount'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
+import customApproval from '/public/config/customApproval.json'
 
 // 定义常量
 const buttonBoxActive = 'fileChangeApproval' // 存储在sessionstorage里面的字段名，用于记录右上角buttonbox点击状态
@@ -280,12 +282,12 @@
 
 // 流程审批-同意
 const approvalAgreeHandler = (row: IFileChangeForm) => {
-  apprDial.value.initDialog('agree', row.id, row.taskId, '')
+  apprDial.value.initDialog('agree', row.taskId, row.id, row.processId)
 }
 
 // 流程审批-拒绝
 const approvalRefuseHandler = (row: IFileChangeForm) => {
-  apprDial.value.initDialog('refuse', row.id, row.taskId, '')
+  apprDial.value.initDialog('refuse', row.taskId, row.id)
 }
 
 // 取消（撤回审批单）
@@ -321,7 +323,12 @@
 }
 
 // 拒绝
-const changeFormRefuseHandler = (param: any) => {
+const changeFormRefuseHandler = (comments: string, taskId: string, id: string) => {
+  const param = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
   refuseApproval(param).then((res) => {
     if (res.code === 200) {
       ElMessage.success('拒绝审批完成')
@@ -329,9 +336,6 @@
     else {
       ElMessage.error(`拒绝审批失败：${res.message}`)
     }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
     fetchData(true)
   })
 }
@@ -551,12 +555,19 @@
     </table-container>
 
     <!-- 审批单弹窗 -->
-    <approval-dialog
+    <!-- <approval-dialog
       ref="apprDial"
       @on-success="afterApprovalHandler"
       @on-refuse="changeFormRefuseHandler"
-    />
+    /> -->
 
+    <!-- 审批弹窗-审批人自选 -->
+    <approval-dialog
+      ref="apprDial"
+      :last-name="customApproval.approvalLastName.fileChange"
+      @on-success="afterApprovalHandler"
+      @refuse="changeFormRefuseHandler"
+    />
     <!-- 右上角按钮集合 -->
     <button-box :active="active" :total-refuse="totalRefuse" :total-approval="totalApproval" :total-to-approval="totalToApproval" :menu="menu" @change-current-button="changeCurrentButton" />
   </app-container>
diff --git a/src/views/resource/file/methodConfirm/detail.vue b/src/views/resource/file/methodConfirm/detail.vue
index f38d52c..949e446 100644
--- a/src/views/resource/file/methodConfirm/detail.vue
+++ b/src/views/resource/file/methodConfirm/detail.vue
@@ -8,7 +8,9 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IFileInfo as IMethodFileInfo } from '@/views/resource/technology/method/method-interface'
 import { getFileMethodList } from '@/api/resource/fileTechnology'
-import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
+import customApproval from '/public/config/customApproval.json'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
@@ -269,8 +271,14 @@
   })
 }
 
-// 提交按钮
-const submitButtonHandler = async () => {
+// -----------------------------------提交-------------------------------------------------------
+const selectApproverRef = ref() // 审批人自选组件ref
+// 选好审批人
+const confirmSelectApprover = async (approverList: string[] = []) => {
+  if (!approverList.length) {
+    ElMessage.warning('无审批人，无法提交！')
+    return false
+  }
   if (methodConfirm.value === null || methodConfirm.value.processId === undefined || methodConfirm.value.processId === '') {
     // 流程id为空 表示还未进入流程中 直接提交
     ElMessageBox.confirm(`是否提交方法确认登记表 ${methodConfirm.value.formNo}`, '提示', {
@@ -281,6 +289,8 @@
       submitMethodConfirm({
         formId: flowFormId,
         id: methodConfirm.value.id,
+        processId: methodConfirm.value.processId,
+        assignees: approverList,
       }).then((res) => {
         if (res.code === 200) {
           ElMessage.success(`方法确认登记表 ${methodConfirm.value.formNo} 提交成功`)
@@ -298,7 +308,12 @@
     // 之前已经在流程中的表单 保存提交
     await methodConfirmRef.value.validate((valid: boolean) => {
       if (valid === true) {
-        failUpdateMethodConfirm(methodConfirm.value).then((res) => {
+        const param = {
+          ...methodConfirm.value,
+          processId: methodConfirm.value.processId,
+          assignees: approverList,
+        }
+        failUpdateMethodConfirm(param).then((res) => {
           if (res.code === 200) {
             // 提示保存成功
             ElMessage.success(`方法确认登记表 ${methodConfirm.value.formNo} 提交成功`)
@@ -315,6 +330,11 @@
     })
   }
 }
+// 提交按钮
+const submitButtonHandler = () => {
+  selectApproverRef.value.initDialog()
+}
+// -----------------------------------提交-------------------------------------------------------
 
 // 显示筛选委托方名录的弹窗
 const showFilterMethod = () => {
@@ -378,17 +398,30 @@
 }
 // 流程审批-同意
 const approvalAgreeHandler = () => {
-  apprDial.value.initDialog('agree', methodConfirm.value.id, methodConfirm.value.taskId || route.query.taskId, '')
+  apprDial.value.initDialog('agree', methodConfirm.value.taskId || route.query.taskId, methodConfirm.value.id, methodConfirm.value.processId || route.query.processId)
 }
 
 // 流程审批-拒绝
 const approvalRefuseHandler = () => {
-  apprDial.value.initDialog('refuse', methodConfirm.value.id, methodConfirm.value.taskId || route.query.taskId, '')
+  apprDial.value.initDialog('refuse', methodConfirm.value.taskId || route.query.taskId, methodConfirm.value.id)
 }
 
 // 取消（撤回审批单）
 const revokeClickedHandler = () => {
-  apprDial.value.initDialog('revoke', methodConfirm.value.id, methodConfirm.value.taskId || route.query.taskId, methodConfirm.value.processId || route.query.processId)
+  const param = {
+    processInstanceId: methodConfirm.value.processId || route.query.processId!,
+    comments: '',
+    id: id.value,
+  }
+  revokeApproval(param).then((res) => {
+    if (res.code === 200) {
+      ElMessage.success('流程取消成功')
+    }
+    else {
+      ElMessage.error(`流程取消失败：${res.message}`)
+    }
+    cancelButtVisable.value = false
+  })
 }
 
 // 删除（只有已取消的可以在详情中删除）
@@ -424,24 +457,13 @@
   }
 }
 
-// 取消
-const revokeHandler = (param: any) => {
-  revokeApproval(param).then((res) => {
-    if (res.code === 200) {
-      ElMessage.success('流程取消成功')
-    }
-    else {
-      ElMessage.error(`流程取消失败：${res.message}`)
-    }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
-    cancelButtVisable.value = false
-  })
-}
-
 // 拒绝
-const refuseHandler = (param: any) => {
+const refuseHandler = (comments: string, taskId: string, id: string) => {
+  const param = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
   refuseApproval(param).then((res) => {
     if (res.code === 200) {
       ElMessage.success('拒绝审批完成')
@@ -449,9 +471,6 @@
     else {
       ElMessage.error(`拒绝审批失败：${res.message}`)
     }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
     flowButtsVisable.value = false
   })
 }
@@ -867,10 +886,15 @@
       </template>
     </el-form>
 
-    <approval-dialog
+    <!-- <approval-dialog
       ref="apprDial" @on-success="approvalSuccessHandler" @on-refuse="refuseHandler"
       @on-revoke="revokeHandler"
-    />
+    /> -->
+
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="apprDial" :last-name="customApproval.approvalLastName.methodConfirm" @on-success="approvalSuccessHandler" @refuse="refuseHandler" />
+    <!-- 选择审批人弹窗 -->
+    <select-approver-dialog ref="selectApproverRef" @confirm="confirmSelectApprover" />
 
     <file-select-dialog ref="refFileSelect" @confirm="methodFileSelected" />
 
diff --git a/src/views/resource/file/methodConfirm/list.vue b/src/views/resource/file/methodConfirm/list.vue
index 973683c..2d9ea42 100644
--- a/src/views/resource/file/methodConfirm/list.vue
+++ b/src/views/resource/file/methodConfirm/list.vue
@@ -6,11 +6,12 @@
 import type { IMenu } from '@/components/buttonBox/buttonBox'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IDictType } from '@/commonInterface/resource-interface'
-import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import { getDictByCode } from '@/api/system/dict'
 import { draftDelete, getMethodConfirmList, refuseApproval, revokeApproval, revokeDelete } from '@/api/resource/fileConfirm'
 import useBridgeCount from '@/components/buttonBox/useBridgeCount'
-
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
+import customApproval from '/public/config/customApproval.json'
 // 定义常量
 const buttonBoxActive = 'fileMethodConfirm' // 存储在sessionstorage里面的字段名，用于记录右上角buttonbox点击状态
 const flowFormId = 'zyglffqrdjb' // 资源管理 - 方法确认登记表
@@ -249,17 +250,30 @@
 
 // 流程审批-同意
 const approvalAgreeHandler = (row: IFileMethodConfirm) => {
-  apprDial.value.initDialog('agree', row.id, row.taskId, '')
+  apprDial.value.initDialog('agree', row.taskId, row.id, row.processId)
 }
 
 // 流程审批-拒绝
 const approvalRefuseHandler = (row: IFileMethodConfirm) => {
-  apprDial.value.initDialog('refuse', row.id, row.taskId, '')
+  apprDial.value.initDialog('refuse', row.taskId, row.id)
 }
 
 // 取消（撤回审批单）
 const revokeApprById = (row: IFileMethodConfirm) => {
-  apprDial.value.initDialog('revoke', row.id, row.taskId, row.processId)
+  const params = {
+    processInstanceId: row.processId!,
+    comments: '',
+    id: row.id,
+  }
+  revokeApproval(params).then((res) => {
+    if (res.code === 200) {
+      ElMessage.success('流程取消成功')
+    }
+    else {
+      ElMessage.error(`流程取消失败：${res.message}`)
+    }
+    fetchData(true)
+  })
 }
 
 // 流程操作之后刷新
@@ -267,24 +281,13 @@
   fetchData(true)
 }
 
-// 取消
-const approvalFormRevokeHandler = (param: any) => {
-  revokeApproval(param).then((res) => {
-    if (res.code === 200) {
-      ElMessage.success('流程取消成功')
-    }
-    else {
-      ElMessage.error(`流程取消失败：${res.message}`)
-    }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
-    fetchData(true)
-  })
-}
-
 // 拒绝
-const approvalFormRefuseHandler = (param: any) => {
+const approvalFormRefuseHandler = (comments: string, taskId: string, id: string) => {
+  const param = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
   refuseApproval(param).then((res) => {
     if (res.code === 200) {
       ElMessage.success('拒绝审批完成')
@@ -292,9 +295,6 @@
     else {
       ElMessage.error(`拒绝审批失败：${res.message}`)
     }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
     fetchData(true)
   })
 }
@@ -481,11 +481,19 @@
     </table-container>
 
     <!-- 审批单弹窗 -->
-    <approval-dialog
+    <!-- <approval-dialog
       ref="apprDial"
       @on-success="afterApprovalHandler"
       @on-refuse="approvalFormRefuseHandler"
       @on-revoke="approvalFormRevokeHandler"
+    /> -->
+
+    <!-- 审批弹窗-审批人自选 -->
+    <approval-dialog
+      ref="apprDial"
+      :last-name="customApproval.approvalLastName.methodConfirm"
+      @on-success="afterApprovalHandler"
+      @refuse="approvalFormRefuseHandler"
     />
 
     <!-- 右上角按钮集合 -->
diff --git a/src/views/resource/file/noveltySearch/detail.vue b/src/views/resource/file/noveltySearch/detail.vue
index 19bdf70..116ea3e 100644
--- a/src/views/resource/file/noveltySearch/detail.vue
+++ b/src/views/resource/file/noveltySearch/detail.vue
@@ -1,4 +1,4 @@
-<!-- 委托方意见登记表详情 -->
+<!-- 测试校准检定方法查新记录表详情 -->
 <script name="FileNoveltySearchDetail" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import { Close } from '@element-plus/icons-vue'
@@ -9,7 +9,9 @@
 import type { IDictType } from '@/commonInterface/resource-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IFileInfo as IMethodFileInfo } from '@/views/resource/technology/method/method-interface'
-import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
+import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
+import customApproval from '/public/config/customApproval.json'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
@@ -279,8 +281,14 @@
   })
 }
 
-// 提交按钮
-const submitButtonHandler = async () => {
+// -----------------------------------提交-------------------------------------------------------
+const selectApproverRef = ref() // 审批人自选组件ref
+// 选好审批人
+const confirmSelectApprover = async (approverList: string[] = []) => {
+  if (!approverList.length) {
+    ElMessage.warning('无审批人，无法提交！')
+    return false
+  }
   if (novelty.value === null || novelty.value.processId === undefined || novelty.value.processId === '') {
     // 流程id为空 表示还未进入流程中 直接提交
     ElMessageBox.confirm(`是否提交查新记录表 ${novelty.value.formNo}`, '提示', {
@@ -291,6 +299,8 @@
       submitNovelty({
         formId: flowFormId,
         id: novelty.value.id,
+        processId: novelty.value.processId,
+        assignees: approverList,
       }).then((res) => {
         if (res.code === 200) {
           ElMessage.success(`查新记录表 ${novelty.value.formNo} 提交成功`)
@@ -311,7 +321,12 @@
     // 之前已经在流程中的表单 保存提交
     await noveltyRef.value.validate((valid: boolean) => {
       if (valid === true) {
-        failUpdateNovelty(novelty.value).then((res) => {
+        const params = {
+          ...novelty.value,
+          processId: novelty.value.processId,
+          assignees: approverList,
+        }
+        failUpdateNovelty(params).then((res) => {
           if (res.code === 200) {
             // 提示保存成功
             ElMessage.success(`查新记录表 ${novelty.value.formNo} 提交成功`)
@@ -329,6 +344,11 @@
     })
   }
 }
+// 提交按钮
+const submitButtonHandler = () => {
+  selectApproverRef.value.initDialog()
+}
+// ----------------------------------------------------------------------------------------------
 
 // 选定文件返回
 const appendFileToList = (row: IMethodFileInfo, result: string) => {
@@ -347,17 +367,33 @@
 
 // 流程审批-同意
 const approvalAgreeHandler = () => {
-  apprDial.value.initDialog('agree', novelty.value.id, novelty.value.taskId || route.query.taskId, '')
+  apprDial.value.initDialog('agree', novelty.value.taskId || route.query.taskId, novelty.value.id, novelty.value.processId || route.query.processId)
 }
 
 // 流程审批-拒绝
 const approvalRefuseHandler = () => {
-  apprDial.value.initDialog('refuse', novelty.value.id, novelty.value.taskId || route.query.taskId, '')
+  apprDial.value.initDialog('refuse', novelty.value.taskId || route.query.taskId, novelty.value.id)
 }
 
 // 取消（撤回审批单）
 const revokeClickedHandler = () => {
-  apprDial.value.initDialog('revoke', novelty.value.id, novelty.value.taskId || route.query.taskId, novelty.value.processId || route.query.processId)
+  const params = {
+    processInstanceId: novelty.value.processId! || route.query.processId,
+    comments: '',
+    id: novelty.value.id,
+  }
+  revokeApproval(params).then((res) => {
+    if (res.code === 200) {
+      ElMessage.success('流程取消成功')
+    }
+    else {
+      ElMessage.error(`流程取消失败：${res.message}`)
+    }
+    // 关闭弹窗
+    apprDial.value.handleClose()
+
+    cancelButtVisable.value = false
+  })
 }
 
 // 删除（只有已取消的可以在详情中删除）
@@ -385,32 +421,22 @@
 
 // 流程操作之后刷新
 const approvalSuccessHandler = (type: string) => {
-  if (type === 'agree' || type === 'refuse') {
-    flowButtsVisable.value = false
-  }
-  else if (type === 'revoke') {
-    cancelButtVisable.value = false
-  }
-}
-
-// 取消
-const revokeHandler = (param: any) => {
-  revokeApproval(param).then((res) => {
-    if (res.code === 200) {
-      ElMessage.success('流程取消成功')
-    }
-    else {
-      ElMessage.error(`流程取消失败：${res.message}`)
-    }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
-    cancelButtVisable.value = false
-  })
+  flowButtsVisable.value = false
+  // if (type === 'agree' || type === 'refuse') {
+  //   flowButtsVisable.value = false
+  // }
+  // else if (type === 'revoke') {
+  //   cancelButtVisable.value = false
+  // }
 }
 
 // 拒绝
-const refuseHandler = (param: any) => {
+const refuseHandler = (comments: string, taskId: string, id: string) => {
+  const param = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
   refuseApproval(param).then((res) => {
     if (res.code === 200) {
       ElMessage.success('拒绝审批完成')
@@ -418,9 +444,6 @@
     else {
       ElMessage.error(`拒绝审批失败：${res.message}`)
     }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
     flowButtsVisable.value = false
   })
 }
@@ -1059,11 +1082,16 @@
       </detail-page>
     </el-form>
 
-    <approval-dialog
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="apprDial" :last-name="customApproval.approvalLastName.noveltySearch" @on-success="approvalSuccessHandler" @refuse="refuseHandler" />
+    <!-- 选择审批人弹窗 -->
+    <select-approver-dialog ref="selectApproverRef" @confirm="confirmSelectApprover" />
+    <!-- <approval-dialog
       ref="apprDial" @on-success="approvalSuccessHandler" @on-refuse="refuseHandler"
       @on-revoke="revokeHandler"
-    />
-
+    /> -->
+    <!-- 审批弹窗-审批人自选 -->
+    <!-- <approval-dialog ref="approvalDialog" :last-name="customApproval.approvalLastName.noveltySearch" @on-success="afterApprovalHandler" @refuse="noveltyRefuseHandler" /> -->
     <file-select-dialog ref="refFileSelect" @records-selected="appendFileToList" />
 
     <template v-if="current === 'novelty-approval' && status !== '1'">
diff --git a/src/views/resource/file/noveltySearch/list.vue b/src/views/resource/file/noveltySearch/list.vue
index be0ea46..6f6b973 100644
--- a/src/views/resource/file/noveltySearch/list.vue
+++ b/src/views/resource/file/noveltySearch/list.vue
@@ -255,12 +255,12 @@
 
 // 流程审批-同意
 const approvalAgreeHandler = (row: IMethodNoveltySearch) => {
-  apprDial.value.initDialog('agree', row.id, row.taskId, '')
+  apprDial.value.initDialog('agree', row.taskId, row.id, row.processId)
 }
 
 // 流程审批-拒绝
 const approvalRefuseHandler = (row: IMethodNoveltySearch) => {
-  apprDial.value.initDialog('refuse', row.id, row.taskId, '')
+  apprDial.value.initDialog('refuse', row.taskId, row.id)
 }
 
 // 取消（撤回审批单）
@@ -277,9 +277,6 @@
     else {
       ElMessage.error(`流程取消失败：${res.message}`)
     }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
     fetchData(true)
   })
 }
@@ -290,17 +287,19 @@
 }
 
 // 拒绝
-const noveltyRefuseHandler = (param: any) => {
-  refuseApproval(param).then((res) => {
+const noveltyRefuseHandler = (comments: string, taskId: string, id: string) => {
+  const params = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
+  refuseApproval(params).then((res) => {
     if (res.code === 200) {
       ElMessage.success('拒绝审批完成')
     }
     else {
       ElMessage.error(`拒绝审批失败：${res.message}`)
     }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
     fetchData(true)
   })
 }
@@ -497,7 +496,7 @@
     </table-container>
 
     <!-- 审批弹窗-审批人自选 -->
-    <approval-dialog ref="approvalDialog" :last-name="customApproval.approvalLastName.standardCheckRecord" @on-success="afterApprovalHandler" @refuse="noveltyRefuseHandler" />
+    <approval-dialog ref="apprDial" :last-name="customApproval.approvalLastName.noveltySearch" @on-success="afterApprovalHandler" @refuse="noveltyRefuseHandler" />
 
     <!-- 右上角按钮集合 -->
     <button-box :active="active" :total-refuse="totalRefuse" :total-approval="totalApproval" :total-to-approval="totalToApproval" :menu="menu" @change-current-button="changeCurrentButton" />
diff --git a/src/views/resource/software/review/detail.vue b/src/views/resource/software/review/detail.vue
index d0a5166..738a05c 100644
--- a/src/views/resource/software/review/detail.vue
+++ b/src/views/resource/software/review/detail.vue
@@ -3,7 +3,9 @@
 import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IRevisionApply } from '../revision/software-revision'
 import type { IReviewReport, IReviewStaff } from './software-review'
-import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
+import customApproval from '/public/config/customApproval.json'
 import FilterRegistedStaff from '@/views/resource/common/filterRegistedStaff.vue'
 import FilterSoftwareRevision from '@/views/resource/common/filterSoftwareRevision.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
@@ -42,7 +44,7 @@
 const softwareFilterRef = ref()
 const revisionFilterRef = ref()
 
-const reviewReport = ref<IReviewReport>({
+const reviewReport: any = ref({
   id: '',
   labCode: '',
   groupCode: '',
@@ -81,10 +83,10 @@
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['change', 'blur'] }],
   groupCode: [{ required: true, message: '部门不能为空', trigger: ['change', 'blur'] }],
   reviewType: [{ required: true, message: '评审类型不能为空', trigger: ['change', 'blur'] }],
-  beforeSoftwareName: [{ required: true, message: '原软件名称不能为空', trigger: 'blur' }],
-  softwareName: [{ required: true, message: '软件名称不能为空', trigger: 'blur' }],
-  softwareVersion: [{ required: true, message: '软件版本号不能为空', trigger: 'blur' }],
-  reviewContent: [{ required: true, message: '评审内容不能为空', trigger: 'blur' }],
+  beforeSoftwareName: [{ required: true, message: '原软件名称不能为空', trigger: ['change', 'blur'] }],
+  softwareName: [{ required: true, message: '软件名称不能为空', trigger: ['change', 'blur'] }],
+  softwareVersion: [{ required: true, message: '软件版本号不能为空', trigger: ['change', 'blur'] }],
+  reviewContent: [{ required: true, message: '评审内容不能为空', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -306,8 +308,14 @@
   })
 }
 
-// 提交按钮
-const submitButtonHandler = async () => {
+// -----------------------------------提交-------------------------------------------------------
+const selectApproverRef = ref() // 审批人自选组件ref
+// 选好审批人
+const confirmSelectApprover = async (approverList: string[] = []) => {
+  if (!approverList.length) {
+    ElMessage.warning('无审批人，无法提交！')
+    return false
+  }
   if (reviewReport.value === null || reviewReport.value.processId === undefined || reviewReport.value.processId === '') {
     // 流程id为空 表示还未进入流程中 直接提交
     ElMessageBox.confirm(`是否提交软件评审报告 ${reviewReport.value.reportNo}`, '提示', {
@@ -323,6 +331,8 @@
       submitDraft({
         formId: SCHEDULE.SOFTWARE_REVIEW_REPORT_APPROVAL,
         id: reviewReport.value.id,
+        processId: reviewReport.value.processId,
+        assignees: approverList,
       }).then((res) => {
         if (res.code === 200) {
           ElMessage.success('提交成功')
@@ -343,7 +353,6 @@
       ElMessage.warning('评审人员列表不能为空')
       return
     }
-
     await reviewReportFormRef.value.validate((valid: boolean) => {
       if (valid === true) {
         const loading = ElLoading.service({
@@ -351,7 +360,12 @@
           text: '加载中...',
           background: 'rgba(255, 255, 255, 0.6)',
         })
-        failUpdateReport(reviewReport.value).then((res) => {
+        const params = {
+          ...reviewReport.value,
+          processId: reviewReport.value.processId,
+          assignees: approverList,
+        }
+        failUpdateReport(params).then((res) => {
           if (res.code === 200) {
           // 提示保存成功
             ElMessage.success('保存成功')
@@ -366,15 +380,27 @@
           loading.close()
         })
       }
+      else {
+        console.log('校验未通过，不提交')
+      }
     })
   }
 }
+// 提交按钮
+const submitButtonHandler = () => {
+  selectApproverRef.value.initDialog()
+}
+
+// ---------------------------------------------------------------------------------------------
 
 // 根据id查询详情
 const detailById = async (id: string) => {
   await detailReviewReport({ id }).then((res) => {
     if (res.code === 200) {
-      reviewReport.value = res.data
+      // reviewReport.value = res.data
+      for (const key in reviewReport.value) {
+        reviewReport.value[key] = res.data[key]
+      }
       reviewReport.value.reviewType = res.data.reviewType.toString()
       reviewStaffList.value = reviewReport.value.staffList
       if (reviewReport.value.taskId === '') {
@@ -391,12 +417,12 @@
 
 // 流程审批-拒绝
 const approvalRefuseHandler = () => {
-  approvalDialog.value.initDialog('refuse', reviewReport.value.id, reviewReport.value.taskId || route.query.taskId, '')
+  approvalDialog.value.initDialog('refuse', reviewReport.value.taskId || route.query.taskId, reviewReport.value.id)
 }
 
 // 流程审批-同意
 const approvalAgreeHandler = () => {
-  approvalDialog.value.initDialog('agree', reviewReport.value.id, reviewReport.value.taskId || route.query.taskId, '')
+  approvalDialog.value.initDialog('agree', reviewReport.value.taskId || route.query.taskId, reviewReport.value.id, reviewReport.value.processId || route.query.processId)
 }
 
 // 取消流程
@@ -462,7 +488,12 @@
 }
 
 // 拒绝
-const refuseHandler = (param: any) => {
+const refuseHandler = (comments: string, taskId: string, id: string) => {
+  const param = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
   const loading = ElLoading.service({
     lock: true,
     text: '加载中...',
@@ -475,9 +506,6 @@
     else {
       ElMessage.error(`拒绝审批失败：${res.message}`)
     }
-    // 关闭弹窗
-    approvalDialog.value.handleClose()
-
     flowButtsVisable.value = false
     loading.close()
   })
@@ -601,7 +629,6 @@
     if (radioItems.value[radioItems.value.length - 1].value === 'review-report-approval') {
       radioItems.value.pop()
     }
-    console.log(radioItems.value)
   }
   else { // 非全部和草稿箱把审批详情加上
     if (radioItems.value[radioItems.value.length - 1].value !== 'review-report-approval') {
@@ -787,10 +814,15 @@
       </detail-block>
     </el-form>
 
-    <approval-dialog
+    <!-- <approval-dialog
       ref="approvalDialog"
       @on-success="approvalSuccessHandler" @on-refuse="refuseHandler"
-    />
+    /> -->
+
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialog" :last-name="customApproval.approvalLastName.softwareReviewReport" @on-success="approvalSuccessHandler" @refuse="refuseHandler" />
+    <!-- 选择审批人弹窗 -->
+    <select-approver-dialog ref="selectApproverRef" @confirm="confirmSelectApprover" />
 
     <filter-registed-staff ref="reviewStaffFilterRef" :show-score="false" @record-selected="appendToContentList" />
     <filter-software-revision ref="revisionFilterRef" @record-selected="revisionSelected" />

diff --git a/public/config/customApproval.json b/public/config/customApproval.json
index 205ac21..d69296d 100644
--- a/public/config/customApproval.json
+++ b/public/config/customApproval.json
@@ -1,7 +1,22 @@
 {
-  "approvalLastNameDescribe": "审批流程最后一个节点的名字，用来判断审批自选的时候是否是最后一个节点",
+  "approvalLastName--Describe": "审批流程最后一个节点的名字，用来判断审批自选的时候是否是最后一个节点",
   "approvalLastName": {
-    "standardCheckRecordDescribe": "核查记录",
-    "standardCheckRecord": "技术负责人"
+    "standardCheckRecord--Describe": "核查记录",
+    "standardCheckRecord": "技术负责人",
+
+    "noveltySearch--Describe": "测试校准检定方法查新记录表",
+    "noveltySearch": "审核人",
+
+    "fileChange--Describe": "文件更改申请单",
+    "fileChange": "主任",
+
+    "methodConfirm--Describe": "方法确认登记表",
+    "methodConfirm": "技术负责人",
+
+    "softwareReviewReport--Describe": "软件评审报告",
+    "softwareReviewReport": "技术负责人",
+
+    "resistance--Describe": "实验室接地电阻记录",
+    "resistance": "审核人"
   }
 }
diff --git a/src/views/resource/environment/resistance/edit.vue b/src/views/resource/environment/resistance/edit.vue
index dd62bd1..fd06d64 100644
--- a/src/views/resource/environment/resistance/edit.vue
+++ b/src/views/resource/environment/resistance/edit.vue
@@ -2,7 +2,9 @@
 <script name="EnvironmentResistanceDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IResistanceRecord } from './resistance-interface'
-import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
+import customApproval from '/public/config/customApproval.json'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { detailResistance, draftDeleteResistance, failUpdateResistance, refuseApprovalResistance, revokeApprovalResistance, saveResistance, submitResistance, updateResistance } from '@/api/resource/environmentTest'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
@@ -37,7 +39,7 @@
 const approvalDialog = ref()
 const testRecordRef = ref()
 
-const recordForm = ref<IResistanceRecord>({
+const recordForm: any = ref({
   id: '',
   recordNo: '',
   recordName: '实验室接地电阻记录',
@@ -241,9 +243,14 @@
     }
   })
 }
-
-// 提交按钮
-const submitButtonHandler = async () => {
+// -----------------------------------提交-------------------------------------------------------
+const selectApproverRef = ref() // 审批人自选组件ref
+// 选好审批人
+const confirmSelectApprover = async (approverList: string[] = []) => {
+  if (!approverList.length) {
+    ElMessage.warning('无审批人，无法提交！')
+    return false
+  }
   if (recordForm.value === null || recordForm.value.processId === undefined || recordForm.value.processId === '') {
     // 流程id为空 表示还未进入流程中 直接提交
     ElMessageBox.confirm(`是否提交实验室接地电阻记录 ${recordForm.value.recordNo}`, '提示', {
@@ -259,6 +266,8 @@
       submitResistance({
         formId: SCHEDULE.LAB_RESISTANCE_RECORD_APPROVAL,
         id: recordForm.value.id,
+        processId: recordForm.value.processId,
+        assignees: approverList,
       }).then((res) => {
         if (res.code === 200) {
           ElMessage.success(`实验室接地电阻记录 ${recordForm.value.recordNo} 提交成功`)
@@ -282,7 +291,12 @@
           text: '加载中...',
           background: 'rgba(255, 255, 255, 0.6)',
         })
-        failUpdateResistance(recordForm.value).then((res) => {
+        const params = {
+          ...recordForm.value,
+          processId: recordForm.value.processId,
+          assignees: approverList,
+        }
+        failUpdateResistance(params).then((res) => {
           if (res.code === 200) {
           // 提示保存成功
             ElMessage.success('保存成功')
@@ -302,6 +316,12 @@
     })
   }
 }
+// 提交按钮
+const submitButtonHandler = () => {
+  selectApproverRef.value.initDialog()
+}
+
+// ---------------------------------------------------------------------------------------------
 
 // 根据id查询详情
 const detailById = async (id: string) => {
@@ -312,7 +332,10 @@
   })
   await detailResistance({ id }).then((res) => {
     if (res.code === 200) {
-      recordForm.value = res.data
+      // recordForm.value = res.data
+      for (const key in recordForm.value) {
+        recordForm.value[key] = res.data[key]
+      }
       if (recordForm.value.taskId === '') {
         recordForm.value.taskId = sessionStorage.getItem('resistanceRecordTaskId')!
       }
@@ -328,12 +351,12 @@
 // ------------------------------------------------审批----------------------------------------
 // 流程审批-拒绝
 const approvalRefuseHandler = () => {
-  approvalDialog.value.initDialog('refuse', recordForm.value.id, recordForm.value.taskId || route.query.taskId, '')
+  approvalDialog.value.initDialog('refuse', recordForm.value.taskId || route.query.taskId, recordForm.value.id)
 }
 
 // 流程审批-同意
 const approvalAgreeHandler = () => {
-  approvalDialog.value.initDialog('agree', recordForm.value.id, recordForm.value.taskId || route.query.taskId, '')
+  approvalDialog.value.initDialog('agree', recordForm.value.taskId || route.query.taskId, recordForm.value.id, recordForm.value.processId || route.query.processId)
 }
 
 // 取消流程
@@ -393,7 +416,12 @@
 }
 
 // 拒绝
-const refuseHandler = (param: any) => {
+const refuseHandler = (comments: string, taskId: string, id: string) => {
+  const param = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
   refuseApprovalResistance(param).then((res) => {
     if (res.code === 200) {
       ElMessage.success('拒绝审批完成')
@@ -401,9 +429,6 @@
     else {
       ElMessage.error(`拒绝审批失败：${res.message}`)
     }
-    // 关闭弹窗
-    approvalDialog.value.handleClose()
-
     flowButtsVisable.value = false
   })
 }
@@ -661,10 +686,14 @@
       </detail-block>
     </el-form>
 
-    <approval-dialog
+    <!-- <approval-dialog
       ref="approvalDialog"
       @on-success="approvalSuccessHandler" @on-refuse="refuseHandler" @on-revoke="revokeHandler"
-    />
+    /> -->
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialog" :last-name="customApproval.approvalLastName.resistance" @on-success="approvalSuccessHandler" @refuse="refuseHandler" />
+    <!-- 选择审批人弹窗 -->
+    <select-approver-dialog ref="selectApproverRef" @confirm="confirmSelectApprover" />
 
     <template v-if="current === 'resistance-approval' && status !== '1'">
       <approval-record-table :process-id="recordForm.processId" />
diff --git a/src/views/resource/environment/resistance/list.vue b/src/views/resource/environment/resistance/list.vue
index f3e768e..439b574 100644
--- a/src/views/resource/environment/resistance/list.vue
+++ b/src/views/resource/environment/resistance/list.vue
@@ -3,7 +3,7 @@
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IListQuery, IResistanceRecord } from './resistance-interface'
-import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -13,7 +13,8 @@
 import { exportFile } from '@/utils/exportUtils'
 import { printPdf } from '@/utils/printUtils'
 import useBridgeCount from '@/components/buttonBox/useBridgeCount'
-
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
+import customApproval from '/public/config/customApproval.json'
 // 定义常量
 const buttonBoxActive = 'labResistanceRecordApproval' // 存储在sessionstorage里面的字段名，用于记录右上角buttonbox点击状态
 
@@ -240,12 +241,12 @@
 
 // 流程审批-同意
 const approvalAgreeHandler = (row: IResistanceRecord) => {
-  apprDial.value.initDialog('agree', row.id, row.taskId, '')
+  apprDial.value.initDialog('agree', row.taskId, row.id, row.processId)
 }
 
 // 流程审批-拒绝
 const approvalRefuseHandler = (row: IResistanceRecord) => {
-  apprDial.value.initDialog('refuse', row.id, row.taskId, '')
+  apprDial.value.initDialog('refuse', row.taskId, row.id)
 }
 
 // 取消（撤回审批单）
@@ -287,7 +288,12 @@
 }
 
 // 拒绝
-const refuseHandler = (param: any) => {
+const refuseHandler = (comments: string, taskId: string, id: string) => {
+  const param = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
   refuseApprovalResistance(param).then((res) => {
     if (res.code === 200) {
       ElMessage.success('拒绝审批完成')
@@ -295,8 +301,6 @@
     else {
       ElMessage.error(`拒绝审批失败：${res.message}`)
     }
-    // 关闭弹窗
-    apprDial.value.handleClose()
 
     fetchData(true)
   })
@@ -505,10 +509,18 @@
     </table-container>
 
     <!-- 审批单弹窗 -->
-    <approval-dialog
+    <!-- <approval-dialog
       ref="apprDial"
       @on-success="afterApprovalHandler"
       @on-refuse="refuseHandler"
+    /> -->
+
+    <!-- 审批弹窗-审批人自选 -->
+    <approval-dialog
+      ref="apprDial"
+      :last-name="customApproval.approvalLastName.resistance"
+      @on-success="afterApprovalHandler"
+      @refuse="refuseHandler"
     />
 
     <!-- 右上角按钮集合 -->
diff --git a/src/views/resource/file/change/detail.vue b/src/views/resource/file/change/detail.vue
index 3efc9ab..a0c7c5d 100644
--- a/src/views/resource/file/change/detail.vue
+++ b/src/views/resource/file/change/detail.vue
@@ -5,7 +5,9 @@
 import FileSelectDialog from './dialog/selectSysFileDialog.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
+import customApproval from '/public/config/customApproval.json'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
 import useUserStore from '@/store/modules/user' // 用户信息
 
@@ -292,8 +294,14 @@
   })
 }
 
-// 提交按钮
-const submitButtonHandler = async () => {
+// -----------------------------------提交-------------------------------------------------------
+const selectApproverRef = ref() // 审批人自选组件ref
+// 选好审批人
+const confirmSelectApprover = async (approverList: string[] = []) => {
+  if (!approverList.length) {
+    ElMessage.warning('无审批人，无法提交！')
+    return false
+  }
   if (changeForm.value === null || changeForm.value.processId === undefined || changeForm.value.processId === '') {
     // 流程id为空 表示还未进入流程中 直接提交
     ElMessageBox.confirm(`是否提交文件更改申请单 ${changeForm.value.formNo}`, '提示', {
@@ -309,6 +317,8 @@
       submitChangeForm({
         formId: flowFormId,
         id: changeForm.value.id,
+        processId: changeForm.value.processId,
+        assignees: approverList,
       }).then((res) => {
         if (res.code === 200) {
           ElMessage.success('提交成功')
@@ -333,7 +343,12 @@
           text: '加载中...',
           background: 'rgba(255, 255, 255, 0.6)',
         })
-        failUpdateChangeForm(changeForm.value).then((res) => {
+        const params = {
+          ...changeForm.value,
+          processId: changeForm.value.processId,
+          assignees: approverList,
+        }
+        failUpdateChangeForm(params).then((res) => {
           if (res.code === 200) {
           // 提示保存成功
             ElMessage.success('提交成功')
@@ -354,7 +369,11 @@
     })
   }
 }
-
+// 提交按钮
+const submitButtonHandler = () => {
+  selectApproverRef.value.initDialog()
+}
+// ----------------------------------------------------------------------------------------------
 // 选定文件返回
 const appendFileToList = (listParam: any) => {
   listParam.forEach((item: any) => {
@@ -374,12 +393,12 @@
 
 // 流程审批-同意
 const approvalAgreeHandler = () => {
-  apprDial.value.initDialog('agree', changeForm.value.id, changeForm.value.taskId || route.query.taskId, '')
+  apprDial.value.initDialog('agree', changeForm.value.taskId || route.query.taskId, changeForm.value.id, changeForm.value.processId || route.query.processId)
 }
 
 // 流程审批-拒绝
 const approvalRefuseHandler = () => {
-  apprDial.value.initDialog('refuse', changeForm.value.id, changeForm.value.taskId || route.query.taskId, '')
+  apprDial.value.initDialog('refuse', changeForm.value.taskId || route.query.taskId, changeForm.value.id)
 }
 
 // 取消（撤回审批单）
@@ -443,7 +462,12 @@
 }
 
 // 拒绝
-const refuseHandler = (param: any) => {
+const refuseHandler = (comments: string, taskId: string, id: string) => {
+  const param = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
   refuseApproval(param).then((res) => {
     if (res.code === 200) {
       ElMessage.success('拒绝审批完成')
@@ -451,9 +475,6 @@
     else {
       ElMessage.error(`拒绝审批失败：${res.message}`)
     }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
     flowButtsVisable.value = false
   })
 }
@@ -710,11 +731,15 @@
       </detail-block>
     </el-form>
 
-    <approval-dialog
+    <!-- <approval-dialog
       ref="apprDial"
       @on-success="approvalSuccessHandler"
       @on-refuse="refuseHandler"
-    />
+    /> -->
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="apprDial" :last-name="customApproval.approvalLastName.fileChange" @on-success="approvalSuccessHandler" @refuse="refuseHandler" />
+    <!-- 选择审批人弹窗 -->
+    <select-approver-dialog ref="selectApproverRef" @confirm="confirmSelectApprover" />
 
     <file-select-dialog ref="refFileSelect" @confirm="appendFileToList" />
 
diff --git a/src/views/resource/file/change/list.vue b/src/views/resource/file/change/list.vue
index 71d8624..d6c4606 100644
--- a/src/views/resource/file/change/list.vue
+++ b/src/views/resource/file/change/list.vue
@@ -3,7 +3,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { DateModelType } from 'element-plus'
 import type { IFileChangeForm, IListQuery } from './change-interface'
-import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { deptType } from '@/global'
@@ -11,6 +11,8 @@
 import { getDictByCode } from '@/api/system/dict'
 import { draftDelete, exportFileChangeList, getFileChangeFormList, refuseApproval, revokeApproval, revokeDelete } from '@/api/resource/fileChange'
 import useBridgeCount from '@/components/buttonBox/useBridgeCount'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
+import customApproval from '/public/config/customApproval.json'
 
 // 定义常量
 const buttonBoxActive = 'fileChangeApproval' // 存储在sessionstorage里面的字段名，用于记录右上角buttonbox点击状态
@@ -280,12 +282,12 @@
 
 // 流程审批-同意
 const approvalAgreeHandler = (row: IFileChangeForm) => {
-  apprDial.value.initDialog('agree', row.id, row.taskId, '')
+  apprDial.value.initDialog('agree', row.taskId, row.id, row.processId)
 }
 
 // 流程审批-拒绝
 const approvalRefuseHandler = (row: IFileChangeForm) => {
-  apprDial.value.initDialog('refuse', row.id, row.taskId, '')
+  apprDial.value.initDialog('refuse', row.taskId, row.id)
 }
 
 // 取消（撤回审批单）
@@ -321,7 +323,12 @@
 }
 
 // 拒绝
-const changeFormRefuseHandler = (param: any) => {
+const changeFormRefuseHandler = (comments: string, taskId: string, id: string) => {
+  const param = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
   refuseApproval(param).then((res) => {
     if (res.code === 200) {
       ElMessage.success('拒绝审批完成')
@@ -329,9 +336,6 @@
     else {
       ElMessage.error(`拒绝审批失败：${res.message}`)
     }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
     fetchData(true)
   })
 }
@@ -551,12 +555,19 @@
     </table-container>
 
     <!-- 审批单弹窗 -->
-    <approval-dialog
+    <!-- <approval-dialog
       ref="apprDial"
       @on-success="afterApprovalHandler"
       @on-refuse="changeFormRefuseHandler"
-    />
+    /> -->
 
+    <!-- 审批弹窗-审批人自选 -->
+    <approval-dialog
+      ref="apprDial"
+      :last-name="customApproval.approvalLastName.fileChange"
+      @on-success="afterApprovalHandler"
+      @refuse="changeFormRefuseHandler"
+    />
     <!-- 右上角按钮集合 -->
     <button-box :active="active" :total-refuse="totalRefuse" :total-approval="totalApproval" :total-to-approval="totalToApproval" :menu="menu" @change-current-button="changeCurrentButton" />
   </app-container>
diff --git a/src/views/resource/file/methodConfirm/detail.vue b/src/views/resource/file/methodConfirm/detail.vue
index f38d52c..949e446 100644
--- a/src/views/resource/file/methodConfirm/detail.vue
+++ b/src/views/resource/file/methodConfirm/detail.vue
@@ -8,7 +8,9 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IFileInfo as IMethodFileInfo } from '@/views/resource/technology/method/method-interface'
 import { getFileMethodList } from '@/api/resource/fileTechnology'
-import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
+import customApproval from '/public/config/customApproval.json'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
@@ -269,8 +271,14 @@
   })
 }
 
-// 提交按钮
-const submitButtonHandler = async () => {
+// -----------------------------------提交-------------------------------------------------------
+const selectApproverRef = ref() // 审批人自选组件ref
+// 选好审批人
+const confirmSelectApprover = async (approverList: string[] = []) => {
+  if (!approverList.length) {
+    ElMessage.warning('无审批人，无法提交！')
+    return false
+  }
   if (methodConfirm.value === null || methodConfirm.value.processId === undefined || methodConfirm.value.processId === '') {
     // 流程id为空 表示还未进入流程中 直接提交
     ElMessageBox.confirm(`是否提交方法确认登记表 ${methodConfirm.value.formNo}`, '提示', {
@@ -281,6 +289,8 @@
       submitMethodConfirm({
         formId: flowFormId,
         id: methodConfirm.value.id,
+        processId: methodConfirm.value.processId,
+        assignees: approverList,
       }).then((res) => {
         if (res.code === 200) {
           ElMessage.success(`方法确认登记表 ${methodConfirm.value.formNo} 提交成功`)
@@ -298,7 +308,12 @@
     // 之前已经在流程中的表单 保存提交
     await methodConfirmRef.value.validate((valid: boolean) => {
       if (valid === true) {
-        failUpdateMethodConfirm(methodConfirm.value).then((res) => {
+        const param = {
+          ...methodConfirm.value,
+          processId: methodConfirm.value.processId,
+          assignees: approverList,
+        }
+        failUpdateMethodConfirm(param).then((res) => {
           if (res.code === 200) {
             // 提示保存成功
             ElMessage.success(`方法确认登记表 ${methodConfirm.value.formNo} 提交成功`)
@@ -315,6 +330,11 @@
     })
   }
 }
+// 提交按钮
+const submitButtonHandler = () => {
+  selectApproverRef.value.initDialog()
+}
+// -----------------------------------提交-------------------------------------------------------
 
 // 显示筛选委托方名录的弹窗
 const showFilterMethod = () => {
@@ -378,17 +398,30 @@
 }
 // 流程审批-同意
 const approvalAgreeHandler = () => {
-  apprDial.value.initDialog('agree', methodConfirm.value.id, methodConfirm.value.taskId || route.query.taskId, '')
+  apprDial.value.initDialog('agree', methodConfirm.value.taskId || route.query.taskId, methodConfirm.value.id, methodConfirm.value.processId || route.query.processId)
 }
 
 // 流程审批-拒绝
 const approvalRefuseHandler = () => {
-  apprDial.value.initDialog('refuse', methodConfirm.value.id, methodConfirm.value.taskId || route.query.taskId, '')
+  apprDial.value.initDialog('refuse', methodConfirm.value.taskId || route.query.taskId, methodConfirm.value.id)
 }
 
 // 取消（撤回审批单）
 const revokeClickedHandler = () => {
-  apprDial.value.initDialog('revoke', methodConfirm.value.id, methodConfirm.value.taskId || route.query.taskId, methodConfirm.value.processId || route.query.processId)
+  const param = {
+    processInstanceId: methodConfirm.value.processId || route.query.processId!,
+    comments: '',
+    id: id.value,
+  }
+  revokeApproval(param).then((res) => {
+    if (res.code === 200) {
+      ElMessage.success('流程取消成功')
+    }
+    else {
+      ElMessage.error(`流程取消失败：${res.message}`)
+    }
+    cancelButtVisable.value = false
+  })
 }
 
 // 删除（只有已取消的可以在详情中删除）
@@ -424,24 +457,13 @@
   }
 }
 
-// 取消
-const revokeHandler = (param: any) => {
-  revokeApproval(param).then((res) => {
-    if (res.code === 200) {
-      ElMessage.success('流程取消成功')
-    }
-    else {
-      ElMessage.error(`流程取消失败：${res.message}`)
-    }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
-    cancelButtVisable.value = false
-  })
-}
-
 // 拒绝
-const refuseHandler = (param: any) => {
+const refuseHandler = (comments: string, taskId: string, id: string) => {
+  const param = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
   refuseApproval(param).then((res) => {
     if (res.code === 200) {
       ElMessage.success('拒绝审批完成')
@@ -449,9 +471,6 @@
     else {
       ElMessage.error(`拒绝审批失败：${res.message}`)
     }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
     flowButtsVisable.value = false
   })
 }
@@ -867,10 +886,15 @@
       </template>
     </el-form>
 
-    <approval-dialog
+    <!-- <approval-dialog
       ref="apprDial" @on-success="approvalSuccessHandler" @on-refuse="refuseHandler"
       @on-revoke="revokeHandler"
-    />
+    /> -->
+
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="apprDial" :last-name="customApproval.approvalLastName.methodConfirm" @on-success="approvalSuccessHandler" @refuse="refuseHandler" />
+    <!-- 选择审批人弹窗 -->
+    <select-approver-dialog ref="selectApproverRef" @confirm="confirmSelectApprover" />
 
     <file-select-dialog ref="refFileSelect" @confirm="methodFileSelected" />
 
diff --git a/src/views/resource/file/methodConfirm/list.vue b/src/views/resource/file/methodConfirm/list.vue
index 973683c..2d9ea42 100644
--- a/src/views/resource/file/methodConfirm/list.vue
+++ b/src/views/resource/file/methodConfirm/list.vue
@@ -6,11 +6,12 @@
 import type { IMenu } from '@/components/buttonBox/buttonBox'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IDictType } from '@/commonInterface/resource-interface'
-import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import { getDictByCode } from '@/api/system/dict'
 import { draftDelete, getMethodConfirmList, refuseApproval, revokeApproval, revokeDelete } from '@/api/resource/fileConfirm'
 import useBridgeCount from '@/components/buttonBox/useBridgeCount'
-
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
+import customApproval from '/public/config/customApproval.json'
 // 定义常量
 const buttonBoxActive = 'fileMethodConfirm' // 存储在sessionstorage里面的字段名，用于记录右上角buttonbox点击状态
 const flowFormId = 'zyglffqrdjb' // 资源管理 - 方法确认登记表
@@ -249,17 +250,30 @@
 
 // 流程审批-同意
 const approvalAgreeHandler = (row: IFileMethodConfirm) => {
-  apprDial.value.initDialog('agree', row.id, row.taskId, '')
+  apprDial.value.initDialog('agree', row.taskId, row.id, row.processId)
 }
 
 // 流程审批-拒绝
 const approvalRefuseHandler = (row: IFileMethodConfirm) => {
-  apprDial.value.initDialog('refuse', row.id, row.taskId, '')
+  apprDial.value.initDialog('refuse', row.taskId, row.id)
 }
 
 // 取消（撤回审批单）
 const revokeApprById = (row: IFileMethodConfirm) => {
-  apprDial.value.initDialog('revoke', row.id, row.taskId, row.processId)
+  const params = {
+    processInstanceId: row.processId!,
+    comments: '',
+    id: row.id,
+  }
+  revokeApproval(params).then((res) => {
+    if (res.code === 200) {
+      ElMessage.success('流程取消成功')
+    }
+    else {
+      ElMessage.error(`流程取消失败：${res.message}`)
+    }
+    fetchData(true)
+  })
 }
 
 // 流程操作之后刷新
@@ -267,24 +281,13 @@
   fetchData(true)
 }
 
-// 取消
-const approvalFormRevokeHandler = (param: any) => {
-  revokeApproval(param).then((res) => {
-    if (res.code === 200) {
-      ElMessage.success('流程取消成功')
-    }
-    else {
-      ElMessage.error(`流程取消失败：${res.message}`)
-    }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
-    fetchData(true)
-  })
-}
-
 // 拒绝
-const approvalFormRefuseHandler = (param: any) => {
+const approvalFormRefuseHandler = (comments: string, taskId: string, id: string) => {
+  const param = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
   refuseApproval(param).then((res) => {
     if (res.code === 200) {
       ElMessage.success('拒绝审批完成')
@@ -292,9 +295,6 @@
     else {
       ElMessage.error(`拒绝审批失败：${res.message}`)
     }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
     fetchData(true)
   })
 }
@@ -481,11 +481,19 @@
     </table-container>
 
     <!-- 审批单弹窗 -->
-    <approval-dialog
+    <!-- <approval-dialog
       ref="apprDial"
       @on-success="afterApprovalHandler"
       @on-refuse="approvalFormRefuseHandler"
       @on-revoke="approvalFormRevokeHandler"
+    /> -->
+
+    <!-- 审批弹窗-审批人自选 -->
+    <approval-dialog
+      ref="apprDial"
+      :last-name="customApproval.approvalLastName.methodConfirm"
+      @on-success="afterApprovalHandler"
+      @refuse="approvalFormRefuseHandler"
     />
 
     <!-- 右上角按钮集合 -->
diff --git a/src/views/resource/file/noveltySearch/detail.vue b/src/views/resource/file/noveltySearch/detail.vue
index 19bdf70..116ea3e 100644
--- a/src/views/resource/file/noveltySearch/detail.vue
+++ b/src/views/resource/file/noveltySearch/detail.vue
@@ -1,4 +1,4 @@
-<!-- 委托方意见登记表详情 -->
+<!-- 测试校准检定方法查新记录表详情 -->
 <script name="FileNoveltySearchDetail" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import { Close } from '@element-plus/icons-vue'
@@ -9,7 +9,9 @@
 import type { IDictType } from '@/commonInterface/resource-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IFileInfo as IMethodFileInfo } from '@/views/resource/technology/method/method-interface'
-import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
+import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
+import customApproval from '/public/config/customApproval.json'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
@@ -279,8 +281,14 @@
   })
 }
 
-// 提交按钮
-const submitButtonHandler = async () => {
+// -----------------------------------提交-------------------------------------------------------
+const selectApproverRef = ref() // 审批人自选组件ref
+// 选好审批人
+const confirmSelectApprover = async (approverList: string[] = []) => {
+  if (!approverList.length) {
+    ElMessage.warning('无审批人，无法提交！')
+    return false
+  }
   if (novelty.value === null || novelty.value.processId === undefined || novelty.value.processId === '') {
     // 流程id为空 表示还未进入流程中 直接提交
     ElMessageBox.confirm(`是否提交查新记录表 ${novelty.value.formNo}`, '提示', {
@@ -291,6 +299,8 @@
       submitNovelty({
         formId: flowFormId,
         id: novelty.value.id,
+        processId: novelty.value.processId,
+        assignees: approverList,
       }).then((res) => {
         if (res.code === 200) {
           ElMessage.success(`查新记录表 ${novelty.value.formNo} 提交成功`)
@@ -311,7 +321,12 @@
     // 之前已经在流程中的表单 保存提交
     await noveltyRef.value.validate((valid: boolean) => {
       if (valid === true) {
-        failUpdateNovelty(novelty.value).then((res) => {
+        const params = {
+          ...novelty.value,
+          processId: novelty.value.processId,
+          assignees: approverList,
+        }
+        failUpdateNovelty(params).then((res) => {
           if (res.code === 200) {
             // 提示保存成功
             ElMessage.success(`查新记录表 ${novelty.value.formNo} 提交成功`)
@@ -329,6 +344,11 @@
     })
   }
 }
+// 提交按钮
+const submitButtonHandler = () => {
+  selectApproverRef.value.initDialog()
+}
+// ----------------------------------------------------------------------------------------------
 
 // 选定文件返回
 const appendFileToList = (row: IMethodFileInfo, result: string) => {
@@ -347,17 +367,33 @@
 
 // 流程审批-同意
 const approvalAgreeHandler = () => {
-  apprDial.value.initDialog('agree', novelty.value.id, novelty.value.taskId || route.query.taskId, '')
+  apprDial.value.initDialog('agree', novelty.value.taskId || route.query.taskId, novelty.value.id, novelty.value.processId || route.query.processId)
 }
 
 // 流程审批-拒绝
 const approvalRefuseHandler = () => {
-  apprDial.value.initDialog('refuse', novelty.value.id, novelty.value.taskId || route.query.taskId, '')
+  apprDial.value.initDialog('refuse', novelty.value.taskId || route.query.taskId, novelty.value.id)
 }
 
 // 取消（撤回审批单）
 const revokeClickedHandler = () => {
-  apprDial.value.initDialog('revoke', novelty.value.id, novelty.value.taskId || route.query.taskId, novelty.value.processId || route.query.processId)
+  const params = {
+    processInstanceId: novelty.value.processId! || route.query.processId,
+    comments: '',
+    id: novelty.value.id,
+  }
+  revokeApproval(params).then((res) => {
+    if (res.code === 200) {
+      ElMessage.success('流程取消成功')
+    }
+    else {
+      ElMessage.error(`流程取消失败：${res.message}`)
+    }
+    // 关闭弹窗
+    apprDial.value.handleClose()
+
+    cancelButtVisable.value = false
+  })
 }
 
 // 删除（只有已取消的可以在详情中删除）
@@ -385,32 +421,22 @@
 
 // 流程操作之后刷新
 const approvalSuccessHandler = (type: string) => {
-  if (type === 'agree' || type === 'refuse') {
-    flowButtsVisable.value = false
-  }
-  else if (type === 'revoke') {
-    cancelButtVisable.value = false
-  }
-}
-
-// 取消
-const revokeHandler = (param: any) => {
-  revokeApproval(param).then((res) => {
-    if (res.code === 200) {
-      ElMessage.success('流程取消成功')
-    }
-    else {
-      ElMessage.error(`流程取消失败：${res.message}`)
-    }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
-    cancelButtVisable.value = false
-  })
+  flowButtsVisable.value = false
+  // if (type === 'agree' || type === 'refuse') {
+  //   flowButtsVisable.value = false
+  // }
+  // else if (type === 'revoke') {
+  //   cancelButtVisable.value = false
+  // }
 }
 
 // 拒绝
-const refuseHandler = (param: any) => {
+const refuseHandler = (comments: string, taskId: string, id: string) => {
+  const param = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
   refuseApproval(param).then((res) => {
     if (res.code === 200) {
       ElMessage.success('拒绝审批完成')
@@ -418,9 +444,6 @@
     else {
       ElMessage.error(`拒绝审批失败：${res.message}`)
     }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
     flowButtsVisable.value = false
   })
 }
@@ -1059,11 +1082,16 @@
       </detail-page>
     </el-form>
 
-    <approval-dialog
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="apprDial" :last-name="customApproval.approvalLastName.noveltySearch" @on-success="approvalSuccessHandler" @refuse="refuseHandler" />
+    <!-- 选择审批人弹窗 -->
+    <select-approver-dialog ref="selectApproverRef" @confirm="confirmSelectApprover" />
+    <!-- <approval-dialog
       ref="apprDial" @on-success="approvalSuccessHandler" @on-refuse="refuseHandler"
       @on-revoke="revokeHandler"
-    />
-
+    /> -->
+    <!-- 审批弹窗-审批人自选 -->
+    <!-- <approval-dialog ref="approvalDialog" :last-name="customApproval.approvalLastName.noveltySearch" @on-success="afterApprovalHandler" @refuse="noveltyRefuseHandler" /> -->
     <file-select-dialog ref="refFileSelect" @records-selected="appendFileToList" />
 
     <template v-if="current === 'novelty-approval' && status !== '1'">
diff --git a/src/views/resource/file/noveltySearch/list.vue b/src/views/resource/file/noveltySearch/list.vue
index be0ea46..6f6b973 100644
--- a/src/views/resource/file/noveltySearch/list.vue
+++ b/src/views/resource/file/noveltySearch/list.vue
@@ -255,12 +255,12 @@
 
 // 流程审批-同意
 const approvalAgreeHandler = (row: IMethodNoveltySearch) => {
-  apprDial.value.initDialog('agree', row.id, row.taskId, '')
+  apprDial.value.initDialog('agree', row.taskId, row.id, row.processId)
 }
 
 // 流程审批-拒绝
 const approvalRefuseHandler = (row: IMethodNoveltySearch) => {
-  apprDial.value.initDialog('refuse', row.id, row.taskId, '')
+  apprDial.value.initDialog('refuse', row.taskId, row.id)
 }
 
 // 取消（撤回审批单）
@@ -277,9 +277,6 @@
     else {
       ElMessage.error(`流程取消失败：${res.message}`)
     }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
     fetchData(true)
   })
 }
@@ -290,17 +287,19 @@
 }
 
 // 拒绝
-const noveltyRefuseHandler = (param: any) => {
-  refuseApproval(param).then((res) => {
+const noveltyRefuseHandler = (comments: string, taskId: string, id: string) => {
+  const params = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
+  refuseApproval(params).then((res) => {
     if (res.code === 200) {
       ElMessage.success('拒绝审批完成')
     }
     else {
       ElMessage.error(`拒绝审批失败：${res.message}`)
     }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
     fetchData(true)
   })
 }
@@ -497,7 +496,7 @@
     </table-container>
 
     <!-- 审批弹窗-审批人自选 -->
-    <approval-dialog ref="approvalDialog" :last-name="customApproval.approvalLastName.standardCheckRecord" @on-success="afterApprovalHandler" @refuse="noveltyRefuseHandler" />
+    <approval-dialog ref="apprDial" :last-name="customApproval.approvalLastName.noveltySearch" @on-success="afterApprovalHandler" @refuse="noveltyRefuseHandler" />
 
     <!-- 右上角按钮集合 -->
     <button-box :active="active" :total-refuse="totalRefuse" :total-approval="totalApproval" :total-to-approval="totalToApproval" :menu="menu" @change-current-button="changeCurrentButton" />
diff --git a/src/views/resource/software/review/detail.vue b/src/views/resource/software/review/detail.vue
index d0a5166..738a05c 100644
--- a/src/views/resource/software/review/detail.vue
+++ b/src/views/resource/software/review/detail.vue
@@ -3,7 +3,9 @@
 import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IRevisionApply } from '../revision/software-revision'
 import type { IReviewReport, IReviewStaff } from './software-review'
-import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
+import customApproval from '/public/config/customApproval.json'
 import FilterRegistedStaff from '@/views/resource/common/filterRegistedStaff.vue'
 import FilterSoftwareRevision from '@/views/resource/common/filterSoftwareRevision.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
@@ -42,7 +44,7 @@
 const softwareFilterRef = ref()
 const revisionFilterRef = ref()
 
-const reviewReport = ref<IReviewReport>({
+const reviewReport: any = ref({
   id: '',
   labCode: '',
   groupCode: '',
@@ -81,10 +83,10 @@
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['change', 'blur'] }],
   groupCode: [{ required: true, message: '部门不能为空', trigger: ['change', 'blur'] }],
   reviewType: [{ required: true, message: '评审类型不能为空', trigger: ['change', 'blur'] }],
-  beforeSoftwareName: [{ required: true, message: '原软件名称不能为空', trigger: 'blur' }],
-  softwareName: [{ required: true, message: '软件名称不能为空', trigger: 'blur' }],
-  softwareVersion: [{ required: true, message: '软件版本号不能为空', trigger: 'blur' }],
-  reviewContent: [{ required: true, message: '评审内容不能为空', trigger: 'blur' }],
+  beforeSoftwareName: [{ required: true, message: '原软件名称不能为空', trigger: ['change', 'blur'] }],
+  softwareName: [{ required: true, message: '软件名称不能为空', trigger: ['change', 'blur'] }],
+  softwareVersion: [{ required: true, message: '软件版本号不能为空', trigger: ['change', 'blur'] }],
+  reviewContent: [{ required: true, message: '评审内容不能为空', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -306,8 +308,14 @@
   })
 }
 
-// 提交按钮
-const submitButtonHandler = async () => {
+// -----------------------------------提交-------------------------------------------------------
+const selectApproverRef = ref() // 审批人自选组件ref
+// 选好审批人
+const confirmSelectApprover = async (approverList: string[] = []) => {
+  if (!approverList.length) {
+    ElMessage.warning('无审批人，无法提交！')
+    return false
+  }
   if (reviewReport.value === null || reviewReport.value.processId === undefined || reviewReport.value.processId === '') {
     // 流程id为空 表示还未进入流程中 直接提交
     ElMessageBox.confirm(`是否提交软件评审报告 ${reviewReport.value.reportNo}`, '提示', {
@@ -323,6 +331,8 @@
       submitDraft({
         formId: SCHEDULE.SOFTWARE_REVIEW_REPORT_APPROVAL,
         id: reviewReport.value.id,
+        processId: reviewReport.value.processId,
+        assignees: approverList,
       }).then((res) => {
         if (res.code === 200) {
           ElMessage.success('提交成功')
@@ -343,7 +353,6 @@
       ElMessage.warning('评审人员列表不能为空')
       return
     }
-
     await reviewReportFormRef.value.validate((valid: boolean) => {
       if (valid === true) {
         const loading = ElLoading.service({
@@ -351,7 +360,12 @@
           text: '加载中...',
           background: 'rgba(255, 255, 255, 0.6)',
         })
-        failUpdateReport(reviewReport.value).then((res) => {
+        const params = {
+          ...reviewReport.value,
+          processId: reviewReport.value.processId,
+          assignees: approverList,
+        }
+        failUpdateReport(params).then((res) => {
           if (res.code === 200) {
           // 提示保存成功
             ElMessage.success('保存成功')
@@ -366,15 +380,27 @@
           loading.close()
         })
       }
+      else {
+        console.log('校验未通过，不提交')
+      }
     })
   }
 }
+// 提交按钮
+const submitButtonHandler = () => {
+  selectApproverRef.value.initDialog()
+}
+
+// ---------------------------------------------------------------------------------------------
 
 // 根据id查询详情
 const detailById = async (id: string) => {
   await detailReviewReport({ id }).then((res) => {
     if (res.code === 200) {
-      reviewReport.value = res.data
+      // reviewReport.value = res.data
+      for (const key in reviewReport.value) {
+        reviewReport.value[key] = res.data[key]
+      }
       reviewReport.value.reviewType = res.data.reviewType.toString()
       reviewStaffList.value = reviewReport.value.staffList
       if (reviewReport.value.taskId === '') {
@@ -391,12 +417,12 @@
 
 // 流程审批-拒绝
 const approvalRefuseHandler = () => {
-  approvalDialog.value.initDialog('refuse', reviewReport.value.id, reviewReport.value.taskId || route.query.taskId, '')
+  approvalDialog.value.initDialog('refuse', reviewReport.value.taskId || route.query.taskId, reviewReport.value.id)
 }
 
 // 流程审批-同意
 const approvalAgreeHandler = () => {
-  approvalDialog.value.initDialog('agree', reviewReport.value.id, reviewReport.value.taskId || route.query.taskId, '')
+  approvalDialog.value.initDialog('agree', reviewReport.value.taskId || route.query.taskId, reviewReport.value.id, reviewReport.value.processId || route.query.processId)
 }
 
 // 取消流程
@@ -462,7 +488,12 @@
 }
 
 // 拒绝
-const refuseHandler = (param: any) => {
+const refuseHandler = (comments: string, taskId: string, id: string) => {
+  const param = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
   const loading = ElLoading.service({
     lock: true,
     text: '加载中...',
@@ -475,9 +506,6 @@
     else {
       ElMessage.error(`拒绝审批失败：${res.message}`)
     }
-    // 关闭弹窗
-    approvalDialog.value.handleClose()
-
     flowButtsVisable.value = false
     loading.close()
   })
@@ -601,7 +629,6 @@
     if (radioItems.value[radioItems.value.length - 1].value === 'review-report-approval') {
       radioItems.value.pop()
     }
-    console.log(radioItems.value)
   }
   else { // 非全部和草稿箱把审批详情加上
     if (radioItems.value[radioItems.value.length - 1].value !== 'review-report-approval') {
@@ -787,10 +814,15 @@
       </detail-block>
     </el-form>
 
-    <approval-dialog
+    <!-- <approval-dialog
       ref="approvalDialog"
       @on-success="approvalSuccessHandler" @on-refuse="refuseHandler"
-    />
+    /> -->
+
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialog" :last-name="customApproval.approvalLastName.softwareReviewReport" @on-success="approvalSuccessHandler" @refuse="refuseHandler" />
+    <!-- 选择审批人弹窗 -->
+    <select-approver-dialog ref="selectApproverRef" @confirm="confirmSelectApprover" />
 
     <filter-registed-staff ref="reviewStaffFilterRef" :show-score="false" @record-selected="appendToContentList" />
     <filter-software-revision ref="revisionFilterRef" @record-selected="revisionSelected" />
diff --git a/src/views/resource/software/review/list.vue b/src/views/resource/software/review/list.vue
index e2c43e6..6568b09 100644
--- a/src/views/resource/software/review/list.vue
+++ b/src/views/resource/software/review/list.vue
@@ -3,7 +3,7 @@
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IListQuery, IReviewReport } from './software-review'
-import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -13,6 +13,8 @@
 import type { IDictType } from '@/commonInterface/resource-interface'
 import { exportFile } from '@/utils/exportUtils'
 import useBridgeCount from '@/components/buttonBox/useBridgeCount'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
+import customApproval from '/public/config/customApproval.json'
 
 const { proxy } = getCurrentInstance() as any
 const router = useRouter()
@@ -251,12 +253,12 @@
 
 // 流程审批-同意
 const approvalAgreeHandler = (row: IReviewReport) => {
-  apprDial.value.initDialog('agree', row.id, row.taskId, '')
+  apprDial.value.initDialog('agree', row.taskId, row.id, row.processId)
 }
 
 // 流程审批-拒绝
 const approvalRefuseHandler = (row: IReviewReport) => {
-  apprDial.value.initDialog('refuse', row.id, row.taskId, '')
+  apprDial.value.initDialog('refuse', row.taskId, row.id)
 }
 
 // 取消（撤回审批单）
@@ -298,7 +300,12 @@
 }
 
 // 拒绝
-const refuseHandler = (param: any) => {
+const refuseHandler = (comments: string, taskId: string, id: string) => {
+  const param = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
   refuseApproval(param).then((res) => {
     if (res.code === 200) {
       ElMessage.success('拒绝审批完成')
@@ -306,9 +313,6 @@
     else {
       ElMessage.error(`拒绝审批失败：${res.message}`)
     }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
     fetchData(true)
   })
 }
@@ -535,10 +539,18 @@
     </table-container>
 
     <!-- 审批单弹窗 -->
-    <approval-dialog
+    <!-- <approval-dialog
       ref="apprDial"
       @on-success="afterApprovalHandler"
       @on-refuse="refuseHandler"
+    /> -->
+
+    <!-- 审批弹窗-审批人自选 -->
+    <approval-dialog
+      ref="apprDial"
+      :last-name="customApproval.approvalLastName.resistance"
+      @on-success="afterApprovalHandler"
+      @refuse="refuseHandler"
     />
 
     <!-- 右上角按钮集合 -->

diff --git a/public/config/customApproval.json b/public/config/customApproval.json
index 205ac21..d69296d 100644
--- a/public/config/customApproval.json
+++ b/public/config/customApproval.json
@@ -1,7 +1,22 @@
 {
-  "approvalLastNameDescribe": "审批流程最后一个节点的名字，用来判断审批自选的时候是否是最后一个节点",
+  "approvalLastName--Describe": "审批流程最后一个节点的名字，用来判断审批自选的时候是否是最后一个节点",
   "approvalLastName": {
-    "standardCheckRecordDescribe": "核查记录",
-    "standardCheckRecord": "技术负责人"
+    "standardCheckRecord--Describe": "核查记录",
+    "standardCheckRecord": "技术负责人",
+
+    "noveltySearch--Describe": "测试校准检定方法查新记录表",
+    "noveltySearch": "审核人",
+
+    "fileChange--Describe": "文件更改申请单",
+    "fileChange": "主任",
+
+    "methodConfirm--Describe": "方法确认登记表",
+    "methodConfirm": "技术负责人",
+
+    "softwareReviewReport--Describe": "软件评审报告",
+    "softwareReviewReport": "技术负责人",
+
+    "resistance--Describe": "实验室接地电阻记录",
+    "resistance": "审核人"
   }
 }
diff --git a/src/views/resource/environment/resistance/edit.vue b/src/views/resource/environment/resistance/edit.vue
index dd62bd1..fd06d64 100644
--- a/src/views/resource/environment/resistance/edit.vue
+++ b/src/views/resource/environment/resistance/edit.vue
@@ -2,7 +2,9 @@
 <script name="EnvironmentResistanceDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IResistanceRecord } from './resistance-interface'
-import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
+import customApproval from '/public/config/customApproval.json'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { detailResistance, draftDeleteResistance, failUpdateResistance, refuseApprovalResistance, revokeApprovalResistance, saveResistance, submitResistance, updateResistance } from '@/api/resource/environmentTest'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
@@ -37,7 +39,7 @@
 const approvalDialog = ref()
 const testRecordRef = ref()
 
-const recordForm = ref<IResistanceRecord>({
+const recordForm: any = ref({
   id: '',
   recordNo: '',
   recordName: '实验室接地电阻记录',
@@ -241,9 +243,14 @@
     }
   })
 }
-
-// 提交按钮
-const submitButtonHandler = async () => {
+// -----------------------------------提交-------------------------------------------------------
+const selectApproverRef = ref() // 审批人自选组件ref
+// 选好审批人
+const confirmSelectApprover = async (approverList: string[] = []) => {
+  if (!approverList.length) {
+    ElMessage.warning('无审批人，无法提交！')
+    return false
+  }
   if (recordForm.value === null || recordForm.value.processId === undefined || recordForm.value.processId === '') {
     // 流程id为空 表示还未进入流程中 直接提交
     ElMessageBox.confirm(`是否提交实验室接地电阻记录 ${recordForm.value.recordNo}`, '提示', {
@@ -259,6 +266,8 @@
       submitResistance({
         formId: SCHEDULE.LAB_RESISTANCE_RECORD_APPROVAL,
         id: recordForm.value.id,
+        processId: recordForm.value.processId,
+        assignees: approverList,
       }).then((res) => {
         if (res.code === 200) {
           ElMessage.success(`实验室接地电阻记录 ${recordForm.value.recordNo} 提交成功`)
@@ -282,7 +291,12 @@
           text: '加载中...',
           background: 'rgba(255, 255, 255, 0.6)',
         })
-        failUpdateResistance(recordForm.value).then((res) => {
+        const params = {
+          ...recordForm.value,
+          processId: recordForm.value.processId,
+          assignees: approverList,
+        }
+        failUpdateResistance(params).then((res) => {
           if (res.code === 200) {
           // 提示保存成功
             ElMessage.success('保存成功')
@@ -302,6 +316,12 @@
     })
   }
 }
+// 提交按钮
+const submitButtonHandler = () => {
+  selectApproverRef.value.initDialog()
+}
+
+// ---------------------------------------------------------------------------------------------
 
 // 根据id查询详情
 const detailById = async (id: string) => {
@@ -312,7 +332,10 @@
   })
   await detailResistance({ id }).then((res) => {
     if (res.code === 200) {
-      recordForm.value = res.data
+      // recordForm.value = res.data
+      for (const key in recordForm.value) {
+        recordForm.value[key] = res.data[key]
+      }
       if (recordForm.value.taskId === '') {
         recordForm.value.taskId = sessionStorage.getItem('resistanceRecordTaskId')!
       }
@@ -328,12 +351,12 @@
 // ------------------------------------------------审批----------------------------------------
 // 流程审批-拒绝
 const approvalRefuseHandler = () => {
-  approvalDialog.value.initDialog('refuse', recordForm.value.id, recordForm.value.taskId || route.query.taskId, '')
+  approvalDialog.value.initDialog('refuse', recordForm.value.taskId || route.query.taskId, recordForm.value.id)
 }
 
 // 流程审批-同意
 const approvalAgreeHandler = () => {
-  approvalDialog.value.initDialog('agree', recordForm.value.id, recordForm.value.taskId || route.query.taskId, '')
+  approvalDialog.value.initDialog('agree', recordForm.value.taskId || route.query.taskId, recordForm.value.id, recordForm.value.processId || route.query.processId)
 }
 
 // 取消流程
@@ -393,7 +416,12 @@
 }
 
 // 拒绝
-const refuseHandler = (param: any) => {
+const refuseHandler = (comments: string, taskId: string, id: string) => {
+  const param = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
   refuseApprovalResistance(param).then((res) => {
     if (res.code === 200) {
       ElMessage.success('拒绝审批完成')
@@ -401,9 +429,6 @@
     else {
       ElMessage.error(`拒绝审批失败：${res.message}`)
     }
-    // 关闭弹窗
-    approvalDialog.value.handleClose()
-
     flowButtsVisable.value = false
   })
 }
@@ -661,10 +686,14 @@
       </detail-block>
     </el-form>
 
-    <approval-dialog
+    <!-- <approval-dialog
       ref="approvalDialog"
       @on-success="approvalSuccessHandler" @on-refuse="refuseHandler" @on-revoke="revokeHandler"
-    />
+    /> -->
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialog" :last-name="customApproval.approvalLastName.resistance" @on-success="approvalSuccessHandler" @refuse="refuseHandler" />
+    <!-- 选择审批人弹窗 -->
+    <select-approver-dialog ref="selectApproverRef" @confirm="confirmSelectApprover" />
 
     <template v-if="current === 'resistance-approval' && status !== '1'">
       <approval-record-table :process-id="recordForm.processId" />
diff --git a/src/views/resource/environment/resistance/list.vue b/src/views/resource/environment/resistance/list.vue
index f3e768e..439b574 100644
--- a/src/views/resource/environment/resistance/list.vue
+++ b/src/views/resource/environment/resistance/list.vue
@@ -3,7 +3,7 @@
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IListQuery, IResistanceRecord } from './resistance-interface'
-import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -13,7 +13,8 @@
 import { exportFile } from '@/utils/exportUtils'
 import { printPdf } from '@/utils/printUtils'
 import useBridgeCount from '@/components/buttonBox/useBridgeCount'
-
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
+import customApproval from '/public/config/customApproval.json'
 // 定义常量
 const buttonBoxActive = 'labResistanceRecordApproval' // 存储在sessionstorage里面的字段名，用于记录右上角buttonbox点击状态
 
@@ -240,12 +241,12 @@
 
 // 流程审批-同意
 const approvalAgreeHandler = (row: IResistanceRecord) => {
-  apprDial.value.initDialog('agree', row.id, row.taskId, '')
+  apprDial.value.initDialog('agree', row.taskId, row.id, row.processId)
 }
 
 // 流程审批-拒绝
 const approvalRefuseHandler = (row: IResistanceRecord) => {
-  apprDial.value.initDialog('refuse', row.id, row.taskId, '')
+  apprDial.value.initDialog('refuse', row.taskId, row.id)
 }
 
 // 取消（撤回审批单）
@@ -287,7 +288,12 @@
 }
 
 // 拒绝
-const refuseHandler = (param: any) => {
+const refuseHandler = (comments: string, taskId: string, id: string) => {
+  const param = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
   refuseApprovalResistance(param).then((res) => {
     if (res.code === 200) {
       ElMessage.success('拒绝审批完成')
@@ -295,8 +301,6 @@
     else {
       ElMessage.error(`拒绝审批失败：${res.message}`)
     }
-    // 关闭弹窗
-    apprDial.value.handleClose()
 
     fetchData(true)
   })
@@ -505,10 +509,18 @@
     </table-container>
 
     <!-- 审批单弹窗 -->
-    <approval-dialog
+    <!-- <approval-dialog
       ref="apprDial"
       @on-success="afterApprovalHandler"
       @on-refuse="refuseHandler"
+    /> -->
+
+    <!-- 审批弹窗-审批人自选 -->
+    <approval-dialog
+      ref="apprDial"
+      :last-name="customApproval.approvalLastName.resistance"
+      @on-success="afterApprovalHandler"
+      @refuse="refuseHandler"
     />
 
     <!-- 右上角按钮集合 -->
diff --git a/src/views/resource/file/change/detail.vue b/src/views/resource/file/change/detail.vue
index 3efc9ab..a0c7c5d 100644
--- a/src/views/resource/file/change/detail.vue
+++ b/src/views/resource/file/change/detail.vue
@@ -5,7 +5,9 @@
 import FileSelectDialog from './dialog/selectSysFileDialog.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
+import customApproval from '/public/config/customApproval.json'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
 import useUserStore from '@/store/modules/user' // 用户信息
 
@@ -292,8 +294,14 @@
   })
 }
 
-// 提交按钮
-const submitButtonHandler = async () => {
+// -----------------------------------提交-------------------------------------------------------
+const selectApproverRef = ref() // 审批人自选组件ref
+// 选好审批人
+const confirmSelectApprover = async (approverList: string[] = []) => {
+  if (!approverList.length) {
+    ElMessage.warning('无审批人，无法提交！')
+    return false
+  }
   if (changeForm.value === null || changeForm.value.processId === undefined || changeForm.value.processId === '') {
     // 流程id为空 表示还未进入流程中 直接提交
     ElMessageBox.confirm(`是否提交文件更改申请单 ${changeForm.value.formNo}`, '提示', {
@@ -309,6 +317,8 @@
       submitChangeForm({
         formId: flowFormId,
         id: changeForm.value.id,
+        processId: changeForm.value.processId,
+        assignees: approverList,
       }).then((res) => {
         if (res.code === 200) {
           ElMessage.success('提交成功')
@@ -333,7 +343,12 @@
           text: '加载中...',
           background: 'rgba(255, 255, 255, 0.6)',
         })
-        failUpdateChangeForm(changeForm.value).then((res) => {
+        const params = {
+          ...changeForm.value,
+          processId: changeForm.value.processId,
+          assignees: approverList,
+        }
+        failUpdateChangeForm(params).then((res) => {
           if (res.code === 200) {
           // 提示保存成功
             ElMessage.success('提交成功')
@@ -354,7 +369,11 @@
     })
   }
 }
-
+// 提交按钮
+const submitButtonHandler = () => {
+  selectApproverRef.value.initDialog()
+}
+// ----------------------------------------------------------------------------------------------
 // 选定文件返回
 const appendFileToList = (listParam: any) => {
   listParam.forEach((item: any) => {
@@ -374,12 +393,12 @@
 
 // 流程审批-同意
 const approvalAgreeHandler = () => {
-  apprDial.value.initDialog('agree', changeForm.value.id, changeForm.value.taskId || route.query.taskId, '')
+  apprDial.value.initDialog('agree', changeForm.value.taskId || route.query.taskId, changeForm.value.id, changeForm.value.processId || route.query.processId)
 }
 
 // 流程审批-拒绝
 const approvalRefuseHandler = () => {
-  apprDial.value.initDialog('refuse', changeForm.value.id, changeForm.value.taskId || route.query.taskId, '')
+  apprDial.value.initDialog('refuse', changeForm.value.taskId || route.query.taskId, changeForm.value.id)
 }
 
 // 取消（撤回审批单）
@@ -443,7 +462,12 @@
 }
 
 // 拒绝
-const refuseHandler = (param: any) => {
+const refuseHandler = (comments: string, taskId: string, id: string) => {
+  const param = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
   refuseApproval(param).then((res) => {
     if (res.code === 200) {
       ElMessage.success('拒绝审批完成')
@@ -451,9 +475,6 @@
     else {
       ElMessage.error(`拒绝审批失败：${res.message}`)
     }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
     flowButtsVisable.value = false
   })
 }
@@ -710,11 +731,15 @@
       </detail-block>
     </el-form>
 
-    <approval-dialog
+    <!-- <approval-dialog
       ref="apprDial"
       @on-success="approvalSuccessHandler"
       @on-refuse="refuseHandler"
-    />
+    /> -->
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="apprDial" :last-name="customApproval.approvalLastName.fileChange" @on-success="approvalSuccessHandler" @refuse="refuseHandler" />
+    <!-- 选择审批人弹窗 -->
+    <select-approver-dialog ref="selectApproverRef" @confirm="confirmSelectApprover" />
 
     <file-select-dialog ref="refFileSelect" @confirm="appendFileToList" />
 
diff --git a/src/views/resource/file/change/list.vue b/src/views/resource/file/change/list.vue
index 71d8624..d6c4606 100644
--- a/src/views/resource/file/change/list.vue
+++ b/src/views/resource/file/change/list.vue
@@ -3,7 +3,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { DateModelType } from 'element-plus'
 import type { IFileChangeForm, IListQuery } from './change-interface'
-import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { deptType } from '@/global'
@@ -11,6 +11,8 @@
 import { getDictByCode } from '@/api/system/dict'
 import { draftDelete, exportFileChangeList, getFileChangeFormList, refuseApproval, revokeApproval, revokeDelete } from '@/api/resource/fileChange'
 import useBridgeCount from '@/components/buttonBox/useBridgeCount'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
+import customApproval from '/public/config/customApproval.json'
 
 // 定义常量
 const buttonBoxActive = 'fileChangeApproval' // 存储在sessionstorage里面的字段名，用于记录右上角buttonbox点击状态
@@ -280,12 +282,12 @@
 
 // 流程审批-同意
 const approvalAgreeHandler = (row: IFileChangeForm) => {
-  apprDial.value.initDialog('agree', row.id, row.taskId, '')
+  apprDial.value.initDialog('agree', row.taskId, row.id, row.processId)
 }
 
 // 流程审批-拒绝
 const approvalRefuseHandler = (row: IFileChangeForm) => {
-  apprDial.value.initDialog('refuse', row.id, row.taskId, '')
+  apprDial.value.initDialog('refuse', row.taskId, row.id)
 }
 
 // 取消（撤回审批单）
@@ -321,7 +323,12 @@
 }
 
 // 拒绝
-const changeFormRefuseHandler = (param: any) => {
+const changeFormRefuseHandler = (comments: string, taskId: string, id: string) => {
+  const param = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
   refuseApproval(param).then((res) => {
     if (res.code === 200) {
       ElMessage.success('拒绝审批完成')
@@ -329,9 +336,6 @@
     else {
       ElMessage.error(`拒绝审批失败：${res.message}`)
     }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
     fetchData(true)
   })
 }
@@ -551,12 +555,19 @@
     </table-container>
 
     <!-- 审批单弹窗 -->
-    <approval-dialog
+    <!-- <approval-dialog
       ref="apprDial"
       @on-success="afterApprovalHandler"
       @on-refuse="changeFormRefuseHandler"
-    />
+    /> -->
 
+    <!-- 审批弹窗-审批人自选 -->
+    <approval-dialog
+      ref="apprDial"
+      :last-name="customApproval.approvalLastName.fileChange"
+      @on-success="afterApprovalHandler"
+      @refuse="changeFormRefuseHandler"
+    />
     <!-- 右上角按钮集合 -->
     <button-box :active="active" :total-refuse="totalRefuse" :total-approval="totalApproval" :total-to-approval="totalToApproval" :menu="menu" @change-current-button="changeCurrentButton" />
   </app-container>
diff --git a/src/views/resource/file/methodConfirm/detail.vue b/src/views/resource/file/methodConfirm/detail.vue
index f38d52c..949e446 100644
--- a/src/views/resource/file/methodConfirm/detail.vue
+++ b/src/views/resource/file/methodConfirm/detail.vue
@@ -8,7 +8,9 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IFileInfo as IMethodFileInfo } from '@/views/resource/technology/method/method-interface'
 import { getFileMethodList } from '@/api/resource/fileTechnology'
-import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
+import customApproval from '/public/config/customApproval.json'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
@@ -269,8 +271,14 @@
   })
 }
 
-// 提交按钮
-const submitButtonHandler = async () => {
+// -----------------------------------提交-------------------------------------------------------
+const selectApproverRef = ref() // 审批人自选组件ref
+// 选好审批人
+const confirmSelectApprover = async (approverList: string[] = []) => {
+  if (!approverList.length) {
+    ElMessage.warning('无审批人，无法提交！')
+    return false
+  }
   if (methodConfirm.value === null || methodConfirm.value.processId === undefined || methodConfirm.value.processId === '') {
     // 流程id为空 表示还未进入流程中 直接提交
     ElMessageBox.confirm(`是否提交方法确认登记表 ${methodConfirm.value.formNo}`, '提示', {
@@ -281,6 +289,8 @@
       submitMethodConfirm({
         formId: flowFormId,
         id: methodConfirm.value.id,
+        processId: methodConfirm.value.processId,
+        assignees: approverList,
       }).then((res) => {
         if (res.code === 200) {
           ElMessage.success(`方法确认登记表 ${methodConfirm.value.formNo} 提交成功`)
@@ -298,7 +308,12 @@
     // 之前已经在流程中的表单 保存提交
     await methodConfirmRef.value.validate((valid: boolean) => {
       if (valid === true) {
-        failUpdateMethodConfirm(methodConfirm.value).then((res) => {
+        const param = {
+          ...methodConfirm.value,
+          processId: methodConfirm.value.processId,
+          assignees: approverList,
+        }
+        failUpdateMethodConfirm(param).then((res) => {
           if (res.code === 200) {
             // 提示保存成功
             ElMessage.success(`方法确认登记表 ${methodConfirm.value.formNo} 提交成功`)
@@ -315,6 +330,11 @@
     })
   }
 }
+// 提交按钮
+const submitButtonHandler = () => {
+  selectApproverRef.value.initDialog()
+}
+// -----------------------------------提交-------------------------------------------------------
 
 // 显示筛选委托方名录的弹窗
 const showFilterMethod = () => {
@@ -378,17 +398,30 @@
 }
 // 流程审批-同意
 const approvalAgreeHandler = () => {
-  apprDial.value.initDialog('agree', methodConfirm.value.id, methodConfirm.value.taskId || route.query.taskId, '')
+  apprDial.value.initDialog('agree', methodConfirm.value.taskId || route.query.taskId, methodConfirm.value.id, methodConfirm.value.processId || route.query.processId)
 }
 
 // 流程审批-拒绝
 const approvalRefuseHandler = () => {
-  apprDial.value.initDialog('refuse', methodConfirm.value.id, methodConfirm.value.taskId || route.query.taskId, '')
+  apprDial.value.initDialog('refuse', methodConfirm.value.taskId || route.query.taskId, methodConfirm.value.id)
 }
 
 // 取消（撤回审批单）
 const revokeClickedHandler = () => {
-  apprDial.value.initDialog('revoke', methodConfirm.value.id, methodConfirm.value.taskId || route.query.taskId, methodConfirm.value.processId || route.query.processId)
+  const param = {
+    processInstanceId: methodConfirm.value.processId || route.query.processId!,
+    comments: '',
+    id: id.value,
+  }
+  revokeApproval(param).then((res) => {
+    if (res.code === 200) {
+      ElMessage.success('流程取消成功')
+    }
+    else {
+      ElMessage.error(`流程取消失败：${res.message}`)
+    }
+    cancelButtVisable.value = false
+  })
 }
 
 // 删除（只有已取消的可以在详情中删除）
@@ -424,24 +457,13 @@
   }
 }
 
-// 取消
-const revokeHandler = (param: any) => {
-  revokeApproval(param).then((res) => {
-    if (res.code === 200) {
-      ElMessage.success('流程取消成功')
-    }
-    else {
-      ElMessage.error(`流程取消失败：${res.message}`)
-    }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
-    cancelButtVisable.value = false
-  })
-}
-
 // 拒绝
-const refuseHandler = (param: any) => {
+const refuseHandler = (comments: string, taskId: string, id: string) => {
+  const param = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
   refuseApproval(param).then((res) => {
     if (res.code === 200) {
       ElMessage.success('拒绝审批完成')
@@ -449,9 +471,6 @@
     else {
       ElMessage.error(`拒绝审批失败：${res.message}`)
     }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
     flowButtsVisable.value = false
   })
 }
@@ -867,10 +886,15 @@
       </template>
     </el-form>
 
-    <approval-dialog
+    <!-- <approval-dialog
       ref="apprDial" @on-success="approvalSuccessHandler" @on-refuse="refuseHandler"
       @on-revoke="revokeHandler"
-    />
+    /> -->
+
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="apprDial" :last-name="customApproval.approvalLastName.methodConfirm" @on-success="approvalSuccessHandler" @refuse="refuseHandler" />
+    <!-- 选择审批人弹窗 -->
+    <select-approver-dialog ref="selectApproverRef" @confirm="confirmSelectApprover" />
 
     <file-select-dialog ref="refFileSelect" @confirm="methodFileSelected" />
 
diff --git a/src/views/resource/file/methodConfirm/list.vue b/src/views/resource/file/methodConfirm/list.vue
index 973683c..2d9ea42 100644
--- a/src/views/resource/file/methodConfirm/list.vue
+++ b/src/views/resource/file/methodConfirm/list.vue
@@ -6,11 +6,12 @@
 import type { IMenu } from '@/components/buttonBox/buttonBox'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IDictType } from '@/commonInterface/resource-interface'
-import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import { getDictByCode } from '@/api/system/dict'
 import { draftDelete, getMethodConfirmList, refuseApproval, revokeApproval, revokeDelete } from '@/api/resource/fileConfirm'
 import useBridgeCount from '@/components/buttonBox/useBridgeCount'
-
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
+import customApproval from '/public/config/customApproval.json'
 // 定义常量
 const buttonBoxActive = 'fileMethodConfirm' // 存储在sessionstorage里面的字段名，用于记录右上角buttonbox点击状态
 const flowFormId = 'zyglffqrdjb' // 资源管理 - 方法确认登记表
@@ -249,17 +250,30 @@
 
 // 流程审批-同意
 const approvalAgreeHandler = (row: IFileMethodConfirm) => {
-  apprDial.value.initDialog('agree', row.id, row.taskId, '')
+  apprDial.value.initDialog('agree', row.taskId, row.id, row.processId)
 }
 
 // 流程审批-拒绝
 const approvalRefuseHandler = (row: IFileMethodConfirm) => {
-  apprDial.value.initDialog('refuse', row.id, row.taskId, '')
+  apprDial.value.initDialog('refuse', row.taskId, row.id)
 }
 
 // 取消（撤回审批单）
 const revokeApprById = (row: IFileMethodConfirm) => {
-  apprDial.value.initDialog('revoke', row.id, row.taskId, row.processId)
+  const params = {
+    processInstanceId: row.processId!,
+    comments: '',
+    id: row.id,
+  }
+  revokeApproval(params).then((res) => {
+    if (res.code === 200) {
+      ElMessage.success('流程取消成功')
+    }
+    else {
+      ElMessage.error(`流程取消失败：${res.message}`)
+    }
+    fetchData(true)
+  })
 }
 
 // 流程操作之后刷新
@@ -267,24 +281,13 @@
   fetchData(true)
 }
 
-// 取消
-const approvalFormRevokeHandler = (param: any) => {
-  revokeApproval(param).then((res) => {
-    if (res.code === 200) {
-      ElMessage.success('流程取消成功')
-    }
-    else {
-      ElMessage.error(`流程取消失败：${res.message}`)
-    }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
-    fetchData(true)
-  })
-}
-
 // 拒绝
-const approvalFormRefuseHandler = (param: any) => {
+const approvalFormRefuseHandler = (comments: string, taskId: string, id: string) => {
+  const param = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
   refuseApproval(param).then((res) => {
     if (res.code === 200) {
       ElMessage.success('拒绝审批完成')
@@ -292,9 +295,6 @@
     else {
       ElMessage.error(`拒绝审批失败：${res.message}`)
     }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
     fetchData(true)
   })
 }
@@ -481,11 +481,19 @@
     </table-container>
 
     <!-- 审批单弹窗 -->
-    <approval-dialog
+    <!-- <approval-dialog
       ref="apprDial"
       @on-success="afterApprovalHandler"
       @on-refuse="approvalFormRefuseHandler"
       @on-revoke="approvalFormRevokeHandler"
+    /> -->
+
+    <!-- 审批弹窗-审批人自选 -->
+    <approval-dialog
+      ref="apprDial"
+      :last-name="customApproval.approvalLastName.methodConfirm"
+      @on-success="afterApprovalHandler"
+      @refuse="approvalFormRefuseHandler"
     />
 
     <!-- 右上角按钮集合 -->
diff --git a/src/views/resource/file/noveltySearch/detail.vue b/src/views/resource/file/noveltySearch/detail.vue
index 19bdf70..116ea3e 100644
--- a/src/views/resource/file/noveltySearch/detail.vue
+++ b/src/views/resource/file/noveltySearch/detail.vue
@@ -1,4 +1,4 @@
-<!-- 委托方意见登记表详情 -->
+<!-- 测试校准检定方法查新记录表详情 -->
 <script name="FileNoveltySearchDetail" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import { Close } from '@element-plus/icons-vue'
@@ -9,7 +9,9 @@
 import type { IDictType } from '@/commonInterface/resource-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IFileInfo as IMethodFileInfo } from '@/views/resource/technology/method/method-interface'
-import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
+import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
+import customApproval from '/public/config/customApproval.json'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
@@ -279,8 +281,14 @@
   })
 }
 
-// 提交按钮
-const submitButtonHandler = async () => {
+// -----------------------------------提交-------------------------------------------------------
+const selectApproverRef = ref() // 审批人自选组件ref
+// 选好审批人
+const confirmSelectApprover = async (approverList: string[] = []) => {
+  if (!approverList.length) {
+    ElMessage.warning('无审批人，无法提交！')
+    return false
+  }
   if (novelty.value === null || novelty.value.processId === undefined || novelty.value.processId === '') {
     // 流程id为空 表示还未进入流程中 直接提交
     ElMessageBox.confirm(`是否提交查新记录表 ${novelty.value.formNo}`, '提示', {
@@ -291,6 +299,8 @@
       submitNovelty({
         formId: flowFormId,
         id: novelty.value.id,
+        processId: novelty.value.processId,
+        assignees: approverList,
       }).then((res) => {
         if (res.code === 200) {
           ElMessage.success(`查新记录表 ${novelty.value.formNo} 提交成功`)
@@ -311,7 +321,12 @@
     // 之前已经在流程中的表单 保存提交
     await noveltyRef.value.validate((valid: boolean) => {
       if (valid === true) {
-        failUpdateNovelty(novelty.value).then((res) => {
+        const params = {
+          ...novelty.value,
+          processId: novelty.value.processId,
+          assignees: approverList,
+        }
+        failUpdateNovelty(params).then((res) => {
           if (res.code === 200) {
             // 提示保存成功
             ElMessage.success(`查新记录表 ${novelty.value.formNo} 提交成功`)
@@ -329,6 +344,11 @@
     })
   }
 }
+// 提交按钮
+const submitButtonHandler = () => {
+  selectApproverRef.value.initDialog()
+}
+// ----------------------------------------------------------------------------------------------
 
 // 选定文件返回
 const appendFileToList = (row: IMethodFileInfo, result: string) => {
@@ -347,17 +367,33 @@
 
 // 流程审批-同意
 const approvalAgreeHandler = () => {
-  apprDial.value.initDialog('agree', novelty.value.id, novelty.value.taskId || route.query.taskId, '')
+  apprDial.value.initDialog('agree', novelty.value.taskId || route.query.taskId, novelty.value.id, novelty.value.processId || route.query.processId)
 }
 
 // 流程审批-拒绝
 const approvalRefuseHandler = () => {
-  apprDial.value.initDialog('refuse', novelty.value.id, novelty.value.taskId || route.query.taskId, '')
+  apprDial.value.initDialog('refuse', novelty.value.taskId || route.query.taskId, novelty.value.id)
 }
 
 // 取消（撤回审批单）
 const revokeClickedHandler = () => {
-  apprDial.value.initDialog('revoke', novelty.value.id, novelty.value.taskId || route.query.taskId, novelty.value.processId || route.query.processId)
+  const params = {
+    processInstanceId: novelty.value.processId! || route.query.processId,
+    comments: '',
+    id: novelty.value.id,
+  }
+  revokeApproval(params).then((res) => {
+    if (res.code === 200) {
+      ElMessage.success('流程取消成功')
+    }
+    else {
+      ElMessage.error(`流程取消失败：${res.message}`)
+    }
+    // 关闭弹窗
+    apprDial.value.handleClose()
+
+    cancelButtVisable.value = false
+  })
 }
 
 // 删除（只有已取消的可以在详情中删除）
@@ -385,32 +421,22 @@
 
 // 流程操作之后刷新
 const approvalSuccessHandler = (type: string) => {
-  if (type === 'agree' || type === 'refuse') {
-    flowButtsVisable.value = false
-  }
-  else if (type === 'revoke') {
-    cancelButtVisable.value = false
-  }
-}
-
-// 取消
-const revokeHandler = (param: any) => {
-  revokeApproval(param).then((res) => {
-    if (res.code === 200) {
-      ElMessage.success('流程取消成功')
-    }
-    else {
-      ElMessage.error(`流程取消失败：${res.message}`)
-    }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
-    cancelButtVisable.value = false
-  })
+  flowButtsVisable.value = false
+  // if (type === 'agree' || type === 'refuse') {
+  //   flowButtsVisable.value = false
+  // }
+  // else if (type === 'revoke') {
+  //   cancelButtVisable.value = false
+  // }
 }
 
 // 拒绝
-const refuseHandler = (param: any) => {
+const refuseHandler = (comments: string, taskId: string, id: string) => {
+  const param = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
   refuseApproval(param).then((res) => {
     if (res.code === 200) {
       ElMessage.success('拒绝审批完成')
@@ -418,9 +444,6 @@
     else {
       ElMessage.error(`拒绝审批失败：${res.message}`)
     }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
     flowButtsVisable.value = false
   })
 }
@@ -1059,11 +1082,16 @@
       </detail-page>
     </el-form>
 
-    <approval-dialog
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="apprDial" :last-name="customApproval.approvalLastName.noveltySearch" @on-success="approvalSuccessHandler" @refuse="refuseHandler" />
+    <!-- 选择审批人弹窗 -->
+    <select-approver-dialog ref="selectApproverRef" @confirm="confirmSelectApprover" />
+    <!-- <approval-dialog
       ref="apprDial" @on-success="approvalSuccessHandler" @on-refuse="refuseHandler"
       @on-revoke="revokeHandler"
-    />
-
+    /> -->
+    <!-- 审批弹窗-审批人自选 -->
+    <!-- <approval-dialog ref="approvalDialog" :last-name="customApproval.approvalLastName.noveltySearch" @on-success="afterApprovalHandler" @refuse="noveltyRefuseHandler" /> -->
     <file-select-dialog ref="refFileSelect" @records-selected="appendFileToList" />
 
     <template v-if="current === 'novelty-approval' && status !== '1'">
diff --git a/src/views/resource/file/noveltySearch/list.vue b/src/views/resource/file/noveltySearch/list.vue
index be0ea46..6f6b973 100644
--- a/src/views/resource/file/noveltySearch/list.vue
+++ b/src/views/resource/file/noveltySearch/list.vue
@@ -255,12 +255,12 @@
 
 // 流程审批-同意
 const approvalAgreeHandler = (row: IMethodNoveltySearch) => {
-  apprDial.value.initDialog('agree', row.id, row.taskId, '')
+  apprDial.value.initDialog('agree', row.taskId, row.id, row.processId)
 }
 
 // 流程审批-拒绝
 const approvalRefuseHandler = (row: IMethodNoveltySearch) => {
-  apprDial.value.initDialog('refuse', row.id, row.taskId, '')
+  apprDial.value.initDialog('refuse', row.taskId, row.id)
 }
 
 // 取消（撤回审批单）
@@ -277,9 +277,6 @@
     else {
       ElMessage.error(`流程取消失败：${res.message}`)
     }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
     fetchData(true)
   })
 }
@@ -290,17 +287,19 @@
 }
 
 // 拒绝
-const noveltyRefuseHandler = (param: any) => {
-  refuseApproval(param).then((res) => {
+const noveltyRefuseHandler = (comments: string, taskId: string, id: string) => {
+  const params = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
+  refuseApproval(params).then((res) => {
     if (res.code === 200) {
       ElMessage.success('拒绝审批完成')
     }
     else {
       ElMessage.error(`拒绝审批失败：${res.message}`)
     }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
     fetchData(true)
   })
 }
@@ -497,7 +496,7 @@
     </table-container>
 
     <!-- 审批弹窗-审批人自选 -->
-    <approval-dialog ref="approvalDialog" :last-name="customApproval.approvalLastName.standardCheckRecord" @on-success="afterApprovalHandler" @refuse="noveltyRefuseHandler" />
+    <approval-dialog ref="apprDial" :last-name="customApproval.approvalLastName.noveltySearch" @on-success="afterApprovalHandler" @refuse="noveltyRefuseHandler" />
 
     <!-- 右上角按钮集合 -->
     <button-box :active="active" :total-refuse="totalRefuse" :total-approval="totalApproval" :total-to-approval="totalToApproval" :menu="menu" @change-current-button="changeCurrentButton" />
diff --git a/src/views/resource/software/review/detail.vue b/src/views/resource/software/review/detail.vue
index d0a5166..738a05c 100644
--- a/src/views/resource/software/review/detail.vue
+++ b/src/views/resource/software/review/detail.vue
@@ -3,7 +3,9 @@
 import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IRevisionApply } from '../revision/software-revision'
 import type { IReviewReport, IReviewStaff } from './software-review'
-import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
+import customApproval from '/public/config/customApproval.json'
 import FilterRegistedStaff from '@/views/resource/common/filterRegistedStaff.vue'
 import FilterSoftwareRevision from '@/views/resource/common/filterSoftwareRevision.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
@@ -42,7 +44,7 @@
 const softwareFilterRef = ref()
 const revisionFilterRef = ref()
 
-const reviewReport = ref<IReviewReport>({
+const reviewReport: any = ref({
   id: '',
   labCode: '',
   groupCode: '',
@@ -81,10 +83,10 @@
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['change', 'blur'] }],
   groupCode: [{ required: true, message: '部门不能为空', trigger: ['change', 'blur'] }],
   reviewType: [{ required: true, message: '评审类型不能为空', trigger: ['change', 'blur'] }],
-  beforeSoftwareName: [{ required: true, message: '原软件名称不能为空', trigger: 'blur' }],
-  softwareName: [{ required: true, message: '软件名称不能为空', trigger: 'blur' }],
-  softwareVersion: [{ required: true, message: '软件版本号不能为空', trigger: 'blur' }],
-  reviewContent: [{ required: true, message: '评审内容不能为空', trigger: 'blur' }],
+  beforeSoftwareName: [{ required: true, message: '原软件名称不能为空', trigger: ['change', 'blur'] }],
+  softwareName: [{ required: true, message: '软件名称不能为空', trigger: ['change', 'blur'] }],
+  softwareVersion: [{ required: true, message: '软件版本号不能为空', trigger: ['change', 'blur'] }],
+  reviewContent: [{ required: true, message: '评审内容不能为空', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -306,8 +308,14 @@
   })
 }
 
-// 提交按钮
-const submitButtonHandler = async () => {
+// -----------------------------------提交-------------------------------------------------------
+const selectApproverRef = ref() // 审批人自选组件ref
+// 选好审批人
+const confirmSelectApprover = async (approverList: string[] = []) => {
+  if (!approverList.length) {
+    ElMessage.warning('无审批人，无法提交！')
+    return false
+  }
   if (reviewReport.value === null || reviewReport.value.processId === undefined || reviewReport.value.processId === '') {
     // 流程id为空 表示还未进入流程中 直接提交
     ElMessageBox.confirm(`是否提交软件评审报告 ${reviewReport.value.reportNo}`, '提示', {
@@ -323,6 +331,8 @@
       submitDraft({
         formId: SCHEDULE.SOFTWARE_REVIEW_REPORT_APPROVAL,
         id: reviewReport.value.id,
+        processId: reviewReport.value.processId,
+        assignees: approverList,
       }).then((res) => {
         if (res.code === 200) {
           ElMessage.success('提交成功')
@@ -343,7 +353,6 @@
       ElMessage.warning('评审人员列表不能为空')
       return
     }
-
     await reviewReportFormRef.value.validate((valid: boolean) => {
       if (valid === true) {
         const loading = ElLoading.service({
@@ -351,7 +360,12 @@
           text: '加载中...',
           background: 'rgba(255, 255, 255, 0.6)',
         })
-        failUpdateReport(reviewReport.value).then((res) => {
+        const params = {
+          ...reviewReport.value,
+          processId: reviewReport.value.processId,
+          assignees: approverList,
+        }
+        failUpdateReport(params).then((res) => {
           if (res.code === 200) {
           // 提示保存成功
             ElMessage.success('保存成功')
@@ -366,15 +380,27 @@
           loading.close()
         })
       }
+      else {
+        console.log('校验未通过，不提交')
+      }
     })
   }
 }
+// 提交按钮
+const submitButtonHandler = () => {
+  selectApproverRef.value.initDialog()
+}
+
+// ---------------------------------------------------------------------------------------------
 
 // 根据id查询详情
 const detailById = async (id: string) => {
   await detailReviewReport({ id }).then((res) => {
     if (res.code === 200) {
-      reviewReport.value = res.data
+      // reviewReport.value = res.data
+      for (const key in reviewReport.value) {
+        reviewReport.value[key] = res.data[key]
+      }
       reviewReport.value.reviewType = res.data.reviewType.toString()
       reviewStaffList.value = reviewReport.value.staffList
       if (reviewReport.value.taskId === '') {
@@ -391,12 +417,12 @@
 
 // 流程审批-拒绝
 const approvalRefuseHandler = () => {
-  approvalDialog.value.initDialog('refuse', reviewReport.value.id, reviewReport.value.taskId || route.query.taskId, '')
+  approvalDialog.value.initDialog('refuse', reviewReport.value.taskId || route.query.taskId, reviewReport.value.id)
 }
 
 // 流程审批-同意
 const approvalAgreeHandler = () => {
-  approvalDialog.value.initDialog('agree', reviewReport.value.id, reviewReport.value.taskId || route.query.taskId, '')
+  approvalDialog.value.initDialog('agree', reviewReport.value.taskId || route.query.taskId, reviewReport.value.id, reviewReport.value.processId || route.query.processId)
 }
 
 // 取消流程
@@ -462,7 +488,12 @@
 }
 
 // 拒绝
-const refuseHandler = (param: any) => {
+const refuseHandler = (comments: string, taskId: string, id: string) => {
+  const param = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
   const loading = ElLoading.service({
     lock: true,
     text: '加载中...',
@@ -475,9 +506,6 @@
     else {
       ElMessage.error(`拒绝审批失败：${res.message}`)
     }
-    // 关闭弹窗
-    approvalDialog.value.handleClose()
-
     flowButtsVisable.value = false
     loading.close()
   })
@@ -601,7 +629,6 @@
     if (radioItems.value[radioItems.value.length - 1].value === 'review-report-approval') {
       radioItems.value.pop()
     }
-    console.log(radioItems.value)
   }
   else { // 非全部和草稿箱把审批详情加上
     if (radioItems.value[radioItems.value.length - 1].value !== 'review-report-approval') {
@@ -787,10 +814,15 @@
       </detail-block>
     </el-form>
 
-    <approval-dialog
+    <!-- <approval-dialog
       ref="approvalDialog"
       @on-success="approvalSuccessHandler" @on-refuse="refuseHandler"
-    />
+    /> -->
+
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialog" :last-name="customApproval.approvalLastName.softwareReviewReport" @on-success="approvalSuccessHandler" @refuse="refuseHandler" />
+    <!-- 选择审批人弹窗 -->
+    <select-approver-dialog ref="selectApproverRef" @confirm="confirmSelectApprover" />
 
     <filter-registed-staff ref="reviewStaffFilterRef" :show-score="false" @record-selected="appendToContentList" />
     <filter-software-revision ref="revisionFilterRef" @record-selected="revisionSelected" />
diff --git a/src/views/resource/software/review/list.vue b/src/views/resource/software/review/list.vue
index e2c43e6..6568b09 100644
--- a/src/views/resource/software/review/list.vue
+++ b/src/views/resource/software/review/list.vue
@@ -3,7 +3,7 @@
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IListQuery, IReviewReport } from './software-review'
-import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -13,6 +13,8 @@
 import type { IDictType } from '@/commonInterface/resource-interface'
 import { exportFile } from '@/utils/exportUtils'
 import useBridgeCount from '@/components/buttonBox/useBridgeCount'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
+import customApproval from '/public/config/customApproval.json'
 
 const { proxy } = getCurrentInstance() as any
 const router = useRouter()
@@ -251,12 +253,12 @@
 
 // 流程审批-同意
 const approvalAgreeHandler = (row: IReviewReport) => {
-  apprDial.value.initDialog('agree', row.id, row.taskId, '')
+  apprDial.value.initDialog('agree', row.taskId, row.id, row.processId)
 }
 
 // 流程审批-拒绝
 const approvalRefuseHandler = (row: IReviewReport) => {
-  apprDial.value.initDialog('refuse', row.id, row.taskId, '')
+  apprDial.value.initDialog('refuse', row.taskId, row.id)
 }
 
 // 取消（撤回审批单）
@@ -298,7 +300,12 @@
 }
 
 // 拒绝
-const refuseHandler = (param: any) => {
+const refuseHandler = (comments: string, taskId: string, id: string) => {
+  const param = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
   refuseApproval(param).then((res) => {
     if (res.code === 200) {
       ElMessage.success('拒绝审批完成')
@@ -306,9 +313,6 @@
     else {
       ElMessage.error(`拒绝审批失败：${res.message}`)
     }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
     fetchData(true)
   })
 }
@@ -535,10 +539,18 @@
     </table-container>
 
     <!-- 审批单弹窗 -->
-    <approval-dialog
+    <!-- <approval-dialog
       ref="apprDial"
       @on-success="afterApprovalHandler"
       @on-refuse="refuseHandler"
+    /> -->
+
+    <!-- 审批弹窗-审批人自选 -->
+    <approval-dialog
+      ref="apprDial"
+      :last-name="customApproval.approvalLastName.resistance"
+      @on-success="afterApprovalHandler"
+      @refuse="refuseHandler"
     />
 
     <!-- 右上角按钮集合 -->
diff --git a/src/views/resource/software/review/software-review.ts b/src/views/resource/software/review/software-review.ts
index 9979ecd..6f93788 100644
--- a/src/views/resource/software/review/software-review.ts
+++ b/src/views/resource/software/review/software-review.ts
@@ -54,4 +54,5 @@
   createTime?: string
   decisionItem?: number
   revisionApplyNo?: string
+  [key: string]: string | undefined
 }