diff --git a/public/config/customApproval.json b/public/config/customApproval.json
new file mode 100644
index 0000000..f791343
--- /dev/null
+++ b/public/config/customApproval.json
@@ -0,0 +1,7 @@
+{
+  "approvalLastName--Describe": "审批流程最后一个节点的名字，用来判断审批自选的时候是否是最后一个节点",
+  "approvalLastName": {
+    "measureData--Describe": "计量数据管理",
+    "measureData": "审批人"
+  }
+}

diff --git a/public/config/customApproval.json b/public/config/customApproval.json
new file mode 100644
index 0000000..f791343
--- /dev/null
+++ b/public/config/customApproval.json
@@ -0,0 +1,7 @@
+{
+  "approvalLastName--Describe": "审批流程最后一个节点的名字，用来判断审批自选的时候是否是最后一个节点",
+  "approvalLastName": {
+    "measureData--Describe": "计量数据管理",
+    "measureData": "审批人"
+  }
+}
diff --git a/src/api/system/process.ts b/src/api/system/process.ts
index c2d4419..6bef77b 100644
--- a/src/api/system/process.ts
+++ b/src/api/system/process.ts
@@ -121,3 +121,11 @@
     data,
   })
 }
+// 动态添加审批人
+export function addApprovalUser(data: object) {
+  return request({
+    url: '/approval/operate/addTaskApprover',
+    method: 'post',
+    data,
+  })
+}

diff --git a/public/config/customApproval.json b/public/config/customApproval.json
new file mode 100644
index 0000000..f791343
--- /dev/null
+++ b/public/config/customApproval.json
@@ -0,0 +1,7 @@
+{
+  "approvalLastName--Describe": "审批流程最后一个节点的名字，用来判断审批自选的时候是否是最后一个节点",
+  "approvalLastName": {
+    "measureData--Describe": "计量数据管理",
+    "measureData": "审批人"
+  }
+}
diff --git a/src/api/system/process.ts b/src/api/system/process.ts
index c2d4419..6bef77b 100644
--- a/src/api/system/process.ts
+++ b/src/api/system/process.ts
@@ -121,3 +121,11 @@
     data,
   })
 }
+// 动态添加审批人
+export function addApprovalUser(data: object) {
+  return request({
+    url: '/approval/operate/addTaskApprover',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components.d.ts b/src/components.d.ts
index 6cd708a..fde4221 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -13,6 +13,8 @@
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
     ApprovalDialogByProcess: typeof import('./components/Approval/ApprovalDialogByProcess.vue')['default']
+    ApprovalDialogCustom: typeof import('./components/Approval/ApprovalDialogCustom.vue')['default']
+    'ApprovalDialogCustom copy': typeof import('./components/Approval/ApprovalDialogCustom copy.vue')['default']
     ApprovalRecord: typeof import('./components/ApprovalRecord/ApprovalRecord.vue')['default']
     ApprovalRecordTable: typeof import('./components/ApprovalRecord/ApprovalRecordTable.vue')['default']
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
@@ -27,6 +29,7 @@
     CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default']
     CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
+    copy: typeof import('./components/Approval/ApprovalDialogCustom copy.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
@@ -64,6 +67,7 @@
     SearchArea: typeof import('./components/SearchArea/index.vue')['default']
     SearchBar: typeof import('./components/SearchBar/index.vue')['default']
     SearchItem: typeof import('./components/SearchArea/SearchItem.vue')['default']
+    SelectApproverDialog: typeof import('./components/Approval/selectApproverDialog.vue')['default']
     SelectEmployeesDialog: typeof import('./components/dialog/selectEmployeesDialog.vue')['default']
     SelectRoleDialog: typeof import('./components/dialog/selectRoleDialog.vue')['default']
     SelectStaffDialog: typeof import('./components/dialog/selectStaffDialog.vue')['default']

diff --git a/public/config/customApproval.json b/public/config/customApproval.json
new file mode 100644
index 0000000..f791343
--- /dev/null
+++ b/public/config/customApproval.json
@@ -0,0 +1,7 @@
+{
+  "approvalLastName--Describe": "审批流程最后一个节点的名字，用来判断审批自选的时候是否是最后一个节点",
+  "approvalLastName": {
+    "measureData--Describe": "计量数据管理",
+    "measureData": "审批人"
+  }
+}
diff --git a/src/api/system/process.ts b/src/api/system/process.ts
index c2d4419..6bef77b 100644
--- a/src/api/system/process.ts
+++ b/src/api/system/process.ts
@@ -121,3 +121,11 @@
     data,
   })
 }
+// 动态添加审批人
+export function addApprovalUser(data: object) {
+  return request({
+    url: '/approval/operate/addTaskApprover',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components.d.ts b/src/components.d.ts
index 6cd708a..fde4221 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -13,6 +13,8 @@
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
     ApprovalDialogByProcess: typeof import('./components/Approval/ApprovalDialogByProcess.vue')['default']
+    ApprovalDialogCustom: typeof import('./components/Approval/ApprovalDialogCustom.vue')['default']
+    'ApprovalDialogCustom copy': typeof import('./components/Approval/ApprovalDialogCustom copy.vue')['default']
     ApprovalRecord: typeof import('./components/ApprovalRecord/ApprovalRecord.vue')['default']
     ApprovalRecordTable: typeof import('./components/ApprovalRecord/ApprovalRecordTable.vue')['default']
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
@@ -27,6 +29,7 @@
     CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default']
     CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
+    copy: typeof import('./components/Approval/ApprovalDialogCustom copy.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
@@ -64,6 +67,7 @@
     SearchArea: typeof import('./components/SearchArea/index.vue')['default']
     SearchBar: typeof import('./components/SearchBar/index.vue')['default']
     SearchItem: typeof import('./components/SearchArea/SearchItem.vue')['default']
+    SelectApproverDialog: typeof import('./components/Approval/selectApproverDialog.vue')['default']
     SelectEmployeesDialog: typeof import('./components/dialog/selectEmployeesDialog.vue')['default']
     SelectRoleDialog: typeof import('./components/dialog/selectRoleDialog.vue')['default']
     SelectStaffDialog: typeof import('./components/dialog/selectStaffDialog.vue')['default']
diff --git a/src/components/Approval/ApprovalDialogCustom copy.vue b/src/components/Approval/ApprovalDialogCustom copy.vue
new file mode 100644
index 0000000..d2f3dac
--- /dev/null
+++ b/src/components/Approval/ApprovalDialogCustom copy.vue
@@ -0,0 +1,274 @@
+<!-- 审批弹窗-审批人自选使用 -->
+<script lang="ts" setup name="ApprovalDialogCustom">
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
+import { fetchApproval, submitApproval } from '@/api/approval'
+import { getUserList } from '@/api/system/user'
+import { addApprovalUser } from '@/api/system/process'
+/**
+ * 审批弹窗
+ */
+const props = defineProps({
+  /**
+   * 提示文字
+   */
+  title: {
+    type: String,
+    default: '审批操作',
+  },
+  // 流程最后一个节点的名字
+  lastName: {
+    type: String,
+    required: true,
+  },
+  approvalModule: { // 审批的菜单模块
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['onSuccess', 'refuse', 'reject'])
+// 弹窗显示状态
+const dialogVisible = ref(false)
+// 默认表单
+const defaultFormData = {
+  type: '', // 审批类型
+  taskId: '', // 任务id
+  comments: '', // 备注
+  user: '', // 当前用户
+  approvalTime: '', // 当前时间
+  id: '',
+  userList: [] as any,
+  processId: '',
+}
+// 弹窗类型 agree同意 refuse拒绝 reject驳回 revoke取消
+const type = ref('agree')
+// 表单数据对象
+const formData = reactive({ ...defaultFormData })
+// 是否展示 下一节点审批节点 审批人
+const isShowUser = ref(false)
+// 保存按钮加载状态
+const btnLoading = ref(false)
+
+// agree同意 refuse拒绝 reject驳回 revoke取消
+const userInfo = useUserStore()
+
+// ---------------表单提交--------------------------------
+// 表单对象
+const dataFormRef = ref<FormInstance>()
+// 校验规则
+const rules: FormRules = reactive({
+  comments: [{ required: true, message: '审批结论必填', trigger: ['blur', 'change'] }],
+  userList: [{ required: true, message: '节点审批人必选', trigger: ['blur', 'change'] }],
+})
+/**
+ * 初始化审批弹窗
+ * @param type 审批类型
+ * @param taskId 任务id
+ * @param id 列表id
+ */
+function initDialog(type: string, taskId: string, id?: string, processId?: string) {
+  console.log('流程实例id--processId', processId)
+  if (type === 'agree') { // 同意的时候判断是否显示选择下一个节点审批人
+    isShowUser.value = true
+    getApprovalRecord(processId!)
+  }
+
+  formData.type = type
+  formData.taskId = taskId
+  formData.user = userInfo.name
+  formData.approvalTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  formData.userList = []
+  formData.processId = processId!
+  formData.comments = ''
+  formData.id = id!
+  dialogVisible.value = true
+}
+// 提交表单
+function submitForm() {
+  if (dataFormRef) {
+    dataFormRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        if (formData.userList.includes(userInfo.id)) {
+          ElMessage.warning('下一节点审批人不能含有当前用户')
+          return
+        }
+        btnLoading.value = true
+        if (formData.type === 'agree') {
+          const agree = () => {
+            submitApproval(formData.type, { taskId: formData.taskId, comments: formData.comments }).then((res) => {
+              ElMessage.success('审批完成')
+              btnLoading.value = false
+              dialogVisible.value = false
+              emit('onSuccess')
+            }).catch((_) => {
+              btnLoading.value = false
+            })
+          }
+
+          if (isShowUser.value) {
+            addApprovalUser({
+              assignees: formData.userList,
+              processInstanceId: formData.processId,
+            }).then(() => {
+              agree()
+            })
+          }
+          else {
+            agree()
+          }
+        }
+        else if (formData.type === 'reject') {
+          dialogVisible.value = false
+          btnLoading.value = false
+          emit('reject', formData.comments, formData.taskId, formData.id)
+        }
+        else if (formData.type === 'refuse') {
+          dialogVisible.value = false
+          btnLoading.value = false
+          emit('refuse', formData.comments, formData.taskId, formData.id)
+        }
+      }
+    })
+  }
+}
+// 关闭弹窗
+function handleClose() {
+  dialogVisible.value = false
+}
+
+// 获取审批记录 根据当前节点判断显示 审批人选择
+function getApprovalRecord(processId: string) {
+  fetchApproval(processId).then((res) => {
+    console.log(res.data, 'res')
+    if (res.data.length) {
+      const data = res.data[res.data.length - 1]
+      if (data.length) {
+        console.log('最后一个审批人名字', data[data.length - 1].taskName)
+        console.log('config文件里面定义的最后一个审批人的名字', props.lastName)
+        console.log('是否显示选择下一个节点审批人表单', !(data[data.length - 1].taskName === props.lastName))
+        if (data[data.length - 1].taskName === props.lastName) {
+          isShowUser.value = false
+        }
+      }
+    }
+  })
+}
+
+// 获取审批人
+const userList = ref<any[]>([])
+const fetchDict = () => {
+  // getUserList({ offset: 1, limit: 99999 }).then((res) => {
+  //   userList.value = res.data.rows
+  // })
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+}
+fetchDict()
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <div class="approval-dialog">
+    <el-dialog
+      v-model="dialogVisible"
+      title="审批操作"
+      width="700"
+      :before-close="handleClose"
+    >
+      <el-form
+        ref="dataFormRef"
+        label-position="left"
+        label-width="140px"
+        :model="formData"
+        :rules="rules"
+      >
+        <el-row :gutter="24">
+          <el-col :span="24">
+            <el-form-item label="审批意见:">
+              <el-radio-group v-model="formData.type" disabled>
+                <el-radio label="agree" size="large">
+                  同意
+                </el-radio>
+                <el-radio label="reject" size="large">
+                  驳回
+                </el-radio>
+                <el-radio label="refuse" size="large">
+                  拒绝
+                </el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="24">
+            <el-form-item label="审批结论:" prop="comments">
+              <el-input
+                v-model="formData.comments"
+                :rows="4"
+                show-word-limit
+                type="textarea"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row v-if="isShowUser && formData.type === 'agree'" :gutter="24">
+          <el-col :span="24">
+            <el-form-item label="下一节点审批人:" prop="userList">
+              <el-select v-model="formData.userList" filterable multiple placeholder="审批人" style="width: 100%;">
+                <el-option v-for="(item) in userList" :key="item.id" :label="item.name" :value="item.id">
+                  <span style="float: left;">{{ item.name }}</span>
+                  <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.deptName }}</span>
+                </el-option>
+              </el-select>
+              <div v-if="props.approvalModule === 'fileApproval'" style="color: red;font-size: 11px;">
+                <span v-if="isShowUser">***注意：《作业指导书》请选择专业组长审核；程序文件、质量手册等选择质量负责人审核***</span>
+                <span v-if="!isShowUser">***注意：《作业指导书》请选择技术负责人；程序文件、质量手册等选择主任审核***</span>
+              </div>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="12">
+            <el-form-item label="审批人:">
+              <el-input
+                v-model="formData.user"
+                placeholder="审批人"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="审批时间:">
+              <el-input
+                v-model="formData.approvalTime"
+                style="width: 100%;"
+                placeholder="审批时间"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <template #footer>
+        <el-button type="primary" :loading="btnLoading" @click="submitForm">
+          提交
+        </el-button>
+        <el-button type="info" @click="handleClose">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<style lang="scss">
+.approval-dialog {
+  .el-radio__label {
+    display: block !important;
+  }
+}
+</style>

diff --git a/public/config/customApproval.json b/public/config/customApproval.json
new file mode 100644
index 0000000..f791343
--- /dev/null
+++ b/public/config/customApproval.json
@@ -0,0 +1,7 @@
+{
+  "approvalLastName--Describe": "审批流程最后一个节点的名字，用来判断审批自选的时候是否是最后一个节点",
+  "approvalLastName": {
+    "measureData--Describe": "计量数据管理",
+    "measureData": "审批人"
+  }
+}
diff --git a/src/api/system/process.ts b/src/api/system/process.ts
index c2d4419..6bef77b 100644
--- a/src/api/system/process.ts
+++ b/src/api/system/process.ts
@@ -121,3 +121,11 @@
     data,
   })
 }
+// 动态添加审批人
+export function addApprovalUser(data: object) {
+  return request({
+    url: '/approval/operate/addTaskApprover',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components.d.ts b/src/components.d.ts
index 6cd708a..fde4221 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -13,6 +13,8 @@
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
     ApprovalDialogByProcess: typeof import('./components/Approval/ApprovalDialogByProcess.vue')['default']
+    ApprovalDialogCustom: typeof import('./components/Approval/ApprovalDialogCustom.vue')['default']
+    'ApprovalDialogCustom copy': typeof import('./components/Approval/ApprovalDialogCustom copy.vue')['default']
     ApprovalRecord: typeof import('./components/ApprovalRecord/ApprovalRecord.vue')['default']
     ApprovalRecordTable: typeof import('./components/ApprovalRecord/ApprovalRecordTable.vue')['default']
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
@@ -27,6 +29,7 @@
     CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default']
     CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
+    copy: typeof import('./components/Approval/ApprovalDialogCustom copy.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
@@ -64,6 +67,7 @@
     SearchArea: typeof import('./components/SearchArea/index.vue')['default']
     SearchBar: typeof import('./components/SearchBar/index.vue')['default']
     SearchItem: typeof import('./components/SearchArea/SearchItem.vue')['default']
+    SelectApproverDialog: typeof import('./components/Approval/selectApproverDialog.vue')['default']
     SelectEmployeesDialog: typeof import('./components/dialog/selectEmployeesDialog.vue')['default']
     SelectRoleDialog: typeof import('./components/dialog/selectRoleDialog.vue')['default']
     SelectStaffDialog: typeof import('./components/dialog/selectStaffDialog.vue')['default']
diff --git a/src/components/Approval/ApprovalDialogCustom copy.vue b/src/components/Approval/ApprovalDialogCustom copy.vue
new file mode 100644
index 0000000..d2f3dac
--- /dev/null
+++ b/src/components/Approval/ApprovalDialogCustom copy.vue
@@ -0,0 +1,274 @@
+<!-- 审批弹窗-审批人自选使用 -->
+<script lang="ts" setup name="ApprovalDialogCustom">
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
+import { fetchApproval, submitApproval } from '@/api/approval'
+import { getUserList } from '@/api/system/user'
+import { addApprovalUser } from '@/api/system/process'
+/**
+ * 审批弹窗
+ */
+const props = defineProps({
+  /**
+   * 提示文字
+   */
+  title: {
+    type: String,
+    default: '审批操作',
+  },
+  // 流程最后一个节点的名字
+  lastName: {
+    type: String,
+    required: true,
+  },
+  approvalModule: { // 审批的菜单模块
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['onSuccess', 'refuse', 'reject'])
+// 弹窗显示状态
+const dialogVisible = ref(false)
+// 默认表单
+const defaultFormData = {
+  type: '', // 审批类型
+  taskId: '', // 任务id
+  comments: '', // 备注
+  user: '', // 当前用户
+  approvalTime: '', // 当前时间
+  id: '',
+  userList: [] as any,
+  processId: '',
+}
+// 弹窗类型 agree同意 refuse拒绝 reject驳回 revoke取消
+const type = ref('agree')
+// 表单数据对象
+const formData = reactive({ ...defaultFormData })
+// 是否展示 下一节点审批节点 审批人
+const isShowUser = ref(false)
+// 保存按钮加载状态
+const btnLoading = ref(false)
+
+// agree同意 refuse拒绝 reject驳回 revoke取消
+const userInfo = useUserStore()
+
+// ---------------表单提交--------------------------------
+// 表单对象
+const dataFormRef = ref<FormInstance>()
+// 校验规则
+const rules: FormRules = reactive({
+  comments: [{ required: true, message: '审批结论必填', trigger: ['blur', 'change'] }],
+  userList: [{ required: true, message: '节点审批人必选', trigger: ['blur', 'change'] }],
+})
+/**
+ * 初始化审批弹窗
+ * @param type 审批类型
+ * @param taskId 任务id
+ * @param id 列表id
+ */
+function initDialog(type: string, taskId: string, id?: string, processId?: string) {
+  console.log('流程实例id--processId', processId)
+  if (type === 'agree') { // 同意的时候判断是否显示选择下一个节点审批人
+    isShowUser.value = true
+    getApprovalRecord(processId!)
+  }
+
+  formData.type = type
+  formData.taskId = taskId
+  formData.user = userInfo.name
+  formData.approvalTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  formData.userList = []
+  formData.processId = processId!
+  formData.comments = ''
+  formData.id = id!
+  dialogVisible.value = true
+}
+// 提交表单
+function submitForm() {
+  if (dataFormRef) {
+    dataFormRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        if (formData.userList.includes(userInfo.id)) {
+          ElMessage.warning('下一节点审批人不能含有当前用户')
+          return
+        }
+        btnLoading.value = true
+        if (formData.type === 'agree') {
+          const agree = () => {
+            submitApproval(formData.type, { taskId: formData.taskId, comments: formData.comments }).then((res) => {
+              ElMessage.success('审批完成')
+              btnLoading.value = false
+              dialogVisible.value = false
+              emit('onSuccess')
+            }).catch((_) => {
+              btnLoading.value = false
+            })
+          }
+
+          if (isShowUser.value) {
+            addApprovalUser({
+              assignees: formData.userList,
+              processInstanceId: formData.processId,
+            }).then(() => {
+              agree()
+            })
+          }
+          else {
+            agree()
+          }
+        }
+        else if (formData.type === 'reject') {
+          dialogVisible.value = false
+          btnLoading.value = false
+          emit('reject', formData.comments, formData.taskId, formData.id)
+        }
+        else if (formData.type === 'refuse') {
+          dialogVisible.value = false
+          btnLoading.value = false
+          emit('refuse', formData.comments, formData.taskId, formData.id)
+        }
+      }
+    })
+  }
+}
+// 关闭弹窗
+function handleClose() {
+  dialogVisible.value = false
+}
+
+// 获取审批记录 根据当前节点判断显示 审批人选择
+function getApprovalRecord(processId: string) {
+  fetchApproval(processId).then((res) => {
+    console.log(res.data, 'res')
+    if (res.data.length) {
+      const data = res.data[res.data.length - 1]
+      if (data.length) {
+        console.log('最后一个审批人名字', data[data.length - 1].taskName)
+        console.log('config文件里面定义的最后一个审批人的名字', props.lastName)
+        console.log('是否显示选择下一个节点审批人表单', !(data[data.length - 1].taskName === props.lastName))
+        if (data[data.length - 1].taskName === props.lastName) {
+          isShowUser.value = false
+        }
+      }
+    }
+  })
+}
+
+// 获取审批人
+const userList = ref<any[]>([])
+const fetchDict = () => {
+  // getUserList({ offset: 1, limit: 99999 }).then((res) => {
+  //   userList.value = res.data.rows
+  // })
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+}
+fetchDict()
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <div class="approval-dialog">
+    <el-dialog
+      v-model="dialogVisible"
+      title="审批操作"
+      width="700"
+      :before-close="handleClose"
+    >
+      <el-form
+        ref="dataFormRef"
+        label-position="left"
+        label-width="140px"
+        :model="formData"
+        :rules="rules"
+      >
+        <el-row :gutter="24">
+          <el-col :span="24">
+            <el-form-item label="审批意见:">
+              <el-radio-group v-model="formData.type" disabled>
+                <el-radio label="agree" size="large">
+                  同意
+                </el-radio>
+                <el-radio label="reject" size="large">
+                  驳回
+                </el-radio>
+                <el-radio label="refuse" size="large">
+                  拒绝
+                </el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="24">
+            <el-form-item label="审批结论:" prop="comments">
+              <el-input
+                v-model="formData.comments"
+                :rows="4"
+                show-word-limit
+                type="textarea"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row v-if="isShowUser && formData.type === 'agree'" :gutter="24">
+          <el-col :span="24">
+            <el-form-item label="下一节点审批人:" prop="userList">
+              <el-select v-model="formData.userList" filterable multiple placeholder="审批人" style="width: 100%;">
+                <el-option v-for="(item) in userList" :key="item.id" :label="item.name" :value="item.id">
+                  <span style="float: left;">{{ item.name }}</span>
+                  <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.deptName }}</span>
+                </el-option>
+              </el-select>
+              <div v-if="props.approvalModule === 'fileApproval'" style="color: red;font-size: 11px;">
+                <span v-if="isShowUser">***注意：《作业指导书》请选择专业组长审核；程序文件、质量手册等选择质量负责人审核***</span>
+                <span v-if="!isShowUser">***注意：《作业指导书》请选择技术负责人；程序文件、质量手册等选择主任审核***</span>
+              </div>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="12">
+            <el-form-item label="审批人:">
+              <el-input
+                v-model="formData.user"
+                placeholder="审批人"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="审批时间:">
+              <el-input
+                v-model="formData.approvalTime"
+                style="width: 100%;"
+                placeholder="审批时间"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <template #footer>
+        <el-button type="primary" :loading="btnLoading" @click="submitForm">
+          提交
+        </el-button>
+        <el-button type="info" @click="handleClose">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<style lang="scss">
+.approval-dialog {
+  .el-radio__label {
+    display: block !important;
+  }
+}
+</style>
diff --git a/src/components/Approval/ApprovalDialogCustom.vue b/src/components/Approval/ApprovalDialogCustom.vue
new file mode 100644
index 0000000..0bda369
--- /dev/null
+++ b/src/components/Approval/ApprovalDialogCustom.vue
@@ -0,0 +1,308 @@
+<script lang="ts" setup name="ApprovalDialog">
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
+import { fetchApproval, submitApproval } from '@/api/approval'
+import { changeWorkbenchApproveStatus } from '@/api/workbench/workbench'
+import { getUserList } from '@/api/system/user'
+import { addApprovalUser } from '@/api/system/process'
+import { certificatePrintByProcess } from '@/api/business/lab/cert'
+/**
+ * 审批弹窗
+ */
+const props = defineProps({
+  /**
+   * 提示文字
+   */
+  title: {
+    type: String,
+    default: '审批操作',
+  },
+  // 流程最后一个节点的名字
+  lastName: {
+    type: String,
+    required: true,
+  },
+})
+const emit = defineEmits(['onSuccess'])
+// 弹窗显示状态
+const dialogVisible = ref(false)
+// 是否展示 下一节点审批节点 审批人
+const isShowUser = ref(false)
+// 默认表单
+const defaultFormData = {
+  type: '', // 审批类型
+  taskId: '', // 任务id
+  comments: '', // 备注
+  user: '', // 当前用户
+  approvalTime: '', // 当前时间
+  userList: [] as any,
+  processId: '',
+}
+// 弹窗类型 agree同意 refuse拒绝 reject驳回 revoke取消
+const type = ref('agree')
+// 表单数据对象
+const formData = reactive({ ...defaultFormData })
+
+// 保存按钮加载状态
+const btnLoading = ref(false)
+
+// agree同意 refuse拒绝 reject驳回 revoke取消
+const userInfo = useUserStore()
+const decisionItem = ref('')
+
+// ---------------表单提交--------------------------------
+// 表单对象
+const dataFormRef = ref<FormInstance>()
+// 校验规则
+const rules: FormRules = reactive({
+  comments: [{ required: true, message: '审批结论必填', trigger: ['blur', 'change'] }],
+  userList: [{ required: true, message: '节点审批人必选', trigger: ['blur', 'change'] }],
+})
+const dataId = ref()
+/**
+ * 初始化审批弹窗
+ * @param type 审批类型
+ * @param taskId 任务id
+ */
+function initDialog(type: string, taskId: string, id: string, decisionItemParam = '1', processId?: string) {
+  console.log('流程实例id--processId', processId)
+  if (type === 'agree') { // 同意的时候判断是否显示选择下一个节点审批人
+    isShowUser.value = true
+    getApprovalRecord(processId!)
+  }
+  dataId.value = id
+  decisionItem.value = `${decisionItemParam}`
+  formData.type = type
+  formData.taskId = taskId
+  formData.user = userInfo.name
+  formData.userList = []
+  formData.approvalTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  formData.comments = ''
+  formData.processId = processId!
+  dialogVisible.value = true
+}
+// 提交表单
+function submitForm() {
+  if (dataFormRef) {
+    dataFormRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        if (formData.userList.includes(userInfo.id)) {
+          ElMessage.warning('下一节点审批人不能含有当前用户')
+          return
+        }
+        btnLoading.value = true
+        const handleApproval = () => {
+          submitApproval(formData.type, { taskId: formData.taskId, comments: formData.comments }).then((res) => {
+            ElMessage.success('审批完成')
+            btnLoading.value = false
+            dialogVisible.value = false
+            emit('onSuccess')
+          }).catch((_) => {
+            btnLoading.value = false
+          })
+        }
+        if (formData.type === 'agree') {
+          if (isShowUser.value) {
+            addApprovalUser({
+              assignees: formData.userList,
+              processInstanceId: formData.processId,
+            }).then(() => {
+              handleApproval()
+            })
+          }
+          else {
+            handleApproval()
+          }
+          certificatePrintByProcess(dataId.value)
+          // .then(() => {
+          //   // ElMessage.success('审批完成')
+          //   btnLoading.value = false
+          //   dialogVisible.value = false
+          //   emit('onSuccess')
+          // })
+        }
+        else {
+          handleApproval()
+        }
+        // 改变总工作台审批提醒的已处理状态
+        if (sessionStorage.getItem('workbenchApproveParams')) {
+          const row = JSON.parse(sessionStorage.getItem('workbenchApproveParams')!)
+          changeWorkbenchApproveStatus({
+            id: row.id,
+            status: 1,
+            businessId: row.businessId,
+            decisionItem: Number(row.decisionItem),
+            formId: row.formId,
+            processId: row.processId,
+            taskId: row.taskId,
+          })
+        }
+        // if (formData.type) {
+        //   submitApproval(formData.type, { taskId: formData.taskId, comments: formData.comments }).then((res) => {
+        //     if (formData.type === 'agree') {
+        //       certificatePrintByProcess(dataId.value).then(() => {
+        //         ElMessage.success('审批完成')
+        //         btnLoading.value = false
+        //         dialogVisible.value = false
+        //         emit('onSuccess')
+        //       })
+        //     }
+        //     else {
+        //       ElMessage.success('审批完成')
+        //       btnLoading.value = false
+        //       dialogVisible.value = false
+        //       emit('onSuccess')
+        //     }
+
+        //     // 改变总工作台审批提醒的已处理状态
+        //     if (sessionStorage.getItem('workbenchApproveParams')) {
+        //       const row = JSON.parse(sessionStorage.getItem('workbenchApproveParams')!)
+        //       changeWorkbenchApproveStatus({
+        //         id: row.id,
+        //         status: 1,
+        //         businessId: row.businessId,
+        //         decisionItem: Number(row.decisionItem),
+        //         formId: row.formId,
+        //         processId: row.processId,
+        //         taskId: row.taskId,
+        //       })
+        //     }
+        //   }).catch((_) => {
+        //     btnLoading.value = false
+        //   })
+        // }
+      }
+    })
+  }
+}
+// 关闭弹窗
+function handleClose() {
+  dialogVisible.value = false
+}
+// 获取审批记录 根据当前节点判断显示 审批人选择
+function getApprovalRecord(processId: string) {
+  fetchApproval(processId).then((res) => {
+    console.log(res.data, 'res')
+    if (res.data.length) {
+      const data = res.data[res.data.length - 1]
+      if (data.length) {
+        console.log('最后一个审批人名字', data[data.length - 1].taskName)
+        console.log('config文件里面定义的最后一个审批人的名字', props.lastName)
+        console.log('是否显示选择下一个节点审批人表单', !(data[data.length - 1].taskName === props.lastName))
+        if (data[data.length - 1].taskName === props.lastName) {
+          isShowUser.value = false
+        }
+      }
+    }
+  })
+}
+
+// 获取审批人
+const userList = ref<any[]>([])
+const fetchDict = () => {
+  // getUserList({ offset: 1, limit: 99999 }).then((res) => {
+  //   userList.value = res.data.rows
+  // })
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+}
+fetchDict()
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    title="审批操作"
+    width="700"
+    :before-close="handleClose"
+  >
+    <el-form
+      ref="dataFormRef"
+      v-loading="btnLoading"
+      label-position="left"
+      label-width="130px"
+      :model="formData"
+      :rules="rules"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见:">
+            <el-radio-group v-model="formData.type" disabled>
+              <el-radio label="agree" size="large">
+                同意
+              </el-radio>
+              <el-radio v-if="decisionItem !== '3'" label="reject" size="large">
+                驳回
+              </el-radio>
+              <el-radio v-if="decisionItem !== '2'" label="refuse" size="large">
+                拒绝
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论:" prop="comments">
+            <el-input
+              v-model="formData.comments"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="isShowUser && formData.type === 'agree'" :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="下一节点审批人:" prop="userList">
+            <el-select v-model="formData.userList" filterable multiple placeholder="审批人" style="width: 100%;">
+              <el-option v-for="(item) in userList" :key="item.id" :label="item.name" :value="item.id">
+                <span style="float: left;">{{ item.name }}</span>
+                <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.deptName }}</span>
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人:">
+            <el-input
+              v-model="formData.user"
+              placeholder="审批人"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间:">
+            <el-input
+              v-model="formData.approvalTime"
+              style="width: 100%;"
+              placeholder="审批时间"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <el-button type="primary" :loading="btnLoading" @click="submitForm">
+        提交
+      </el-button>
+      <el-button type="info" @click="handleClose">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>

diff --git a/public/config/customApproval.json b/public/config/customApproval.json
new file mode 100644
index 0000000..f791343
--- /dev/null
+++ b/public/config/customApproval.json
@@ -0,0 +1,7 @@
+{
+  "approvalLastName--Describe": "审批流程最后一个节点的名字，用来判断审批自选的时候是否是最后一个节点",
+  "approvalLastName": {
+    "measureData--Describe": "计量数据管理",
+    "measureData": "审批人"
+  }
+}
diff --git a/src/api/system/process.ts b/src/api/system/process.ts
index c2d4419..6bef77b 100644
--- a/src/api/system/process.ts
+++ b/src/api/system/process.ts
@@ -121,3 +121,11 @@
     data,
   })
 }
+// 动态添加审批人
+export function addApprovalUser(data: object) {
+  return request({
+    url: '/approval/operate/addTaskApprover',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components.d.ts b/src/components.d.ts
index 6cd708a..fde4221 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -13,6 +13,8 @@
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
     ApprovalDialogByProcess: typeof import('./components/Approval/ApprovalDialogByProcess.vue')['default']
+    ApprovalDialogCustom: typeof import('./components/Approval/ApprovalDialogCustom.vue')['default']
+    'ApprovalDialogCustom copy': typeof import('./components/Approval/ApprovalDialogCustom copy.vue')['default']
     ApprovalRecord: typeof import('./components/ApprovalRecord/ApprovalRecord.vue')['default']
     ApprovalRecordTable: typeof import('./components/ApprovalRecord/ApprovalRecordTable.vue')['default']
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
@@ -27,6 +29,7 @@
     CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default']
     CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
+    copy: typeof import('./components/Approval/ApprovalDialogCustom copy.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
@@ -64,6 +67,7 @@
     SearchArea: typeof import('./components/SearchArea/index.vue')['default']
     SearchBar: typeof import('./components/SearchBar/index.vue')['default']
     SearchItem: typeof import('./components/SearchArea/SearchItem.vue')['default']
+    SelectApproverDialog: typeof import('./components/Approval/selectApproverDialog.vue')['default']
     SelectEmployeesDialog: typeof import('./components/dialog/selectEmployeesDialog.vue')['default']
     SelectRoleDialog: typeof import('./components/dialog/selectRoleDialog.vue')['default']
     SelectStaffDialog: typeof import('./components/dialog/selectStaffDialog.vue')['default']
diff --git a/src/components/Approval/ApprovalDialogCustom copy.vue b/src/components/Approval/ApprovalDialogCustom copy.vue
new file mode 100644
index 0000000..d2f3dac
--- /dev/null
+++ b/src/components/Approval/ApprovalDialogCustom copy.vue
@@ -0,0 +1,274 @@
+<!-- 审批弹窗-审批人自选使用 -->
+<script lang="ts" setup name="ApprovalDialogCustom">
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
+import { fetchApproval, submitApproval } from '@/api/approval'
+import { getUserList } from '@/api/system/user'
+import { addApprovalUser } from '@/api/system/process'
+/**
+ * 审批弹窗
+ */
+const props = defineProps({
+  /**
+   * 提示文字
+   */
+  title: {
+    type: String,
+    default: '审批操作',
+  },
+  // 流程最后一个节点的名字
+  lastName: {
+    type: String,
+    required: true,
+  },
+  approvalModule: { // 审批的菜单模块
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['onSuccess', 'refuse', 'reject'])
+// 弹窗显示状态
+const dialogVisible = ref(false)
+// 默认表单
+const defaultFormData = {
+  type: '', // 审批类型
+  taskId: '', // 任务id
+  comments: '', // 备注
+  user: '', // 当前用户
+  approvalTime: '', // 当前时间
+  id: '',
+  userList: [] as any,
+  processId: '',
+}
+// 弹窗类型 agree同意 refuse拒绝 reject驳回 revoke取消
+const type = ref('agree')
+// 表单数据对象
+const formData = reactive({ ...defaultFormData })
+// 是否展示 下一节点审批节点 审批人
+const isShowUser = ref(false)
+// 保存按钮加载状态
+const btnLoading = ref(false)
+
+// agree同意 refuse拒绝 reject驳回 revoke取消
+const userInfo = useUserStore()
+
+// ---------------表单提交--------------------------------
+// 表单对象
+const dataFormRef = ref<FormInstance>()
+// 校验规则
+const rules: FormRules = reactive({
+  comments: [{ required: true, message: '审批结论必填', trigger: ['blur', 'change'] }],
+  userList: [{ required: true, message: '节点审批人必选', trigger: ['blur', 'change'] }],
+})
+/**
+ * 初始化审批弹窗
+ * @param type 审批类型
+ * @param taskId 任务id
+ * @param id 列表id
+ */
+function initDialog(type: string, taskId: string, id?: string, processId?: string) {
+  console.log('流程实例id--processId', processId)
+  if (type === 'agree') { // 同意的时候判断是否显示选择下一个节点审批人
+    isShowUser.value = true
+    getApprovalRecord(processId!)
+  }
+
+  formData.type = type
+  formData.taskId = taskId
+  formData.user = userInfo.name
+  formData.approvalTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  formData.userList = []
+  formData.processId = processId!
+  formData.comments = ''
+  formData.id = id!
+  dialogVisible.value = true
+}
+// 提交表单
+function submitForm() {
+  if (dataFormRef) {
+    dataFormRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        if (formData.userList.includes(userInfo.id)) {
+          ElMessage.warning('下一节点审批人不能含有当前用户')
+          return
+        }
+        btnLoading.value = true
+        if (formData.type === 'agree') {
+          const agree = () => {
+            submitApproval(formData.type, { taskId: formData.taskId, comments: formData.comments }).then((res) => {
+              ElMessage.success('审批完成')
+              btnLoading.value = false
+              dialogVisible.value = false
+              emit('onSuccess')
+            }).catch((_) => {
+              btnLoading.value = false
+            })
+          }
+
+          if (isShowUser.value) {
+            addApprovalUser({
+              assignees: formData.userList,
+              processInstanceId: formData.processId,
+            }).then(() => {
+              agree()
+            })
+          }
+          else {
+            agree()
+          }
+        }
+        else if (formData.type === 'reject') {
+          dialogVisible.value = false
+          btnLoading.value = false
+          emit('reject', formData.comments, formData.taskId, formData.id)
+        }
+        else if (formData.type === 'refuse') {
+          dialogVisible.value = false
+          btnLoading.value = false
+          emit('refuse', formData.comments, formData.taskId, formData.id)
+        }
+      }
+    })
+  }
+}
+// 关闭弹窗
+function handleClose() {
+  dialogVisible.value = false
+}
+
+// 获取审批记录 根据当前节点判断显示 审批人选择
+function getApprovalRecord(processId: string) {
+  fetchApproval(processId).then((res) => {
+    console.log(res.data, 'res')
+    if (res.data.length) {
+      const data = res.data[res.data.length - 1]
+      if (data.length) {
+        console.log('最后一个审批人名字', data[data.length - 1].taskName)
+        console.log('config文件里面定义的最后一个审批人的名字', props.lastName)
+        console.log('是否显示选择下一个节点审批人表单', !(data[data.length - 1].taskName === props.lastName))
+        if (data[data.length - 1].taskName === props.lastName) {
+          isShowUser.value = false
+        }
+      }
+    }
+  })
+}
+
+// 获取审批人
+const userList = ref<any[]>([])
+const fetchDict = () => {
+  // getUserList({ offset: 1, limit: 99999 }).then((res) => {
+  //   userList.value = res.data.rows
+  // })
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+}
+fetchDict()
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <div class="approval-dialog">
+    <el-dialog
+      v-model="dialogVisible"
+      title="审批操作"
+      width="700"
+      :before-close="handleClose"
+    >
+      <el-form
+        ref="dataFormRef"
+        label-position="left"
+        label-width="140px"
+        :model="formData"
+        :rules="rules"
+      >
+        <el-row :gutter="24">
+          <el-col :span="24">
+            <el-form-item label="审批意见:">
+              <el-radio-group v-model="formData.type" disabled>
+                <el-radio label="agree" size="large">
+                  同意
+                </el-radio>
+                <el-radio label="reject" size="large">
+                  驳回
+                </el-radio>
+                <el-radio label="refuse" size="large">
+                  拒绝
+                </el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="24">
+            <el-form-item label="审批结论:" prop="comments">
+              <el-input
+                v-model="formData.comments"
+                :rows="4"
+                show-word-limit
+                type="textarea"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row v-if="isShowUser && formData.type === 'agree'" :gutter="24">
+          <el-col :span="24">
+            <el-form-item label="下一节点审批人:" prop="userList">
+              <el-select v-model="formData.userList" filterable multiple placeholder="审批人" style="width: 100%;">
+                <el-option v-for="(item) in userList" :key="item.id" :label="item.name" :value="item.id">
+                  <span style="float: left;">{{ item.name }}</span>
+                  <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.deptName }}</span>
+                </el-option>
+              </el-select>
+              <div v-if="props.approvalModule === 'fileApproval'" style="color: red;font-size: 11px;">
+                <span v-if="isShowUser">***注意：《作业指导书》请选择专业组长审核；程序文件、质量手册等选择质量负责人审核***</span>
+                <span v-if="!isShowUser">***注意：《作业指导书》请选择技术负责人；程序文件、质量手册等选择主任审核***</span>
+              </div>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="12">
+            <el-form-item label="审批人:">
+              <el-input
+                v-model="formData.user"
+                placeholder="审批人"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="审批时间:">
+              <el-input
+                v-model="formData.approvalTime"
+                style="width: 100%;"
+                placeholder="审批时间"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <template #footer>
+        <el-button type="primary" :loading="btnLoading" @click="submitForm">
+          提交
+        </el-button>
+        <el-button type="info" @click="handleClose">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<style lang="scss">
+.approval-dialog {
+  .el-radio__label {
+    display: block !important;
+  }
+}
+</style>
diff --git a/src/components/Approval/ApprovalDialogCustom.vue b/src/components/Approval/ApprovalDialogCustom.vue
new file mode 100644
index 0000000..0bda369
--- /dev/null
+++ b/src/components/Approval/ApprovalDialogCustom.vue
@@ -0,0 +1,308 @@
+<script lang="ts" setup name="ApprovalDialog">
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
+import { fetchApproval, submitApproval } from '@/api/approval'
+import { changeWorkbenchApproveStatus } from '@/api/workbench/workbench'
+import { getUserList } from '@/api/system/user'
+import { addApprovalUser } from '@/api/system/process'
+import { certificatePrintByProcess } from '@/api/business/lab/cert'
+/**
+ * 审批弹窗
+ */
+const props = defineProps({
+  /**
+   * 提示文字
+   */
+  title: {
+    type: String,
+    default: '审批操作',
+  },
+  // 流程最后一个节点的名字
+  lastName: {
+    type: String,
+    required: true,
+  },
+})
+const emit = defineEmits(['onSuccess'])
+// 弹窗显示状态
+const dialogVisible = ref(false)
+// 是否展示 下一节点审批节点 审批人
+const isShowUser = ref(false)
+// 默认表单
+const defaultFormData = {
+  type: '', // 审批类型
+  taskId: '', // 任务id
+  comments: '', // 备注
+  user: '', // 当前用户
+  approvalTime: '', // 当前时间
+  userList: [] as any,
+  processId: '',
+}
+// 弹窗类型 agree同意 refuse拒绝 reject驳回 revoke取消
+const type = ref('agree')
+// 表单数据对象
+const formData = reactive({ ...defaultFormData })
+
+// 保存按钮加载状态
+const btnLoading = ref(false)
+
+// agree同意 refuse拒绝 reject驳回 revoke取消
+const userInfo = useUserStore()
+const decisionItem = ref('')
+
+// ---------------表单提交--------------------------------
+// 表单对象
+const dataFormRef = ref<FormInstance>()
+// 校验规则
+const rules: FormRules = reactive({
+  comments: [{ required: true, message: '审批结论必填', trigger: ['blur', 'change'] }],
+  userList: [{ required: true, message: '节点审批人必选', trigger: ['blur', 'change'] }],
+})
+const dataId = ref()
+/**
+ * 初始化审批弹窗
+ * @param type 审批类型
+ * @param taskId 任务id
+ */
+function initDialog(type: string, taskId: string, id: string, decisionItemParam = '1', processId?: string) {
+  console.log('流程实例id--processId', processId)
+  if (type === 'agree') { // 同意的时候判断是否显示选择下一个节点审批人
+    isShowUser.value = true
+    getApprovalRecord(processId!)
+  }
+  dataId.value = id
+  decisionItem.value = `${decisionItemParam}`
+  formData.type = type
+  formData.taskId = taskId
+  formData.user = userInfo.name
+  formData.userList = []
+  formData.approvalTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  formData.comments = ''
+  formData.processId = processId!
+  dialogVisible.value = true
+}
+// 提交表单
+function submitForm() {
+  if (dataFormRef) {
+    dataFormRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        if (formData.userList.includes(userInfo.id)) {
+          ElMessage.warning('下一节点审批人不能含有当前用户')
+          return
+        }
+        btnLoading.value = true
+        const handleApproval = () => {
+          submitApproval(formData.type, { taskId: formData.taskId, comments: formData.comments }).then((res) => {
+            ElMessage.success('审批完成')
+            btnLoading.value = false
+            dialogVisible.value = false
+            emit('onSuccess')
+          }).catch((_) => {
+            btnLoading.value = false
+          })
+        }
+        if (formData.type === 'agree') {
+          if (isShowUser.value) {
+            addApprovalUser({
+              assignees: formData.userList,
+              processInstanceId: formData.processId,
+            }).then(() => {
+              handleApproval()
+            })
+          }
+          else {
+            handleApproval()
+          }
+          certificatePrintByProcess(dataId.value)
+          // .then(() => {
+          //   // ElMessage.success('审批完成')
+          //   btnLoading.value = false
+          //   dialogVisible.value = false
+          //   emit('onSuccess')
+          // })
+        }
+        else {
+          handleApproval()
+        }
+        // 改变总工作台审批提醒的已处理状态
+        if (sessionStorage.getItem('workbenchApproveParams')) {
+          const row = JSON.parse(sessionStorage.getItem('workbenchApproveParams')!)
+          changeWorkbenchApproveStatus({
+            id: row.id,
+            status: 1,
+            businessId: row.businessId,
+            decisionItem: Number(row.decisionItem),
+            formId: row.formId,
+            processId: row.processId,
+            taskId: row.taskId,
+          })
+        }
+        // if (formData.type) {
+        //   submitApproval(formData.type, { taskId: formData.taskId, comments: formData.comments }).then((res) => {
+        //     if (formData.type === 'agree') {
+        //       certificatePrintByProcess(dataId.value).then(() => {
+        //         ElMessage.success('审批完成')
+        //         btnLoading.value = false
+        //         dialogVisible.value = false
+        //         emit('onSuccess')
+        //       })
+        //     }
+        //     else {
+        //       ElMessage.success('审批完成')
+        //       btnLoading.value = false
+        //       dialogVisible.value = false
+        //       emit('onSuccess')
+        //     }
+
+        //     // 改变总工作台审批提醒的已处理状态
+        //     if (sessionStorage.getItem('workbenchApproveParams')) {
+        //       const row = JSON.parse(sessionStorage.getItem('workbenchApproveParams')!)
+        //       changeWorkbenchApproveStatus({
+        //         id: row.id,
+        //         status: 1,
+        //         businessId: row.businessId,
+        //         decisionItem: Number(row.decisionItem),
+        //         formId: row.formId,
+        //         processId: row.processId,
+        //         taskId: row.taskId,
+        //       })
+        //     }
+        //   }).catch((_) => {
+        //     btnLoading.value = false
+        //   })
+        // }
+      }
+    })
+  }
+}
+// 关闭弹窗
+function handleClose() {
+  dialogVisible.value = false
+}
+// 获取审批记录 根据当前节点判断显示 审批人选择
+function getApprovalRecord(processId: string) {
+  fetchApproval(processId).then((res) => {
+    console.log(res.data, 'res')
+    if (res.data.length) {
+      const data = res.data[res.data.length - 1]
+      if (data.length) {
+        console.log('最后一个审批人名字', data[data.length - 1].taskName)
+        console.log('config文件里面定义的最后一个审批人的名字', props.lastName)
+        console.log('是否显示选择下一个节点审批人表单', !(data[data.length - 1].taskName === props.lastName))
+        if (data[data.length - 1].taskName === props.lastName) {
+          isShowUser.value = false
+        }
+      }
+    }
+  })
+}
+
+// 获取审批人
+const userList = ref<any[]>([])
+const fetchDict = () => {
+  // getUserList({ offset: 1, limit: 99999 }).then((res) => {
+  //   userList.value = res.data.rows
+  // })
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+}
+fetchDict()
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    title="审批操作"
+    width="700"
+    :before-close="handleClose"
+  >
+    <el-form
+      ref="dataFormRef"
+      v-loading="btnLoading"
+      label-position="left"
+      label-width="130px"
+      :model="formData"
+      :rules="rules"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见:">
+            <el-radio-group v-model="formData.type" disabled>
+              <el-radio label="agree" size="large">
+                同意
+              </el-radio>
+              <el-radio v-if="decisionItem !== '3'" label="reject" size="large">
+                驳回
+              </el-radio>
+              <el-radio v-if="decisionItem !== '2'" label="refuse" size="large">
+                拒绝
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论:" prop="comments">
+            <el-input
+              v-model="formData.comments"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="isShowUser && formData.type === 'agree'" :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="下一节点审批人:" prop="userList">
+            <el-select v-model="formData.userList" filterable multiple placeholder="审批人" style="width: 100%;">
+              <el-option v-for="(item) in userList" :key="item.id" :label="item.name" :value="item.id">
+                <span style="float: left;">{{ item.name }}</span>
+                <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.deptName }}</span>
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人:">
+            <el-input
+              v-model="formData.user"
+              placeholder="审批人"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间:">
+            <el-input
+              v-model="formData.approvalTime"
+              style="width: 100%;"
+              placeholder="审批时间"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <el-button type="primary" :loading="btnLoading" @click="submitForm">
+        提交
+      </el-button>
+      <el-button type="info" @click="handleClose">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/components/Approval/selectApproverDialog.vue b/src/components/Approval/selectApproverDialog.vue
new file mode 100644
index 0000000..866ef12
--- /dev/null
+++ b/src/components/Approval/selectApproverDialog.vue
@@ -0,0 +1,225 @@
+<!-- 审批人自选--选择审批人 -->
+<script lang="ts" setup name="selectApproverDialog">
+import { ElButton, ElDialog, ElMessage } from 'element-plus'
+import { getUserList } from '@/api/system/user'
+import { toTreeList } from '@/utils/structure'
+import { getDeptTreeList } from '@/api/system/dept'
+
+const props = defineProps({
+  title: {
+    type: String,
+    default: '选择审批人',
+  },
+})
+// ----------------------- 以下是字段定义 emits props ---------------------
+const emits = defineEmits(['closeRefresh', 'confirm'])
+// 对话框是否显示
+const dialogVisible = ref(false)
+const defaultProps = {
+  children: 'children',
+  label: 'name',
+}
+// 查询参数
+const listQuery = reactive({
+  keywords: '',
+  beginTime: '',
+  endTime: '',
+  deptId: '',
+  offset: 1,
+  limit: 20,
+  sort: 'id',
+  deptType: '',
+})
+const list = ref([])
+const checkoutList = ref([])
+const total = ref(0)
+const treeData = ref([])
+const loadingTable = ref<boolean>(false)
+const loadingTree = ref<boolean>(false)
+const columns = [
+  { text: '账号', value: 'account', align: 'center' },
+  { text: '所在组织机构', value: 'deptName', align: 'center' },
+  { text: '真实姓名', value: 'name', align: 'center' },
+  { text: '角色', value: 'roleName', align: 'center' },
+  { text: '手机号', value: 'phone', align: 'center' },
+  { text: '注册时间', value: 'createtime', align: 'center' },
+]
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 获取列表数据
+const fetchData = () => {
+  loadingTable.value = true
+  getUserList(listQuery).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
+}
+
+// 查询数据
+const search = () => {
+  fetchData()
+}
+
+// 重置
+const reset = () => {
+  listQuery.keywords = ''
+  listQuery.beginTime = ''
+  listQuery.endTime = ''
+  listQuery.offset = 1
+  listQuery.limit = 20
+  listQuery.sort = 'id'
+  listQuery.deptType = ''
+  fetchData()
+}
+
+// 点击树形结构
+const handleNodeClick = (data: any) => {
+  listQuery.deptId = data.id as string
+  fetchData()
+}
+
+// 获取组织列表树数据
+const fetchTreeData = () => {
+  loadingTree.value = true
+  getDeptTreeList(listQuery).then((res) => {
+    treeData.value = toTreeList(res.data, '0', true)
+    loadingTree.value = false
+  }).catch(() => {
+    loadingTree.value = false
+  })
+}
+
+// ----------初始化、关闭对话框相关-----------------
+function initDialog() {
+  dialogVisible.value = true
+  // 获取树形结构数据
+  fetchTreeData()
+  // 获取列表数据
+  fetchData()
+}
+
+// 点击确定
+const confirm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请至少选择一个审批人')
+    return false
+  }
+  const ids = checkoutList.value.map((item: { id: string }) => item.id)
+  emits('confirm', ids)
+  dialogClose()
+}
+// 关闭弹窗
+function dialogClose() {
+  dialogVisible.value = false
+}
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    :title="props.title"
+    width="90%"
+    :before-close="dialogClose"
+    append-to-body
+    :open-delay="0"
+    :close-on-click-modal="false"
+  >
+    <div class="container">
+      <!-- 左侧组织机构 -->
+      <div class="left-container">
+        <div class="dept-div">
+          <el-card class="box-card" shadow="always">
+            <template #header>
+              <div class="clearfix">
+                <span>组织机构</span>
+              </div>
+            </template>
+            <el-scrollbar height="520px" class="user-dept-scroll">
+              <el-tree
+                v-loading="loadingTree" :data="treeData" :props="defaultProps" default-expand-all
+                :expand-on-click-node="false" highlight-current @node-click="handleNodeClick"
+              />
+            </el-scrollbar>
+          </el-card>
+        </div>
+      </div>
+      <!-- 右侧表格 -->
+      <div ref="tableContainer" class="table">
+        <!-- 筛选条件 -->
+        <search-area :need-clear="true" @search="search" @clear="reset">
+          <search-item>
+            <el-input v-model.trim="listQuery.keywords" placeholder="账户/真实姓名/手机号" clearable />
+          </search-item>
+          <search-item>
+            <el-date-picker
+              v-model="listQuery.beginTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="选择开始时间"
+            />
+          </search-item>
+          <search-item>
+            <el-date-picker
+              v-model="listQuery.endTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="选择结束时间"
+            />
+          </search-item>
+        </search-area>
+        <!-- 表头标题 -->
+        <table-container :title-show="false">
+          <normal-table
+            :data="list" :total="total" :columns="columns" :query="listQuery"
+            :list-loading="loadingTable" is-showmulti-select
+            :height="520"
+            @change="changePage"
+            @multi-select="handleSelectionChange"
+          >
+            <template #preColumns>
+              <el-table-column label="#" width="55" align="center">
+                <template #default="scope">
+                  {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+                </template>
+              </el-table-column>
+            </template>
+          </normal-table>
+        </table-container>
+      </div>
+    </div>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="confirm">
+          确定
+        </el-button>
+        <el-button @click="dialogClose">
+          取消
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.container {
+  width: 100%;
+  display: flex;
+
+  .left-container {
+    width: 22%;
+  }
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
+
+  .table {
+    width: 78%;
+  }
+}
+</style>

diff --git a/public/config/customApproval.json b/public/config/customApproval.json
new file mode 100644
index 0000000..f791343
--- /dev/null
+++ b/public/config/customApproval.json
@@ -0,0 +1,7 @@
+{
+  "approvalLastName--Describe": "审批流程最后一个节点的名字，用来判断审批自选的时候是否是最后一个节点",
+  "approvalLastName": {
+    "measureData--Describe": "计量数据管理",
+    "measureData": "审批人"
+  }
+}
diff --git a/src/api/system/process.ts b/src/api/system/process.ts
index c2d4419..6bef77b 100644
--- a/src/api/system/process.ts
+++ b/src/api/system/process.ts
@@ -121,3 +121,11 @@
     data,
   })
 }
+// 动态添加审批人
+export function addApprovalUser(data: object) {
+  return request({
+    url: '/approval/operate/addTaskApprover',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components.d.ts b/src/components.d.ts
index 6cd708a..fde4221 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -13,6 +13,8 @@
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
     ApprovalDialogByProcess: typeof import('./components/Approval/ApprovalDialogByProcess.vue')['default']
+    ApprovalDialogCustom: typeof import('./components/Approval/ApprovalDialogCustom.vue')['default']
+    'ApprovalDialogCustom copy': typeof import('./components/Approval/ApprovalDialogCustom copy.vue')['default']
     ApprovalRecord: typeof import('./components/ApprovalRecord/ApprovalRecord.vue')['default']
     ApprovalRecordTable: typeof import('./components/ApprovalRecord/ApprovalRecordTable.vue')['default']
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
@@ -27,6 +29,7 @@
     CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default']
     CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
+    copy: typeof import('./components/Approval/ApprovalDialogCustom copy.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
@@ -64,6 +67,7 @@
     SearchArea: typeof import('./components/SearchArea/index.vue')['default']
     SearchBar: typeof import('./components/SearchBar/index.vue')['default']
     SearchItem: typeof import('./components/SearchArea/SearchItem.vue')['default']
+    SelectApproverDialog: typeof import('./components/Approval/selectApproverDialog.vue')['default']
     SelectEmployeesDialog: typeof import('./components/dialog/selectEmployeesDialog.vue')['default']
     SelectRoleDialog: typeof import('./components/dialog/selectRoleDialog.vue')['default']
     SelectStaffDialog: typeof import('./components/dialog/selectStaffDialog.vue')['default']
diff --git a/src/components/Approval/ApprovalDialogCustom copy.vue b/src/components/Approval/ApprovalDialogCustom copy.vue
new file mode 100644
index 0000000..d2f3dac
--- /dev/null
+++ b/src/components/Approval/ApprovalDialogCustom copy.vue
@@ -0,0 +1,274 @@
+<!-- 审批弹窗-审批人自选使用 -->
+<script lang="ts" setup name="ApprovalDialogCustom">
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
+import { fetchApproval, submitApproval } from '@/api/approval'
+import { getUserList } from '@/api/system/user'
+import { addApprovalUser } from '@/api/system/process'
+/**
+ * 审批弹窗
+ */
+const props = defineProps({
+  /**
+   * 提示文字
+   */
+  title: {
+    type: String,
+    default: '审批操作',
+  },
+  // 流程最后一个节点的名字
+  lastName: {
+    type: String,
+    required: true,
+  },
+  approvalModule: { // 审批的菜单模块
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['onSuccess', 'refuse', 'reject'])
+// 弹窗显示状态
+const dialogVisible = ref(false)
+// 默认表单
+const defaultFormData = {
+  type: '', // 审批类型
+  taskId: '', // 任务id
+  comments: '', // 备注
+  user: '', // 当前用户
+  approvalTime: '', // 当前时间
+  id: '',
+  userList: [] as any,
+  processId: '',
+}
+// 弹窗类型 agree同意 refuse拒绝 reject驳回 revoke取消
+const type = ref('agree')
+// 表单数据对象
+const formData = reactive({ ...defaultFormData })
+// 是否展示 下一节点审批节点 审批人
+const isShowUser = ref(false)
+// 保存按钮加载状态
+const btnLoading = ref(false)
+
+// agree同意 refuse拒绝 reject驳回 revoke取消
+const userInfo = useUserStore()
+
+// ---------------表单提交--------------------------------
+// 表单对象
+const dataFormRef = ref<FormInstance>()
+// 校验规则
+const rules: FormRules = reactive({
+  comments: [{ required: true, message: '审批结论必填', trigger: ['blur', 'change'] }],
+  userList: [{ required: true, message: '节点审批人必选', trigger: ['blur', 'change'] }],
+})
+/**
+ * 初始化审批弹窗
+ * @param type 审批类型
+ * @param taskId 任务id
+ * @param id 列表id
+ */
+function initDialog(type: string, taskId: string, id?: string, processId?: string) {
+  console.log('流程实例id--processId', processId)
+  if (type === 'agree') { // 同意的时候判断是否显示选择下一个节点审批人
+    isShowUser.value = true
+    getApprovalRecord(processId!)
+  }
+
+  formData.type = type
+  formData.taskId = taskId
+  formData.user = userInfo.name
+  formData.approvalTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  formData.userList = []
+  formData.processId = processId!
+  formData.comments = ''
+  formData.id = id!
+  dialogVisible.value = true
+}
+// 提交表单
+function submitForm() {
+  if (dataFormRef) {
+    dataFormRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        if (formData.userList.includes(userInfo.id)) {
+          ElMessage.warning('下一节点审批人不能含有当前用户')
+          return
+        }
+        btnLoading.value = true
+        if (formData.type === 'agree') {
+          const agree = () => {
+            submitApproval(formData.type, { taskId: formData.taskId, comments: formData.comments }).then((res) => {
+              ElMessage.success('审批完成')
+              btnLoading.value = false
+              dialogVisible.value = false
+              emit('onSuccess')
+            }).catch((_) => {
+              btnLoading.value = false
+            })
+          }
+
+          if (isShowUser.value) {
+            addApprovalUser({
+              assignees: formData.userList,
+              processInstanceId: formData.processId,
+            }).then(() => {
+              agree()
+            })
+          }
+          else {
+            agree()
+          }
+        }
+        else if (formData.type === 'reject') {
+          dialogVisible.value = false
+          btnLoading.value = false
+          emit('reject', formData.comments, formData.taskId, formData.id)
+        }
+        else if (formData.type === 'refuse') {
+          dialogVisible.value = false
+          btnLoading.value = false
+          emit('refuse', formData.comments, formData.taskId, formData.id)
+        }
+      }
+    })
+  }
+}
+// 关闭弹窗
+function handleClose() {
+  dialogVisible.value = false
+}
+
+// 获取审批记录 根据当前节点判断显示 审批人选择
+function getApprovalRecord(processId: string) {
+  fetchApproval(processId).then((res) => {
+    console.log(res.data, 'res')
+    if (res.data.length) {
+      const data = res.data[res.data.length - 1]
+      if (data.length) {
+        console.log('最后一个审批人名字', data[data.length - 1].taskName)
+        console.log('config文件里面定义的最后一个审批人的名字', props.lastName)
+        console.log('是否显示选择下一个节点审批人表单', !(data[data.length - 1].taskName === props.lastName))
+        if (data[data.length - 1].taskName === props.lastName) {
+          isShowUser.value = false
+        }
+      }
+    }
+  })
+}
+
+// 获取审批人
+const userList = ref<any[]>([])
+const fetchDict = () => {
+  // getUserList({ offset: 1, limit: 99999 }).then((res) => {
+  //   userList.value = res.data.rows
+  // })
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+}
+fetchDict()
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <div class="approval-dialog">
+    <el-dialog
+      v-model="dialogVisible"
+      title="审批操作"
+      width="700"
+      :before-close="handleClose"
+    >
+      <el-form
+        ref="dataFormRef"
+        label-position="left"
+        label-width="140px"
+        :model="formData"
+        :rules="rules"
+      >
+        <el-row :gutter="24">
+          <el-col :span="24">
+            <el-form-item label="审批意见:">
+              <el-radio-group v-model="formData.type" disabled>
+                <el-radio label="agree" size="large">
+                  同意
+                </el-radio>
+                <el-radio label="reject" size="large">
+                  驳回
+                </el-radio>
+                <el-radio label="refuse" size="large">
+                  拒绝
+                </el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="24">
+            <el-form-item label="审批结论:" prop="comments">
+              <el-input
+                v-model="formData.comments"
+                :rows="4"
+                show-word-limit
+                type="textarea"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row v-if="isShowUser && formData.type === 'agree'" :gutter="24">
+          <el-col :span="24">
+            <el-form-item label="下一节点审批人:" prop="userList">
+              <el-select v-model="formData.userList" filterable multiple placeholder="审批人" style="width: 100%;">
+                <el-option v-for="(item) in userList" :key="item.id" :label="item.name" :value="item.id">
+                  <span style="float: left;">{{ item.name }}</span>
+                  <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.deptName }}</span>
+                </el-option>
+              </el-select>
+              <div v-if="props.approvalModule === 'fileApproval'" style="color: red;font-size: 11px;">
+                <span v-if="isShowUser">***注意：《作业指导书》请选择专业组长审核；程序文件、质量手册等选择质量负责人审核***</span>
+                <span v-if="!isShowUser">***注意：《作业指导书》请选择技术负责人；程序文件、质量手册等选择主任审核***</span>
+              </div>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="12">
+            <el-form-item label="审批人:">
+              <el-input
+                v-model="formData.user"
+                placeholder="审批人"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="审批时间:">
+              <el-input
+                v-model="formData.approvalTime"
+                style="width: 100%;"
+                placeholder="审批时间"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <template #footer>
+        <el-button type="primary" :loading="btnLoading" @click="submitForm">
+          提交
+        </el-button>
+        <el-button type="info" @click="handleClose">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<style lang="scss">
+.approval-dialog {
+  .el-radio__label {
+    display: block !important;
+  }
+}
+</style>
diff --git a/src/components/Approval/ApprovalDialogCustom.vue b/src/components/Approval/ApprovalDialogCustom.vue
new file mode 100644
index 0000000..0bda369
--- /dev/null
+++ b/src/components/Approval/ApprovalDialogCustom.vue
@@ -0,0 +1,308 @@
+<script lang="ts" setup name="ApprovalDialog">
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
+import { fetchApproval, submitApproval } from '@/api/approval'
+import { changeWorkbenchApproveStatus } from '@/api/workbench/workbench'
+import { getUserList } from '@/api/system/user'
+import { addApprovalUser } from '@/api/system/process'
+import { certificatePrintByProcess } from '@/api/business/lab/cert'
+/**
+ * 审批弹窗
+ */
+const props = defineProps({
+  /**
+   * 提示文字
+   */
+  title: {
+    type: String,
+    default: '审批操作',
+  },
+  // 流程最后一个节点的名字
+  lastName: {
+    type: String,
+    required: true,
+  },
+})
+const emit = defineEmits(['onSuccess'])
+// 弹窗显示状态
+const dialogVisible = ref(false)
+// 是否展示 下一节点审批节点 审批人
+const isShowUser = ref(false)
+// 默认表单
+const defaultFormData = {
+  type: '', // 审批类型
+  taskId: '', // 任务id
+  comments: '', // 备注
+  user: '', // 当前用户
+  approvalTime: '', // 当前时间
+  userList: [] as any,
+  processId: '',
+}
+// 弹窗类型 agree同意 refuse拒绝 reject驳回 revoke取消
+const type = ref('agree')
+// 表单数据对象
+const formData = reactive({ ...defaultFormData })
+
+// 保存按钮加载状态
+const btnLoading = ref(false)
+
+// agree同意 refuse拒绝 reject驳回 revoke取消
+const userInfo = useUserStore()
+const decisionItem = ref('')
+
+// ---------------表单提交--------------------------------
+// 表单对象
+const dataFormRef = ref<FormInstance>()
+// 校验规则
+const rules: FormRules = reactive({
+  comments: [{ required: true, message: '审批结论必填', trigger: ['blur', 'change'] }],
+  userList: [{ required: true, message: '节点审批人必选', trigger: ['blur', 'change'] }],
+})
+const dataId = ref()
+/**
+ * 初始化审批弹窗
+ * @param type 审批类型
+ * @param taskId 任务id
+ */
+function initDialog(type: string, taskId: string, id: string, decisionItemParam = '1', processId?: string) {
+  console.log('流程实例id--processId', processId)
+  if (type === 'agree') { // 同意的时候判断是否显示选择下一个节点审批人
+    isShowUser.value = true
+    getApprovalRecord(processId!)
+  }
+  dataId.value = id
+  decisionItem.value = `${decisionItemParam}`
+  formData.type = type
+  formData.taskId = taskId
+  formData.user = userInfo.name
+  formData.userList = []
+  formData.approvalTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  formData.comments = ''
+  formData.processId = processId!
+  dialogVisible.value = true
+}
+// 提交表单
+function submitForm() {
+  if (dataFormRef) {
+    dataFormRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        if (formData.userList.includes(userInfo.id)) {
+          ElMessage.warning('下一节点审批人不能含有当前用户')
+          return
+        }
+        btnLoading.value = true
+        const handleApproval = () => {
+          submitApproval(formData.type, { taskId: formData.taskId, comments: formData.comments }).then((res) => {
+            ElMessage.success('审批完成')
+            btnLoading.value = false
+            dialogVisible.value = false
+            emit('onSuccess')
+          }).catch((_) => {
+            btnLoading.value = false
+          })
+        }
+        if (formData.type === 'agree') {
+          if (isShowUser.value) {
+            addApprovalUser({
+              assignees: formData.userList,
+              processInstanceId: formData.processId,
+            }).then(() => {
+              handleApproval()
+            })
+          }
+          else {
+            handleApproval()
+          }
+          certificatePrintByProcess(dataId.value)
+          // .then(() => {
+          //   // ElMessage.success('审批完成')
+          //   btnLoading.value = false
+          //   dialogVisible.value = false
+          //   emit('onSuccess')
+          // })
+        }
+        else {
+          handleApproval()
+        }
+        // 改变总工作台审批提醒的已处理状态
+        if (sessionStorage.getItem('workbenchApproveParams')) {
+          const row = JSON.parse(sessionStorage.getItem('workbenchApproveParams')!)
+          changeWorkbenchApproveStatus({
+            id: row.id,
+            status: 1,
+            businessId: row.businessId,
+            decisionItem: Number(row.decisionItem),
+            formId: row.formId,
+            processId: row.processId,
+            taskId: row.taskId,
+          })
+        }
+        // if (formData.type) {
+        //   submitApproval(formData.type, { taskId: formData.taskId, comments: formData.comments }).then((res) => {
+        //     if (formData.type === 'agree') {
+        //       certificatePrintByProcess(dataId.value).then(() => {
+        //         ElMessage.success('审批完成')
+        //         btnLoading.value = false
+        //         dialogVisible.value = false
+        //         emit('onSuccess')
+        //       })
+        //     }
+        //     else {
+        //       ElMessage.success('审批完成')
+        //       btnLoading.value = false
+        //       dialogVisible.value = false
+        //       emit('onSuccess')
+        //     }
+
+        //     // 改变总工作台审批提醒的已处理状态
+        //     if (sessionStorage.getItem('workbenchApproveParams')) {
+        //       const row = JSON.parse(sessionStorage.getItem('workbenchApproveParams')!)
+        //       changeWorkbenchApproveStatus({
+        //         id: row.id,
+        //         status: 1,
+        //         businessId: row.businessId,
+        //         decisionItem: Number(row.decisionItem),
+        //         formId: row.formId,
+        //         processId: row.processId,
+        //         taskId: row.taskId,
+        //       })
+        //     }
+        //   }).catch((_) => {
+        //     btnLoading.value = false
+        //   })
+        // }
+      }
+    })
+  }
+}
+// 关闭弹窗
+function handleClose() {
+  dialogVisible.value = false
+}
+// 获取审批记录 根据当前节点判断显示 审批人选择
+function getApprovalRecord(processId: string) {
+  fetchApproval(processId).then((res) => {
+    console.log(res.data, 'res')
+    if (res.data.length) {
+      const data = res.data[res.data.length - 1]
+      if (data.length) {
+        console.log('最后一个审批人名字', data[data.length - 1].taskName)
+        console.log('config文件里面定义的最后一个审批人的名字', props.lastName)
+        console.log('是否显示选择下一个节点审批人表单', !(data[data.length - 1].taskName === props.lastName))
+        if (data[data.length - 1].taskName === props.lastName) {
+          isShowUser.value = false
+        }
+      }
+    }
+  })
+}
+
+// 获取审批人
+const userList = ref<any[]>([])
+const fetchDict = () => {
+  // getUserList({ offset: 1, limit: 99999 }).then((res) => {
+  //   userList.value = res.data.rows
+  // })
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+}
+fetchDict()
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    title="审批操作"
+    width="700"
+    :before-close="handleClose"
+  >
+    <el-form
+      ref="dataFormRef"
+      v-loading="btnLoading"
+      label-position="left"
+      label-width="130px"
+      :model="formData"
+      :rules="rules"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见:">
+            <el-radio-group v-model="formData.type" disabled>
+              <el-radio label="agree" size="large">
+                同意
+              </el-radio>
+              <el-radio v-if="decisionItem !== '3'" label="reject" size="large">
+                驳回
+              </el-radio>
+              <el-radio v-if="decisionItem !== '2'" label="refuse" size="large">
+                拒绝
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论:" prop="comments">
+            <el-input
+              v-model="formData.comments"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="isShowUser && formData.type === 'agree'" :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="下一节点审批人:" prop="userList">
+            <el-select v-model="formData.userList" filterable multiple placeholder="审批人" style="width: 100%;">
+              <el-option v-for="(item) in userList" :key="item.id" :label="item.name" :value="item.id">
+                <span style="float: left;">{{ item.name }}</span>
+                <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.deptName }}</span>
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人:">
+            <el-input
+              v-model="formData.user"
+              placeholder="审批人"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间:">
+            <el-input
+              v-model="formData.approvalTime"
+              style="width: 100%;"
+              placeholder="审批时间"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <el-button type="primary" :loading="btnLoading" @click="submitForm">
+        提交
+      </el-button>
+      <el-button type="info" @click="handleClose">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/components/Approval/selectApproverDialog.vue b/src/components/Approval/selectApproverDialog.vue
new file mode 100644
index 0000000..866ef12
--- /dev/null
+++ b/src/components/Approval/selectApproverDialog.vue
@@ -0,0 +1,225 @@
+<!-- 审批人自选--选择审批人 -->
+<script lang="ts" setup name="selectApproverDialog">
+import { ElButton, ElDialog, ElMessage } from 'element-plus'
+import { getUserList } from '@/api/system/user'
+import { toTreeList } from '@/utils/structure'
+import { getDeptTreeList } from '@/api/system/dept'
+
+const props = defineProps({
+  title: {
+    type: String,
+    default: '选择审批人',
+  },
+})
+// ----------------------- 以下是字段定义 emits props ---------------------
+const emits = defineEmits(['closeRefresh', 'confirm'])
+// 对话框是否显示
+const dialogVisible = ref(false)
+const defaultProps = {
+  children: 'children',
+  label: 'name',
+}
+// 查询参数
+const listQuery = reactive({
+  keywords: '',
+  beginTime: '',
+  endTime: '',
+  deptId: '',
+  offset: 1,
+  limit: 20,
+  sort: 'id',
+  deptType: '',
+})
+const list = ref([])
+const checkoutList = ref([])
+const total = ref(0)
+const treeData = ref([])
+const loadingTable = ref<boolean>(false)
+const loadingTree = ref<boolean>(false)
+const columns = [
+  { text: '账号', value: 'account', align: 'center' },
+  { text: '所在组织机构', value: 'deptName', align: 'center' },
+  { text: '真实姓名', value: 'name', align: 'center' },
+  { text: '角色', value: 'roleName', align: 'center' },
+  { text: '手机号', value: 'phone', align: 'center' },
+  { text: '注册时间', value: 'createtime', align: 'center' },
+]
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 获取列表数据
+const fetchData = () => {
+  loadingTable.value = true
+  getUserList(listQuery).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
+}
+
+// 查询数据
+const search = () => {
+  fetchData()
+}
+
+// 重置
+const reset = () => {
+  listQuery.keywords = ''
+  listQuery.beginTime = ''
+  listQuery.endTime = ''
+  listQuery.offset = 1
+  listQuery.limit = 20
+  listQuery.sort = 'id'
+  listQuery.deptType = ''
+  fetchData()
+}
+
+// 点击树形结构
+const handleNodeClick = (data: any) => {
+  listQuery.deptId = data.id as string
+  fetchData()
+}
+
+// 获取组织列表树数据
+const fetchTreeData = () => {
+  loadingTree.value = true
+  getDeptTreeList(listQuery).then((res) => {
+    treeData.value = toTreeList(res.data, '0', true)
+    loadingTree.value = false
+  }).catch(() => {
+    loadingTree.value = false
+  })
+}
+
+// ----------初始化、关闭对话框相关-----------------
+function initDialog() {
+  dialogVisible.value = true
+  // 获取树形结构数据
+  fetchTreeData()
+  // 获取列表数据
+  fetchData()
+}
+
+// 点击确定
+const confirm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请至少选择一个审批人')
+    return false
+  }
+  const ids = checkoutList.value.map((item: { id: string }) => item.id)
+  emits('confirm', ids)
+  dialogClose()
+}
+// 关闭弹窗
+function dialogClose() {
+  dialogVisible.value = false
+}
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    :title="props.title"
+    width="90%"
+    :before-close="dialogClose"
+    append-to-body
+    :open-delay="0"
+    :close-on-click-modal="false"
+  >
+    <div class="container">
+      <!-- 左侧组织机构 -->
+      <div class="left-container">
+        <div class="dept-div">
+          <el-card class="box-card" shadow="always">
+            <template #header>
+              <div class="clearfix">
+                <span>组织机构</span>
+              </div>
+            </template>
+            <el-scrollbar height="520px" class="user-dept-scroll">
+              <el-tree
+                v-loading="loadingTree" :data="treeData" :props="defaultProps" default-expand-all
+                :expand-on-click-node="false" highlight-current @node-click="handleNodeClick"
+              />
+            </el-scrollbar>
+          </el-card>
+        </div>
+      </div>
+      <!-- 右侧表格 -->
+      <div ref="tableContainer" class="table">
+        <!-- 筛选条件 -->
+        <search-area :need-clear="true" @search="search" @clear="reset">
+          <search-item>
+            <el-input v-model.trim="listQuery.keywords" placeholder="账户/真实姓名/手机号" clearable />
+          </search-item>
+          <search-item>
+            <el-date-picker
+              v-model="listQuery.beginTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="选择开始时间"
+            />
+          </search-item>
+          <search-item>
+            <el-date-picker
+              v-model="listQuery.endTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="选择结束时间"
+            />
+          </search-item>
+        </search-area>
+        <!-- 表头标题 -->
+        <table-container :title-show="false">
+          <normal-table
+            :data="list" :total="total" :columns="columns" :query="listQuery"
+            :list-loading="loadingTable" is-showmulti-select
+            :height="520"
+            @change="changePage"
+            @multi-select="handleSelectionChange"
+          >
+            <template #preColumns>
+              <el-table-column label="#" width="55" align="center">
+                <template #default="scope">
+                  {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+                </template>
+              </el-table-column>
+            </template>
+          </normal-table>
+        </table-container>
+      </div>
+    </div>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="confirm">
+          确定
+        </el-button>
+        <el-button @click="dialogClose">
+          取消
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.container {
+  width: 100%;
+  display: flex;
+
+  .left-container {
+    width: 22%;
+  }
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
+
+  .table {
+    width: 78%;
+  }
+}
+</style>
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 2ea30d3..b76a306 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -133,7 +133,17 @@
       return
     }
   }
-  if (!approverConfig.value.noHanderAction) {
+  // 审批人自选
+  else if (approverConfig.value.settype === 4) {
+    if (!approverConfig.value.tempExamineMode) {
+      ElMessage({
+        message: '请选择审批方式',
+        type: 'warning',
+      })
+      return
+    }
+  }
+  if (approverConfig.value.settype !== 4 && !approverConfig.value.noHanderAction) {
     ElMessage({
       message: '审批人为空的选项不能为空',
       type: 'warning',
@@ -202,6 +212,9 @@
         <el-radio :label="7" :disabled="disabledVal === '0'">
           连续多级主管
         </el-radio>
+        <el-radio :label="4">
+          审批人自选
+        </el-radio>
       </el-radio-group>
       <!-- 选择好的成员或者角色 -->
       <p v-if="approverConfig && approverConfig.nodeUserList && approverConfig.nodeUserList.length" class="selected_list">
@@ -240,10 +253,10 @@
       </div>
 
       <!-- 审批方式 -->
-      <h5 v-if="approverConfig.settype === 2 || approverConfig.settype === 11 || (approverConfig.settype === 1 && approverConfig && approverConfig.nodeUserList && approverConfig.nodeUserList.length > 1)" class="add-person">
+      <h5 v-if="approverConfig.settype === 4 ||approverConfig.settype === 2 || approverConfig.settype === 11 || (approverConfig.settype === 1 && approverConfig && approverConfig.nodeUserList && approverConfig.nodeUserList.length > 1)" class="add-person">
         多人审批时采用的审批方式
       </h5>
-      <el-radio-group v-if="approverConfig.settype === 2 || approverConfig.settype === 11 || (approverConfig.settype === 1 && approverConfig && approverConfig.nodeUserList && approverConfig.nodeUserList.length > 1)" v-model="approverConfig.tempExamineMode" style="width: 100%;margin-bottom: 16px;">
+      <el-radio-group v-if="approverConfig.settype === 4 ||approverConfig.settype === 2 || approverConfig.settype === 11 || (approverConfig.settype === 1 && approverConfig && approverConfig.nodeUserList && approverConfig.nodeUserList.length > 1)" v-model="approverConfig.tempExamineMode" style="width: 100%;margin-bottom: 16px;">
         <el-radio :label="2">
           会签（需所有审批人同意）
         </el-radio>
@@ -270,10 +283,10 @@
       </div>
 
       <!-- 审批为空时 -->
-      <h5 class="add-person">
+      <h5 v-if="approverConfig.settype !== 4" class="add-person">
         审批人为空时
       </h5>
-      <el-radio-group v-model="approverConfig.noHanderAction" style="width: 100%;margin-bottom: 16px;">
+      <el-radio-group v-if="approverConfig.settype !== 4" v-model="approverConfig.noHanderAction" style="width: 100%;margin-bottom: 16px;">
         <el-radio :label="1">
           自动审批通过
         </el-radio>

diff --git a/public/config/customApproval.json b/public/config/customApproval.json
new file mode 100644
index 0000000..f791343
--- /dev/null
+++ b/public/config/customApproval.json
@@ -0,0 +1,7 @@
+{
+  "approvalLastName--Describe": "审批流程最后一个节点的名字，用来判断审批自选的时候是否是最后一个节点",
+  "approvalLastName": {
+    "measureData--Describe": "计量数据管理",
+    "measureData": "审批人"
+  }
+}
diff --git a/src/api/system/process.ts b/src/api/system/process.ts
index c2d4419..6bef77b 100644
--- a/src/api/system/process.ts
+++ b/src/api/system/process.ts
@@ -121,3 +121,11 @@
     data,
   })
 }
+// 动态添加审批人
+export function addApprovalUser(data: object) {
+  return request({
+    url: '/approval/operate/addTaskApprover',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components.d.ts b/src/components.d.ts
index 6cd708a..fde4221 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -13,6 +13,8 @@
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
     ApprovalDialogByProcess: typeof import('./components/Approval/ApprovalDialogByProcess.vue')['default']
+    ApprovalDialogCustom: typeof import('./components/Approval/ApprovalDialogCustom.vue')['default']
+    'ApprovalDialogCustom copy': typeof import('./components/Approval/ApprovalDialogCustom copy.vue')['default']
     ApprovalRecord: typeof import('./components/ApprovalRecord/ApprovalRecord.vue')['default']
     ApprovalRecordTable: typeof import('./components/ApprovalRecord/ApprovalRecordTable.vue')['default']
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
@@ -27,6 +29,7 @@
     CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default']
     CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
+    copy: typeof import('./components/Approval/ApprovalDialogCustom copy.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
@@ -64,6 +67,7 @@
     SearchArea: typeof import('./components/SearchArea/index.vue')['default']
     SearchBar: typeof import('./components/SearchBar/index.vue')['default']
     SearchItem: typeof import('./components/SearchArea/SearchItem.vue')['default']
+    SelectApproverDialog: typeof import('./components/Approval/selectApproverDialog.vue')['default']
     SelectEmployeesDialog: typeof import('./components/dialog/selectEmployeesDialog.vue')['default']
     SelectRoleDialog: typeof import('./components/dialog/selectRoleDialog.vue')['default']
     SelectStaffDialog: typeof import('./components/dialog/selectStaffDialog.vue')['default']
diff --git a/src/components/Approval/ApprovalDialogCustom copy.vue b/src/components/Approval/ApprovalDialogCustom copy.vue
new file mode 100644
index 0000000..d2f3dac
--- /dev/null
+++ b/src/components/Approval/ApprovalDialogCustom copy.vue
@@ -0,0 +1,274 @@
+<!-- 审批弹窗-审批人自选使用 -->
+<script lang="ts" setup name="ApprovalDialogCustom">
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
+import { fetchApproval, submitApproval } from '@/api/approval'
+import { getUserList } from '@/api/system/user'
+import { addApprovalUser } from '@/api/system/process'
+/**
+ * 审批弹窗
+ */
+const props = defineProps({
+  /**
+   * 提示文字
+   */
+  title: {
+    type: String,
+    default: '审批操作',
+  },
+  // 流程最后一个节点的名字
+  lastName: {
+    type: String,
+    required: true,
+  },
+  approvalModule: { // 审批的菜单模块
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['onSuccess', 'refuse', 'reject'])
+// 弹窗显示状态
+const dialogVisible = ref(false)
+// 默认表单
+const defaultFormData = {
+  type: '', // 审批类型
+  taskId: '', // 任务id
+  comments: '', // 备注
+  user: '', // 当前用户
+  approvalTime: '', // 当前时间
+  id: '',
+  userList: [] as any,
+  processId: '',
+}
+// 弹窗类型 agree同意 refuse拒绝 reject驳回 revoke取消
+const type = ref('agree')
+// 表单数据对象
+const formData = reactive({ ...defaultFormData })
+// 是否展示 下一节点审批节点 审批人
+const isShowUser = ref(false)
+// 保存按钮加载状态
+const btnLoading = ref(false)
+
+// agree同意 refuse拒绝 reject驳回 revoke取消
+const userInfo = useUserStore()
+
+// ---------------表单提交--------------------------------
+// 表单对象
+const dataFormRef = ref<FormInstance>()
+// 校验规则
+const rules: FormRules = reactive({
+  comments: [{ required: true, message: '审批结论必填', trigger: ['blur', 'change'] }],
+  userList: [{ required: true, message: '节点审批人必选', trigger: ['blur', 'change'] }],
+})
+/**
+ * 初始化审批弹窗
+ * @param type 审批类型
+ * @param taskId 任务id
+ * @param id 列表id
+ */
+function initDialog(type: string, taskId: string, id?: string, processId?: string) {
+  console.log('流程实例id--processId', processId)
+  if (type === 'agree') { // 同意的时候判断是否显示选择下一个节点审批人
+    isShowUser.value = true
+    getApprovalRecord(processId!)
+  }
+
+  formData.type = type
+  formData.taskId = taskId
+  formData.user = userInfo.name
+  formData.approvalTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  formData.userList = []
+  formData.processId = processId!
+  formData.comments = ''
+  formData.id = id!
+  dialogVisible.value = true
+}
+// 提交表单
+function submitForm() {
+  if (dataFormRef) {
+    dataFormRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        if (formData.userList.includes(userInfo.id)) {
+          ElMessage.warning('下一节点审批人不能含有当前用户')
+          return
+        }
+        btnLoading.value = true
+        if (formData.type === 'agree') {
+          const agree = () => {
+            submitApproval(formData.type, { taskId: formData.taskId, comments: formData.comments }).then((res) => {
+              ElMessage.success('审批完成')
+              btnLoading.value = false
+              dialogVisible.value = false
+              emit('onSuccess')
+            }).catch((_) => {
+              btnLoading.value = false
+            })
+          }
+
+          if (isShowUser.value) {
+            addApprovalUser({
+              assignees: formData.userList,
+              processInstanceId: formData.processId,
+            }).then(() => {
+              agree()
+            })
+          }
+          else {
+            agree()
+          }
+        }
+        else if (formData.type === 'reject') {
+          dialogVisible.value = false
+          btnLoading.value = false
+          emit('reject', formData.comments, formData.taskId, formData.id)
+        }
+        else if (formData.type === 'refuse') {
+          dialogVisible.value = false
+          btnLoading.value = false
+          emit('refuse', formData.comments, formData.taskId, formData.id)
+        }
+      }
+    })
+  }
+}
+// 关闭弹窗
+function handleClose() {
+  dialogVisible.value = false
+}
+
+// 获取审批记录 根据当前节点判断显示 审批人选择
+function getApprovalRecord(processId: string) {
+  fetchApproval(processId).then((res) => {
+    console.log(res.data, 'res')
+    if (res.data.length) {
+      const data = res.data[res.data.length - 1]
+      if (data.length) {
+        console.log('最后一个审批人名字', data[data.length - 1].taskName)
+        console.log('config文件里面定义的最后一个审批人的名字', props.lastName)
+        console.log('是否显示选择下一个节点审批人表单', !(data[data.length - 1].taskName === props.lastName))
+        if (data[data.length - 1].taskName === props.lastName) {
+          isShowUser.value = false
+        }
+      }
+    }
+  })
+}
+
+// 获取审批人
+const userList = ref<any[]>([])
+const fetchDict = () => {
+  // getUserList({ offset: 1, limit: 99999 }).then((res) => {
+  //   userList.value = res.data.rows
+  // })
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+}
+fetchDict()
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <div class="approval-dialog">
+    <el-dialog
+      v-model="dialogVisible"
+      title="审批操作"
+      width="700"
+      :before-close="handleClose"
+    >
+      <el-form
+        ref="dataFormRef"
+        label-position="left"
+        label-width="140px"
+        :model="formData"
+        :rules="rules"
+      >
+        <el-row :gutter="24">
+          <el-col :span="24">
+            <el-form-item label="审批意见:">
+              <el-radio-group v-model="formData.type" disabled>
+                <el-radio label="agree" size="large">
+                  同意
+                </el-radio>
+                <el-radio label="reject" size="large">
+                  驳回
+                </el-radio>
+                <el-radio label="refuse" size="large">
+                  拒绝
+                </el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="24">
+            <el-form-item label="审批结论:" prop="comments">
+              <el-input
+                v-model="formData.comments"
+                :rows="4"
+                show-word-limit
+                type="textarea"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row v-if="isShowUser && formData.type === 'agree'" :gutter="24">
+          <el-col :span="24">
+            <el-form-item label="下一节点审批人:" prop="userList">
+              <el-select v-model="formData.userList" filterable multiple placeholder="审批人" style="width: 100%;">
+                <el-option v-for="(item) in userList" :key="item.id" :label="item.name" :value="item.id">
+                  <span style="float: left;">{{ item.name }}</span>
+                  <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.deptName }}</span>
+                </el-option>
+              </el-select>
+              <div v-if="props.approvalModule === 'fileApproval'" style="color: red;font-size: 11px;">
+                <span v-if="isShowUser">***注意：《作业指导书》请选择专业组长审核；程序文件、质量手册等选择质量负责人审核***</span>
+                <span v-if="!isShowUser">***注意：《作业指导书》请选择技术负责人；程序文件、质量手册等选择主任审核***</span>
+              </div>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="12">
+            <el-form-item label="审批人:">
+              <el-input
+                v-model="formData.user"
+                placeholder="审批人"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="审批时间:">
+              <el-input
+                v-model="formData.approvalTime"
+                style="width: 100%;"
+                placeholder="审批时间"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <template #footer>
+        <el-button type="primary" :loading="btnLoading" @click="submitForm">
+          提交
+        </el-button>
+        <el-button type="info" @click="handleClose">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<style lang="scss">
+.approval-dialog {
+  .el-radio__label {
+    display: block !important;
+  }
+}
+</style>
diff --git a/src/components/Approval/ApprovalDialogCustom.vue b/src/components/Approval/ApprovalDialogCustom.vue
new file mode 100644
index 0000000..0bda369
--- /dev/null
+++ b/src/components/Approval/ApprovalDialogCustom.vue
@@ -0,0 +1,308 @@
+<script lang="ts" setup name="ApprovalDialog">
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
+import { fetchApproval, submitApproval } from '@/api/approval'
+import { changeWorkbenchApproveStatus } from '@/api/workbench/workbench'
+import { getUserList } from '@/api/system/user'
+import { addApprovalUser } from '@/api/system/process'
+import { certificatePrintByProcess } from '@/api/business/lab/cert'
+/**
+ * 审批弹窗
+ */
+const props = defineProps({
+  /**
+   * 提示文字
+   */
+  title: {
+    type: String,
+    default: '审批操作',
+  },
+  // 流程最后一个节点的名字
+  lastName: {
+    type: String,
+    required: true,
+  },
+})
+const emit = defineEmits(['onSuccess'])
+// 弹窗显示状态
+const dialogVisible = ref(false)
+// 是否展示 下一节点审批节点 审批人
+const isShowUser = ref(false)
+// 默认表单
+const defaultFormData = {
+  type: '', // 审批类型
+  taskId: '', // 任务id
+  comments: '', // 备注
+  user: '', // 当前用户
+  approvalTime: '', // 当前时间
+  userList: [] as any,
+  processId: '',
+}
+// 弹窗类型 agree同意 refuse拒绝 reject驳回 revoke取消
+const type = ref('agree')
+// 表单数据对象
+const formData = reactive({ ...defaultFormData })
+
+// 保存按钮加载状态
+const btnLoading = ref(false)
+
+// agree同意 refuse拒绝 reject驳回 revoke取消
+const userInfo = useUserStore()
+const decisionItem = ref('')
+
+// ---------------表单提交--------------------------------
+// 表单对象
+const dataFormRef = ref<FormInstance>()
+// 校验规则
+const rules: FormRules = reactive({
+  comments: [{ required: true, message: '审批结论必填', trigger: ['blur', 'change'] }],
+  userList: [{ required: true, message: '节点审批人必选', trigger: ['blur', 'change'] }],
+})
+const dataId = ref()
+/**
+ * 初始化审批弹窗
+ * @param type 审批类型
+ * @param taskId 任务id
+ */
+function initDialog(type: string, taskId: string, id: string, decisionItemParam = '1', processId?: string) {
+  console.log('流程实例id--processId', processId)
+  if (type === 'agree') { // 同意的时候判断是否显示选择下一个节点审批人
+    isShowUser.value = true
+    getApprovalRecord(processId!)
+  }
+  dataId.value = id
+  decisionItem.value = `${decisionItemParam}`
+  formData.type = type
+  formData.taskId = taskId
+  formData.user = userInfo.name
+  formData.userList = []
+  formData.approvalTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  formData.comments = ''
+  formData.processId = processId!
+  dialogVisible.value = true
+}
+// 提交表单
+function submitForm() {
+  if (dataFormRef) {
+    dataFormRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        if (formData.userList.includes(userInfo.id)) {
+          ElMessage.warning('下一节点审批人不能含有当前用户')
+          return
+        }
+        btnLoading.value = true
+        const handleApproval = () => {
+          submitApproval(formData.type, { taskId: formData.taskId, comments: formData.comments }).then((res) => {
+            ElMessage.success('审批完成')
+            btnLoading.value = false
+            dialogVisible.value = false
+            emit('onSuccess')
+          }).catch((_) => {
+            btnLoading.value = false
+          })
+        }
+        if (formData.type === 'agree') {
+          if (isShowUser.value) {
+            addApprovalUser({
+              assignees: formData.userList,
+              processInstanceId: formData.processId,
+            }).then(() => {
+              handleApproval()
+            })
+          }
+          else {
+            handleApproval()
+          }
+          certificatePrintByProcess(dataId.value)
+          // .then(() => {
+          //   // ElMessage.success('审批完成')
+          //   btnLoading.value = false
+          //   dialogVisible.value = false
+          //   emit('onSuccess')
+          // })
+        }
+        else {
+          handleApproval()
+        }
+        // 改变总工作台审批提醒的已处理状态
+        if (sessionStorage.getItem('workbenchApproveParams')) {
+          const row = JSON.parse(sessionStorage.getItem('workbenchApproveParams')!)
+          changeWorkbenchApproveStatus({
+            id: row.id,
+            status: 1,
+            businessId: row.businessId,
+            decisionItem: Number(row.decisionItem),
+            formId: row.formId,
+            processId: row.processId,
+            taskId: row.taskId,
+          })
+        }
+        // if (formData.type) {
+        //   submitApproval(formData.type, { taskId: formData.taskId, comments: formData.comments }).then((res) => {
+        //     if (formData.type === 'agree') {
+        //       certificatePrintByProcess(dataId.value).then(() => {
+        //         ElMessage.success('审批完成')
+        //         btnLoading.value = false
+        //         dialogVisible.value = false
+        //         emit('onSuccess')
+        //       })
+        //     }
+        //     else {
+        //       ElMessage.success('审批完成')
+        //       btnLoading.value = false
+        //       dialogVisible.value = false
+        //       emit('onSuccess')
+        //     }
+
+        //     // 改变总工作台审批提醒的已处理状态
+        //     if (sessionStorage.getItem('workbenchApproveParams')) {
+        //       const row = JSON.parse(sessionStorage.getItem('workbenchApproveParams')!)
+        //       changeWorkbenchApproveStatus({
+        //         id: row.id,
+        //         status: 1,
+        //         businessId: row.businessId,
+        //         decisionItem: Number(row.decisionItem),
+        //         formId: row.formId,
+        //         processId: row.processId,
+        //         taskId: row.taskId,
+        //       })
+        //     }
+        //   }).catch((_) => {
+        //     btnLoading.value = false
+        //   })
+        // }
+      }
+    })
+  }
+}
+// 关闭弹窗
+function handleClose() {
+  dialogVisible.value = false
+}
+// 获取审批记录 根据当前节点判断显示 审批人选择
+function getApprovalRecord(processId: string) {
+  fetchApproval(processId).then((res) => {
+    console.log(res.data, 'res')
+    if (res.data.length) {
+      const data = res.data[res.data.length - 1]
+      if (data.length) {
+        console.log('最后一个审批人名字', data[data.length - 1].taskName)
+        console.log('config文件里面定义的最后一个审批人的名字', props.lastName)
+        console.log('是否显示选择下一个节点审批人表单', !(data[data.length - 1].taskName === props.lastName))
+        if (data[data.length - 1].taskName === props.lastName) {
+          isShowUser.value = false
+        }
+      }
+    }
+  })
+}
+
+// 获取审批人
+const userList = ref<any[]>([])
+const fetchDict = () => {
+  // getUserList({ offset: 1, limit: 99999 }).then((res) => {
+  //   userList.value = res.data.rows
+  // })
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+}
+fetchDict()
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    title="审批操作"
+    width="700"
+    :before-close="handleClose"
+  >
+    <el-form
+      ref="dataFormRef"
+      v-loading="btnLoading"
+      label-position="left"
+      label-width="130px"
+      :model="formData"
+      :rules="rules"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见:">
+            <el-radio-group v-model="formData.type" disabled>
+              <el-radio label="agree" size="large">
+                同意
+              </el-radio>
+              <el-radio v-if="decisionItem !== '3'" label="reject" size="large">
+                驳回
+              </el-radio>
+              <el-radio v-if="decisionItem !== '2'" label="refuse" size="large">
+                拒绝
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论:" prop="comments">
+            <el-input
+              v-model="formData.comments"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="isShowUser && formData.type === 'agree'" :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="下一节点审批人:" prop="userList">
+            <el-select v-model="formData.userList" filterable multiple placeholder="审批人" style="width: 100%;">
+              <el-option v-for="(item) in userList" :key="item.id" :label="item.name" :value="item.id">
+                <span style="float: left;">{{ item.name }}</span>
+                <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.deptName }}</span>
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人:">
+            <el-input
+              v-model="formData.user"
+              placeholder="审批人"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间:">
+            <el-input
+              v-model="formData.approvalTime"
+              style="width: 100%;"
+              placeholder="审批时间"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <el-button type="primary" :loading="btnLoading" @click="submitForm">
+        提交
+      </el-button>
+      <el-button type="info" @click="handleClose">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/components/Approval/selectApproverDialog.vue b/src/components/Approval/selectApproverDialog.vue
new file mode 100644
index 0000000..866ef12
--- /dev/null
+++ b/src/components/Approval/selectApproverDialog.vue
@@ -0,0 +1,225 @@
+<!-- 审批人自选--选择审批人 -->
+<script lang="ts" setup name="selectApproverDialog">
+import { ElButton, ElDialog, ElMessage } from 'element-plus'
+import { getUserList } from '@/api/system/user'
+import { toTreeList } from '@/utils/structure'
+import { getDeptTreeList } from '@/api/system/dept'
+
+const props = defineProps({
+  title: {
+    type: String,
+    default: '选择审批人',
+  },
+})
+// ----------------------- 以下是字段定义 emits props ---------------------
+const emits = defineEmits(['closeRefresh', 'confirm'])
+// 对话框是否显示
+const dialogVisible = ref(false)
+const defaultProps = {
+  children: 'children',
+  label: 'name',
+}
+// 查询参数
+const listQuery = reactive({
+  keywords: '',
+  beginTime: '',
+  endTime: '',
+  deptId: '',
+  offset: 1,
+  limit: 20,
+  sort: 'id',
+  deptType: '',
+})
+const list = ref([])
+const checkoutList = ref([])
+const total = ref(0)
+const treeData = ref([])
+const loadingTable = ref<boolean>(false)
+const loadingTree = ref<boolean>(false)
+const columns = [
+  { text: '账号', value: 'account', align: 'center' },
+  { text: '所在组织机构', value: 'deptName', align: 'center' },
+  { text: '真实姓名', value: 'name', align: 'center' },
+  { text: '角色', value: 'roleName', align: 'center' },
+  { text: '手机号', value: 'phone', align: 'center' },
+  { text: '注册时间', value: 'createtime', align: 'center' },
+]
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 获取列表数据
+const fetchData = () => {
+  loadingTable.value = true
+  getUserList(listQuery).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
+}
+
+// 查询数据
+const search = () => {
+  fetchData()
+}
+
+// 重置
+const reset = () => {
+  listQuery.keywords = ''
+  listQuery.beginTime = ''
+  listQuery.endTime = ''
+  listQuery.offset = 1
+  listQuery.limit = 20
+  listQuery.sort = 'id'
+  listQuery.deptType = ''
+  fetchData()
+}
+
+// 点击树形结构
+const handleNodeClick = (data: any) => {
+  listQuery.deptId = data.id as string
+  fetchData()
+}
+
+// 获取组织列表树数据
+const fetchTreeData = () => {
+  loadingTree.value = true
+  getDeptTreeList(listQuery).then((res) => {
+    treeData.value = toTreeList(res.data, '0', true)
+    loadingTree.value = false
+  }).catch(() => {
+    loadingTree.value = false
+  })
+}
+
+// ----------初始化、关闭对话框相关-----------------
+function initDialog() {
+  dialogVisible.value = true
+  // 获取树形结构数据
+  fetchTreeData()
+  // 获取列表数据
+  fetchData()
+}
+
+// 点击确定
+const confirm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请至少选择一个审批人')
+    return false
+  }
+  const ids = checkoutList.value.map((item: { id: string }) => item.id)
+  emits('confirm', ids)
+  dialogClose()
+}
+// 关闭弹窗
+function dialogClose() {
+  dialogVisible.value = false
+}
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    :title="props.title"
+    width="90%"
+    :before-close="dialogClose"
+    append-to-body
+    :open-delay="0"
+    :close-on-click-modal="false"
+  >
+    <div class="container">
+      <!-- 左侧组织机构 -->
+      <div class="left-container">
+        <div class="dept-div">
+          <el-card class="box-card" shadow="always">
+            <template #header>
+              <div class="clearfix">
+                <span>组织机构</span>
+              </div>
+            </template>
+            <el-scrollbar height="520px" class="user-dept-scroll">
+              <el-tree
+                v-loading="loadingTree" :data="treeData" :props="defaultProps" default-expand-all
+                :expand-on-click-node="false" highlight-current @node-click="handleNodeClick"
+              />
+            </el-scrollbar>
+          </el-card>
+        </div>
+      </div>
+      <!-- 右侧表格 -->
+      <div ref="tableContainer" class="table">
+        <!-- 筛选条件 -->
+        <search-area :need-clear="true" @search="search" @clear="reset">
+          <search-item>
+            <el-input v-model.trim="listQuery.keywords" placeholder="账户/真实姓名/手机号" clearable />
+          </search-item>
+          <search-item>
+            <el-date-picker
+              v-model="listQuery.beginTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="选择开始时间"
+            />
+          </search-item>
+          <search-item>
+            <el-date-picker
+              v-model="listQuery.endTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="选择结束时间"
+            />
+          </search-item>
+        </search-area>
+        <!-- 表头标题 -->
+        <table-container :title-show="false">
+          <normal-table
+            :data="list" :total="total" :columns="columns" :query="listQuery"
+            :list-loading="loadingTable" is-showmulti-select
+            :height="520"
+            @change="changePage"
+            @multi-select="handleSelectionChange"
+          >
+            <template #preColumns>
+              <el-table-column label="#" width="55" align="center">
+                <template #default="scope">
+                  {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+                </template>
+              </el-table-column>
+            </template>
+          </normal-table>
+        </table-container>
+      </div>
+    </div>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="confirm">
+          确定
+        </el-button>
+        <el-button @click="dialogClose">
+          取消
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.container {
+  width: 100%;
+  display: flex;
+
+  .left-container {
+    width: 22%;
+  }
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
+
+  .table {
+    width: 78%;
+  }
+}
+</style>
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 2ea30d3..b76a306 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -133,7 +133,17 @@
       return
     }
   }
-  if (!approverConfig.value.noHanderAction) {
+  // 审批人自选
+  else if (approverConfig.value.settype === 4) {
+    if (!approverConfig.value.tempExamineMode) {
+      ElMessage({
+        message: '请选择审批方式',
+        type: 'warning',
+      })
+      return
+    }
+  }
+  if (approverConfig.value.settype !== 4 && !approverConfig.value.noHanderAction) {
     ElMessage({
       message: '审批人为空的选项不能为空',
       type: 'warning',
@@ -202,6 +212,9 @@
         <el-radio :label="7" :disabled="disabledVal === '0'">
           连续多级主管
         </el-radio>
+        <el-radio :label="4">
+          审批人自选
+        </el-radio>
       </el-radio-group>
       <!-- 选择好的成员或者角色 -->
       <p v-if="approverConfig && approverConfig.nodeUserList && approverConfig.nodeUserList.length" class="selected_list">
@@ -240,10 +253,10 @@
       </div>
 
       <!-- 审批方式 -->
-      <h5 v-if="approverConfig.settype === 2 || approverConfig.settype === 11 || (approverConfig.settype === 1 && approverConfig && approverConfig.nodeUserList && approverConfig.nodeUserList.length > 1)" class="add-person">
+      <h5 v-if="approverConfig.settype === 4 ||approverConfig.settype === 2 || approverConfig.settype === 11 || (approverConfig.settype === 1 && approverConfig && approverConfig.nodeUserList && approverConfig.nodeUserList.length > 1)" class="add-person">
         多人审批时采用的审批方式
       </h5>
-      <el-radio-group v-if="approverConfig.settype === 2 || approverConfig.settype === 11 || (approverConfig.settype === 1 && approverConfig && approverConfig.nodeUserList && approverConfig.nodeUserList.length > 1)" v-model="approverConfig.tempExamineMode" style="width: 100%;margin-bottom: 16px;">
+      <el-radio-group v-if="approverConfig.settype === 4 ||approverConfig.settype === 2 || approverConfig.settype === 11 || (approverConfig.settype === 1 && approverConfig && approverConfig.nodeUserList && approverConfig.nodeUserList.length > 1)" v-model="approverConfig.tempExamineMode" style="width: 100%;margin-bottom: 16px;">
         <el-radio :label="2">
           会签（需所有审批人同意）
         </el-radio>
@@ -270,10 +283,10 @@
       </div>
 
       <!-- 审批为空时 -->
-      <h5 class="add-person">
+      <h5 v-if="approverConfig.settype !== 4" class="add-person">
         审批人为空时
       </h5>
-      <el-radio-group v-model="approverConfig.noHanderAction" style="width: 100%;margin-bottom: 16px;">
+      <el-radio-group v-if="approverConfig.settype !== 4" v-model="approverConfig.noHanderAction" style="width: 100%;margin-bottom: 16px;">
         <el-radio :label="1">
           自动审批通过
         </el-radio>
diff --git a/src/plugins/preload.ts b/src/plugins/preload.ts
index a4cc107..9873f6c 100644
--- a/src/plugins/preload.ts
+++ b/src/plugins/preload.ts
@@ -53,6 +53,9 @@
     else if (nodeConfig.settype == 7) {
       return `从直接主管到通讯录中级别最高的第${nodeConfig.examineEndDirectorLevel}个层级主管`
     }
+    else if (nodeConfig.settype == 4) {
+      return '审批人自选'
+    }
   },
   dealStr(str: any, obj: any) {
     const arr = [] as any

diff --git a/public/config/customApproval.json b/public/config/customApproval.json
new file mode 100644
index 0000000..f791343
--- /dev/null
+++ b/public/config/customApproval.json
@@ -0,0 +1,7 @@
+{
+  "approvalLastName--Describe": "审批流程最后一个节点的名字，用来判断审批自选的时候是否是最后一个节点",
+  "approvalLastName": {
+    "measureData--Describe": "计量数据管理",
+    "measureData": "审批人"
+  }
+}
diff --git a/src/api/system/process.ts b/src/api/system/process.ts
index c2d4419..6bef77b 100644
--- a/src/api/system/process.ts
+++ b/src/api/system/process.ts
@@ -121,3 +121,11 @@
     data,
   })
 }
+// 动态添加审批人
+export function addApprovalUser(data: object) {
+  return request({
+    url: '/approval/operate/addTaskApprover',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components.d.ts b/src/components.d.ts
index 6cd708a..fde4221 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -13,6 +13,8 @@
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
     ApprovalDialogByProcess: typeof import('./components/Approval/ApprovalDialogByProcess.vue')['default']
+    ApprovalDialogCustom: typeof import('./components/Approval/ApprovalDialogCustom.vue')['default']
+    'ApprovalDialogCustom copy': typeof import('./components/Approval/ApprovalDialogCustom copy.vue')['default']
     ApprovalRecord: typeof import('./components/ApprovalRecord/ApprovalRecord.vue')['default']
     ApprovalRecordTable: typeof import('./components/ApprovalRecord/ApprovalRecordTable.vue')['default']
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
@@ -27,6 +29,7 @@
     CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default']
     CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
+    copy: typeof import('./components/Approval/ApprovalDialogCustom copy.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
@@ -64,6 +67,7 @@
     SearchArea: typeof import('./components/SearchArea/index.vue')['default']
     SearchBar: typeof import('./components/SearchBar/index.vue')['default']
     SearchItem: typeof import('./components/SearchArea/SearchItem.vue')['default']
+    SelectApproverDialog: typeof import('./components/Approval/selectApproverDialog.vue')['default']
     SelectEmployeesDialog: typeof import('./components/dialog/selectEmployeesDialog.vue')['default']
     SelectRoleDialog: typeof import('./components/dialog/selectRoleDialog.vue')['default']
     SelectStaffDialog: typeof import('./components/dialog/selectStaffDialog.vue')['default']
diff --git a/src/components/Approval/ApprovalDialogCustom copy.vue b/src/components/Approval/ApprovalDialogCustom copy.vue
new file mode 100644
index 0000000..d2f3dac
--- /dev/null
+++ b/src/components/Approval/ApprovalDialogCustom copy.vue
@@ -0,0 +1,274 @@
+<!-- 审批弹窗-审批人自选使用 -->
+<script lang="ts" setup name="ApprovalDialogCustom">
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
+import { fetchApproval, submitApproval } from '@/api/approval'
+import { getUserList } from '@/api/system/user'
+import { addApprovalUser } from '@/api/system/process'
+/**
+ * 审批弹窗
+ */
+const props = defineProps({
+  /**
+   * 提示文字
+   */
+  title: {
+    type: String,
+    default: '审批操作',
+  },
+  // 流程最后一个节点的名字
+  lastName: {
+    type: String,
+    required: true,
+  },
+  approvalModule: { // 审批的菜单模块
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['onSuccess', 'refuse', 'reject'])
+// 弹窗显示状态
+const dialogVisible = ref(false)
+// 默认表单
+const defaultFormData = {
+  type: '', // 审批类型
+  taskId: '', // 任务id
+  comments: '', // 备注
+  user: '', // 当前用户
+  approvalTime: '', // 当前时间
+  id: '',
+  userList: [] as any,
+  processId: '',
+}
+// 弹窗类型 agree同意 refuse拒绝 reject驳回 revoke取消
+const type = ref('agree')
+// 表单数据对象
+const formData = reactive({ ...defaultFormData })
+// 是否展示 下一节点审批节点 审批人
+const isShowUser = ref(false)
+// 保存按钮加载状态
+const btnLoading = ref(false)
+
+// agree同意 refuse拒绝 reject驳回 revoke取消
+const userInfo = useUserStore()
+
+// ---------------表单提交--------------------------------
+// 表单对象
+const dataFormRef = ref<FormInstance>()
+// 校验规则
+const rules: FormRules = reactive({
+  comments: [{ required: true, message: '审批结论必填', trigger: ['blur', 'change'] }],
+  userList: [{ required: true, message: '节点审批人必选', trigger: ['blur', 'change'] }],
+})
+/**
+ * 初始化审批弹窗
+ * @param type 审批类型
+ * @param taskId 任务id
+ * @param id 列表id
+ */
+function initDialog(type: string, taskId: string, id?: string, processId?: string) {
+  console.log('流程实例id--processId', processId)
+  if (type === 'agree') { // 同意的时候判断是否显示选择下一个节点审批人
+    isShowUser.value = true
+    getApprovalRecord(processId!)
+  }
+
+  formData.type = type
+  formData.taskId = taskId
+  formData.user = userInfo.name
+  formData.approvalTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  formData.userList = []
+  formData.processId = processId!
+  formData.comments = ''
+  formData.id = id!
+  dialogVisible.value = true
+}
+// 提交表单
+function submitForm() {
+  if (dataFormRef) {
+    dataFormRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        if (formData.userList.includes(userInfo.id)) {
+          ElMessage.warning('下一节点审批人不能含有当前用户')
+          return
+        }
+        btnLoading.value = true
+        if (formData.type === 'agree') {
+          const agree = () => {
+            submitApproval(formData.type, { taskId: formData.taskId, comments: formData.comments }).then((res) => {
+              ElMessage.success('审批完成')
+              btnLoading.value = false
+              dialogVisible.value = false
+              emit('onSuccess')
+            }).catch((_) => {
+              btnLoading.value = false
+            })
+          }
+
+          if (isShowUser.value) {
+            addApprovalUser({
+              assignees: formData.userList,
+              processInstanceId: formData.processId,
+            }).then(() => {
+              agree()
+            })
+          }
+          else {
+            agree()
+          }
+        }
+        else if (formData.type === 'reject') {
+          dialogVisible.value = false
+          btnLoading.value = false
+          emit('reject', formData.comments, formData.taskId, formData.id)
+        }
+        else if (formData.type === 'refuse') {
+          dialogVisible.value = false
+          btnLoading.value = false
+          emit('refuse', formData.comments, formData.taskId, formData.id)
+        }
+      }
+    })
+  }
+}
+// 关闭弹窗
+function handleClose() {
+  dialogVisible.value = false
+}
+
+// 获取审批记录 根据当前节点判断显示 审批人选择
+function getApprovalRecord(processId: string) {
+  fetchApproval(processId).then((res) => {
+    console.log(res.data, 'res')
+    if (res.data.length) {
+      const data = res.data[res.data.length - 1]
+      if (data.length) {
+        console.log('最后一个审批人名字', data[data.length - 1].taskName)
+        console.log('config文件里面定义的最后一个审批人的名字', props.lastName)
+        console.log('是否显示选择下一个节点审批人表单', !(data[data.length - 1].taskName === props.lastName))
+        if (data[data.length - 1].taskName === props.lastName) {
+          isShowUser.value = false
+        }
+      }
+    }
+  })
+}
+
+// 获取审批人
+const userList = ref<any[]>([])
+const fetchDict = () => {
+  // getUserList({ offset: 1, limit: 99999 }).then((res) => {
+  //   userList.value = res.data.rows
+  // })
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+}
+fetchDict()
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <div class="approval-dialog">
+    <el-dialog
+      v-model="dialogVisible"
+      title="审批操作"
+      width="700"
+      :before-close="handleClose"
+    >
+      <el-form
+        ref="dataFormRef"
+        label-position="left"
+        label-width="140px"
+        :model="formData"
+        :rules="rules"
+      >
+        <el-row :gutter="24">
+          <el-col :span="24">
+            <el-form-item label="审批意见:">
+              <el-radio-group v-model="formData.type" disabled>
+                <el-radio label="agree" size="large">
+                  同意
+                </el-radio>
+                <el-radio label="reject" size="large">
+                  驳回
+                </el-radio>
+                <el-radio label="refuse" size="large">
+                  拒绝
+                </el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="24">
+            <el-form-item label="审批结论:" prop="comments">
+              <el-input
+                v-model="formData.comments"
+                :rows="4"
+                show-word-limit
+                type="textarea"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row v-if="isShowUser && formData.type === 'agree'" :gutter="24">
+          <el-col :span="24">
+            <el-form-item label="下一节点审批人:" prop="userList">
+              <el-select v-model="formData.userList" filterable multiple placeholder="审批人" style="width: 100%;">
+                <el-option v-for="(item) in userList" :key="item.id" :label="item.name" :value="item.id">
+                  <span style="float: left;">{{ item.name }}</span>
+                  <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.deptName }}</span>
+                </el-option>
+              </el-select>
+              <div v-if="props.approvalModule === 'fileApproval'" style="color: red;font-size: 11px;">
+                <span v-if="isShowUser">***注意：《作业指导书》请选择专业组长审核；程序文件、质量手册等选择质量负责人审核***</span>
+                <span v-if="!isShowUser">***注意：《作业指导书》请选择技术负责人；程序文件、质量手册等选择主任审核***</span>
+              </div>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="12">
+            <el-form-item label="审批人:">
+              <el-input
+                v-model="formData.user"
+                placeholder="审批人"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="审批时间:">
+              <el-input
+                v-model="formData.approvalTime"
+                style="width: 100%;"
+                placeholder="审批时间"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <template #footer>
+        <el-button type="primary" :loading="btnLoading" @click="submitForm">
+          提交
+        </el-button>
+        <el-button type="info" @click="handleClose">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<style lang="scss">
+.approval-dialog {
+  .el-radio__label {
+    display: block !important;
+  }
+}
+</style>
diff --git a/src/components/Approval/ApprovalDialogCustom.vue b/src/components/Approval/ApprovalDialogCustom.vue
new file mode 100644
index 0000000..0bda369
--- /dev/null
+++ b/src/components/Approval/ApprovalDialogCustom.vue
@@ -0,0 +1,308 @@
+<script lang="ts" setup name="ApprovalDialog">
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
+import { fetchApproval, submitApproval } from '@/api/approval'
+import { changeWorkbenchApproveStatus } from '@/api/workbench/workbench'
+import { getUserList } from '@/api/system/user'
+import { addApprovalUser } from '@/api/system/process'
+import { certificatePrintByProcess } from '@/api/business/lab/cert'
+/**
+ * 审批弹窗
+ */
+const props = defineProps({
+  /**
+   * 提示文字
+   */
+  title: {
+    type: String,
+    default: '审批操作',
+  },
+  // 流程最后一个节点的名字
+  lastName: {
+    type: String,
+    required: true,
+  },
+})
+const emit = defineEmits(['onSuccess'])
+// 弹窗显示状态
+const dialogVisible = ref(false)
+// 是否展示 下一节点审批节点 审批人
+const isShowUser = ref(false)
+// 默认表单
+const defaultFormData = {
+  type: '', // 审批类型
+  taskId: '', // 任务id
+  comments: '', // 备注
+  user: '', // 当前用户
+  approvalTime: '', // 当前时间
+  userList: [] as any,
+  processId: '',
+}
+// 弹窗类型 agree同意 refuse拒绝 reject驳回 revoke取消
+const type = ref('agree')
+// 表单数据对象
+const formData = reactive({ ...defaultFormData })
+
+// 保存按钮加载状态
+const btnLoading = ref(false)
+
+// agree同意 refuse拒绝 reject驳回 revoke取消
+const userInfo = useUserStore()
+const decisionItem = ref('')
+
+// ---------------表单提交--------------------------------
+// 表单对象
+const dataFormRef = ref<FormInstance>()
+// 校验规则
+const rules: FormRules = reactive({
+  comments: [{ required: true, message: '审批结论必填', trigger: ['blur', 'change'] }],
+  userList: [{ required: true, message: '节点审批人必选', trigger: ['blur', 'change'] }],
+})
+const dataId = ref()
+/**
+ * 初始化审批弹窗
+ * @param type 审批类型
+ * @param taskId 任务id
+ */
+function initDialog(type: string, taskId: string, id: string, decisionItemParam = '1', processId?: string) {
+  console.log('流程实例id--processId', processId)
+  if (type === 'agree') { // 同意的时候判断是否显示选择下一个节点审批人
+    isShowUser.value = true
+    getApprovalRecord(processId!)
+  }
+  dataId.value = id
+  decisionItem.value = `${decisionItemParam}`
+  formData.type = type
+  formData.taskId = taskId
+  formData.user = userInfo.name
+  formData.userList = []
+  formData.approvalTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  formData.comments = ''
+  formData.processId = processId!
+  dialogVisible.value = true
+}
+// 提交表单
+function submitForm() {
+  if (dataFormRef) {
+    dataFormRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        if (formData.userList.includes(userInfo.id)) {
+          ElMessage.warning('下一节点审批人不能含有当前用户')
+          return
+        }
+        btnLoading.value = true
+        const handleApproval = () => {
+          submitApproval(formData.type, { taskId: formData.taskId, comments: formData.comments }).then((res) => {
+            ElMessage.success('审批完成')
+            btnLoading.value = false
+            dialogVisible.value = false
+            emit('onSuccess')
+          }).catch((_) => {
+            btnLoading.value = false
+          })
+        }
+        if (formData.type === 'agree') {
+          if (isShowUser.value) {
+            addApprovalUser({
+              assignees: formData.userList,
+              processInstanceId: formData.processId,
+            }).then(() => {
+              handleApproval()
+            })
+          }
+          else {
+            handleApproval()
+          }
+          certificatePrintByProcess(dataId.value)
+          // .then(() => {
+          //   // ElMessage.success('审批完成')
+          //   btnLoading.value = false
+          //   dialogVisible.value = false
+          //   emit('onSuccess')
+          // })
+        }
+        else {
+          handleApproval()
+        }
+        // 改变总工作台审批提醒的已处理状态
+        if (sessionStorage.getItem('workbenchApproveParams')) {
+          const row = JSON.parse(sessionStorage.getItem('workbenchApproveParams')!)
+          changeWorkbenchApproveStatus({
+            id: row.id,
+            status: 1,
+            businessId: row.businessId,
+            decisionItem: Number(row.decisionItem),
+            formId: row.formId,
+            processId: row.processId,
+            taskId: row.taskId,
+          })
+        }
+        // if (formData.type) {
+        //   submitApproval(formData.type, { taskId: formData.taskId, comments: formData.comments }).then((res) => {
+        //     if (formData.type === 'agree') {
+        //       certificatePrintByProcess(dataId.value).then(() => {
+        //         ElMessage.success('审批完成')
+        //         btnLoading.value = false
+        //         dialogVisible.value = false
+        //         emit('onSuccess')
+        //       })
+        //     }
+        //     else {
+        //       ElMessage.success('审批完成')
+        //       btnLoading.value = false
+        //       dialogVisible.value = false
+        //       emit('onSuccess')
+        //     }
+
+        //     // 改变总工作台审批提醒的已处理状态
+        //     if (sessionStorage.getItem('workbenchApproveParams')) {
+        //       const row = JSON.parse(sessionStorage.getItem('workbenchApproveParams')!)
+        //       changeWorkbenchApproveStatus({
+        //         id: row.id,
+        //         status: 1,
+        //         businessId: row.businessId,
+        //         decisionItem: Number(row.decisionItem),
+        //         formId: row.formId,
+        //         processId: row.processId,
+        //         taskId: row.taskId,
+        //       })
+        //     }
+        //   }).catch((_) => {
+        //     btnLoading.value = false
+        //   })
+        // }
+      }
+    })
+  }
+}
+// 关闭弹窗
+function handleClose() {
+  dialogVisible.value = false
+}
+// 获取审批记录 根据当前节点判断显示 审批人选择
+function getApprovalRecord(processId: string) {
+  fetchApproval(processId).then((res) => {
+    console.log(res.data, 'res')
+    if (res.data.length) {
+      const data = res.data[res.data.length - 1]
+      if (data.length) {
+        console.log('最后一个审批人名字', data[data.length - 1].taskName)
+        console.log('config文件里面定义的最后一个审批人的名字', props.lastName)
+        console.log('是否显示选择下一个节点审批人表单', !(data[data.length - 1].taskName === props.lastName))
+        if (data[data.length - 1].taskName === props.lastName) {
+          isShowUser.value = false
+        }
+      }
+    }
+  })
+}
+
+// 获取审批人
+const userList = ref<any[]>([])
+const fetchDict = () => {
+  // getUserList({ offset: 1, limit: 99999 }).then((res) => {
+  //   userList.value = res.data.rows
+  // })
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+}
+fetchDict()
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    title="审批操作"
+    width="700"
+    :before-close="handleClose"
+  >
+    <el-form
+      ref="dataFormRef"
+      v-loading="btnLoading"
+      label-position="left"
+      label-width="130px"
+      :model="formData"
+      :rules="rules"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见:">
+            <el-radio-group v-model="formData.type" disabled>
+              <el-radio label="agree" size="large">
+                同意
+              </el-radio>
+              <el-radio v-if="decisionItem !== '3'" label="reject" size="large">
+                驳回
+              </el-radio>
+              <el-radio v-if="decisionItem !== '2'" label="refuse" size="large">
+                拒绝
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论:" prop="comments">
+            <el-input
+              v-model="formData.comments"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="isShowUser && formData.type === 'agree'" :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="下一节点审批人:" prop="userList">
+            <el-select v-model="formData.userList" filterable multiple placeholder="审批人" style="width: 100%;">
+              <el-option v-for="(item) in userList" :key="item.id" :label="item.name" :value="item.id">
+                <span style="float: left;">{{ item.name }}</span>
+                <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.deptName }}</span>
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人:">
+            <el-input
+              v-model="formData.user"
+              placeholder="审批人"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间:">
+            <el-input
+              v-model="formData.approvalTime"
+              style="width: 100%;"
+              placeholder="审批时间"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <el-button type="primary" :loading="btnLoading" @click="submitForm">
+        提交
+      </el-button>
+      <el-button type="info" @click="handleClose">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/components/Approval/selectApproverDialog.vue b/src/components/Approval/selectApproverDialog.vue
new file mode 100644
index 0000000..866ef12
--- /dev/null
+++ b/src/components/Approval/selectApproverDialog.vue
@@ -0,0 +1,225 @@
+<!-- 审批人自选--选择审批人 -->
+<script lang="ts" setup name="selectApproverDialog">
+import { ElButton, ElDialog, ElMessage } from 'element-plus'
+import { getUserList } from '@/api/system/user'
+import { toTreeList } from '@/utils/structure'
+import { getDeptTreeList } from '@/api/system/dept'
+
+const props = defineProps({
+  title: {
+    type: String,
+    default: '选择审批人',
+  },
+})
+// ----------------------- 以下是字段定义 emits props ---------------------
+const emits = defineEmits(['closeRefresh', 'confirm'])
+// 对话框是否显示
+const dialogVisible = ref(false)
+const defaultProps = {
+  children: 'children',
+  label: 'name',
+}
+// 查询参数
+const listQuery = reactive({
+  keywords: '',
+  beginTime: '',
+  endTime: '',
+  deptId: '',
+  offset: 1,
+  limit: 20,
+  sort: 'id',
+  deptType: '',
+})
+const list = ref([])
+const checkoutList = ref([])
+const total = ref(0)
+const treeData = ref([])
+const loadingTable = ref<boolean>(false)
+const loadingTree = ref<boolean>(false)
+const columns = [
+  { text: '账号', value: 'account', align: 'center' },
+  { text: '所在组织机构', value: 'deptName', align: 'center' },
+  { text: '真实姓名', value: 'name', align: 'center' },
+  { text: '角色', value: 'roleName', align: 'center' },
+  { text: '手机号', value: 'phone', align: 'center' },
+  { text: '注册时间', value: 'createtime', align: 'center' },
+]
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 获取列表数据
+const fetchData = () => {
+  loadingTable.value = true
+  getUserList(listQuery).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
+}
+
+// 查询数据
+const search = () => {
+  fetchData()
+}
+
+// 重置
+const reset = () => {
+  listQuery.keywords = ''
+  listQuery.beginTime = ''
+  listQuery.endTime = ''
+  listQuery.offset = 1
+  listQuery.limit = 20
+  listQuery.sort = 'id'
+  listQuery.deptType = ''
+  fetchData()
+}
+
+// 点击树形结构
+const handleNodeClick = (data: any) => {
+  listQuery.deptId = data.id as string
+  fetchData()
+}
+
+// 获取组织列表树数据
+const fetchTreeData = () => {
+  loadingTree.value = true
+  getDeptTreeList(listQuery).then((res) => {
+    treeData.value = toTreeList(res.data, '0', true)
+    loadingTree.value = false
+  }).catch(() => {
+    loadingTree.value = false
+  })
+}
+
+// ----------初始化、关闭对话框相关-----------------
+function initDialog() {
+  dialogVisible.value = true
+  // 获取树形结构数据
+  fetchTreeData()
+  // 获取列表数据
+  fetchData()
+}
+
+// 点击确定
+const confirm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请至少选择一个审批人')
+    return false
+  }
+  const ids = checkoutList.value.map((item: { id: string }) => item.id)
+  emits('confirm', ids)
+  dialogClose()
+}
+// 关闭弹窗
+function dialogClose() {
+  dialogVisible.value = false
+}
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    :title="props.title"
+    width="90%"
+    :before-close="dialogClose"
+    append-to-body
+    :open-delay="0"
+    :close-on-click-modal="false"
+  >
+    <div class="container">
+      <!-- 左侧组织机构 -->
+      <div class="left-container">
+        <div class="dept-div">
+          <el-card class="box-card" shadow="always">
+            <template #header>
+              <div class="clearfix">
+                <span>组织机构</span>
+              </div>
+            </template>
+            <el-scrollbar height="520px" class="user-dept-scroll">
+              <el-tree
+                v-loading="loadingTree" :data="treeData" :props="defaultProps" default-expand-all
+                :expand-on-click-node="false" highlight-current @node-click="handleNodeClick"
+              />
+            </el-scrollbar>
+          </el-card>
+        </div>
+      </div>
+      <!-- 右侧表格 -->
+      <div ref="tableContainer" class="table">
+        <!-- 筛选条件 -->
+        <search-area :need-clear="true" @search="search" @clear="reset">
+          <search-item>
+            <el-input v-model.trim="listQuery.keywords" placeholder="账户/真实姓名/手机号" clearable />
+          </search-item>
+          <search-item>
+            <el-date-picker
+              v-model="listQuery.beginTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="选择开始时间"
+            />
+          </search-item>
+          <search-item>
+            <el-date-picker
+              v-model="listQuery.endTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="选择结束时间"
+            />
+          </search-item>
+        </search-area>
+        <!-- 表头标题 -->
+        <table-container :title-show="false">
+          <normal-table
+            :data="list" :total="total" :columns="columns" :query="listQuery"
+            :list-loading="loadingTable" is-showmulti-select
+            :height="520"
+            @change="changePage"
+            @multi-select="handleSelectionChange"
+          >
+            <template #preColumns>
+              <el-table-column label="#" width="55" align="center">
+                <template #default="scope">
+                  {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+                </template>
+              </el-table-column>
+            </template>
+          </normal-table>
+        </table-container>
+      </div>
+    </div>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="confirm">
+          确定
+        </el-button>
+        <el-button @click="dialogClose">
+          取消
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.container {
+  width: 100%;
+  display: flex;
+
+  .left-container {
+    width: 22%;
+  }
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
+
+  .table {
+    width: 78%;
+  }
+}
+</style>
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 2ea30d3..b76a306 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -133,7 +133,17 @@
       return
     }
   }
-  if (!approverConfig.value.noHanderAction) {
+  // 审批人自选
+  else if (approverConfig.value.settype === 4) {
+    if (!approverConfig.value.tempExamineMode) {
+      ElMessage({
+        message: '请选择审批方式',
+        type: 'warning',
+      })
+      return
+    }
+  }
+  if (approverConfig.value.settype !== 4 && !approverConfig.value.noHanderAction) {
     ElMessage({
       message: '审批人为空的选项不能为空',
       type: 'warning',
@@ -202,6 +212,9 @@
         <el-radio :label="7" :disabled="disabledVal === '0'">
           连续多级主管
         </el-radio>
+        <el-radio :label="4">
+          审批人自选
+        </el-radio>
       </el-radio-group>
       <!-- 选择好的成员或者角色 -->
       <p v-if="approverConfig && approverConfig.nodeUserList && approverConfig.nodeUserList.length" class="selected_list">
@@ -240,10 +253,10 @@
       </div>
 
       <!-- 审批方式 -->
-      <h5 v-if="approverConfig.settype === 2 || approverConfig.settype === 11 || (approverConfig.settype === 1 && approverConfig && approverConfig.nodeUserList && approverConfig.nodeUserList.length > 1)" class="add-person">
+      <h5 v-if="approverConfig.settype === 4 ||approverConfig.settype === 2 || approverConfig.settype === 11 || (approverConfig.settype === 1 && approverConfig && approverConfig.nodeUserList && approverConfig.nodeUserList.length > 1)" class="add-person">
         多人审批时采用的审批方式
       </h5>
-      <el-radio-group v-if="approverConfig.settype === 2 || approverConfig.settype === 11 || (approverConfig.settype === 1 && approverConfig && approverConfig.nodeUserList && approverConfig.nodeUserList.length > 1)" v-model="approverConfig.tempExamineMode" style="width: 100%;margin-bottom: 16px;">
+      <el-radio-group v-if="approverConfig.settype === 4 ||approverConfig.settype === 2 || approverConfig.settype === 11 || (approverConfig.settype === 1 && approverConfig && approverConfig.nodeUserList && approverConfig.nodeUserList.length > 1)" v-model="approverConfig.tempExamineMode" style="width: 100%;margin-bottom: 16px;">
         <el-radio :label="2">
           会签（需所有审批人同意）
         </el-radio>
@@ -270,10 +283,10 @@
       </div>
 
       <!-- 审批为空时 -->
-      <h5 class="add-person">
+      <h5 v-if="approverConfig.settype !== 4" class="add-person">
         审批人为空时
       </h5>
-      <el-radio-group v-model="approverConfig.noHanderAction" style="width: 100%;margin-bottom: 16px;">
+      <el-radio-group v-if="approverConfig.settype !== 4" v-model="approverConfig.noHanderAction" style="width: 100%;margin-bottom: 16px;">
         <el-radio :label="1">
           自动审批通过
         </el-radio>
diff --git a/src/plugins/preload.ts b/src/plugins/preload.ts
index a4cc107..9873f6c 100644
--- a/src/plugins/preload.ts
+++ b/src/plugins/preload.ts
@@ -53,6 +53,9 @@
     else if (nodeConfig.settype == 7) {
       return `从直接主管到通讯录中级别最高的第${nodeConfig.examineEndDirectorLevel}个层级主管`
     }
+    else if (nodeConfig.settype == 4) {
+      return '审批人自选'
+    }
   },
   dealStr(str: any, obj: any) {
     const arr = [] as any
diff --git a/src/views/business/lab/measureData/measureDataDetail.vue b/src/views/business/lab/measureData/measureDataDetail.vue
index 5ff18a9..19dfd61 100644
--- a/src/views/business/lab/measureData/measureDataDetail.vue
+++ b/src/views/business/lab/measureData/measureDataDetail.vue
@@ -14,14 +14,15 @@
 import type { IEquipmentList, IForm, ISampleList } from './measureData-interface'
 import selectMeasueDataDialog from './dialog/selectMeasueDataDialog.vue'
 import selectTechFilesDialog from './dialog/selectTechFilesDialog.vue'
+import selectApproverDialog from '@/components/Approval/selectApproverDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
 import { getCustomerList } from '@/api/customer/customer'
 import { getPhotoUrl, listPageApi } from '@/api/system/tool'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { UploadFile } from '@/api/measure/file'
 import { updateSample } from '@/api/customer/sampleList'
 import { getStaffList } from '@/api/measure/person'
-// import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-import ApprovalDialog from '@/components/Approval/ApprovalDialogByProcess.vue'
+// import ApprovalDialog from '@/components/Approval/ApprovalDialogByProcess.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { addMeasureData, downLoadTemplate, draftUpdateMeasureData, failUpdateMeasureData, getMeasureDataDetail, submit } from '@/api/business/lab/measureData'
 import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
@@ -33,7 +34,7 @@
 import type { dictType } from '@/global'
 import { getOrderDetail } from '@/api/business/schedule/order'
 import { exportFile } from '@/utils/exportUtils'
-import { logout } from '@/api/system/login'
+import customApproval from '/public/config/customApproval.json'
 
 const user = useUserStore() // 用户信息
 const textMap: { [key: string]: string } = {
@@ -547,44 +548,42 @@
 }
 
 // 获取详情信息
-function getDetail(id?: string, certificateReportCode?: string) {
+async function getDetail(id?: string, certificateReportCode?: string) {
   const loading = ElLoading.service({
     lock: true,
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  getMeasureDataDetail({ id: infoId.value! || id! }).then((res) => {
-    loading.close()
-    form.value = res.data
-    fileList.value = res.data.fileList // 依据的技术文件
-    if (Array.isArray(res.data.fileList)) {
-      form.value.techFilesName = fileList.value.map((item: { fileName: string }) => item.fileName).join(',')
+  const res = await getMeasureDataDetail({ id: infoId.value! || id! })
+  loading.close()
+  form.value = res.data
+  form.value.processId = ''
+  fileList.value = res.data.fileList // 依据的技术文件
+  if (Array.isArray(res.data.fileList)) {
+    form.value.techFilesName = fileList.value.map((item: { fileName: string }) => item.fileName).join(',')
+  }
+  sampleList.value = [{
+    sampleNo: res.data.sampleNo, // 样品编号
+    sampleName: res.data.sampleName, // 样品名称
+    sampleModel: res.data.sampleModel, // 型号
+    manufacturingNo: res.data.manufacturingNo, // 出厂编号
+    manufacturer: res.data.manufacturer, // 生产厂家
+    remark: res.data.sampleRemark, // 备注
+    id: res.data.sampleId,
+  }]
+  equipmentInfoList.value = res.data.equipmentInfoList.map((item: { validDate: string }) => {
+    return {
+      ...item,
+      validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
     }
-    sampleList.value = [{
-      sampleNo: res.data.sampleNo, // 样品编号
-      sampleName: res.data.sampleName, // 样品名称
-      sampleModel: res.data.sampleModel, // 型号
-      manufacturingNo: res.data.manufacturingNo, // 出厂编号
-      manufacturer: res.data.manufacturer, // 生产厂家
-      remark: res.data.sampleRemark, // 备注
-      id: res.data.sampleId,
-    }]
-    equipmentInfoList.value = res.data.equipmentInfoList.map((item: { validDate: string }) => {
-      return {
-        ...item,
-        validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
-      }
-    }) // 所用的计量标准器具
+  }) // 所用的计量标准器具
 
-    businessEnvironmentRecord.value = res.data.businessEnvironmentRecord // 环境记录单数据
-    form.value.environmentCode = res.data.businessEnvironmentRecord.environmentCode// 环境记录单编号
-    if (id && certificateReportCode) {
-      form.value.oldCertificateCode = certificateReportCode
-      form.value.invalid = 1
-      form.value.measurePerson = user.name // 检定员名字
-    }
-  }).catch(() => {
-    loading.close()
-  })
+  businessEnvironmentRecord.value = res.data.businessEnvironmentRecord // 环境记录单数据
+  form.value.environmentCode = res.data.businessEnvironmentRecord.environmentCode// 环境记录单编号
+  if (id && certificateReportCode) {
+    form.value.oldCertificateCode = certificateReportCode
+    form.value.invalid = 1
+    form.value.measurePerson = user.name // 检定员名字
+  }
 }
 
 // 关闭新增页面的回调
@@ -643,6 +642,11 @@
 
       else if (pageType.value === 'edit' || (pageType.value === 'add' && infoId.value)) { // 编辑
         if (query.approvalStatusName === '未通过-驳回') { // 未通过-驳回
+          const param = {
+            ...params,
+            processId: form.value.processId,
+            // assignees: approverList,
+          }
           failUpdateMeasureData(params).then((res) => {
             handleUpdateSample()
             ElMessage.success('保存成功')
@@ -664,29 +668,53 @@
     }
   })
 }
+// -----------------------------------提交-------------------------------------------------------
+const selectApproverRef = ref() // 审批人自选组件ref
+// 选好审批人
+const confirmSelectApprover = async (approverList: string[] = []) => {
+  if (!approverList.length) {
+    ElMessage.warning('无审批人，无法提交！')
+    return false
+  }
+  console.log('审批人', approverList)
+  console.log('processId', form.value.processId)
 
-// 提交
+  if (form.value === null || form.value.processId === undefined || form.value.processId === '') {
+    // 流程id为空 表示还未进入流程中 直接提交
+
+    ElMessageBox.confirm(`是否提交计量数据管理 ${form.value.certificateReportCode}-${form.value.certificateReportName}`, '提示', {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    }).then(() => {
+      if (submitId.value) {
+        const loading = ElLoading.service({
+          lock: true,
+          background: 'rgba(255, 255, 255, 0.8)',
+        })
+        const params = {
+          id: submitId.value,
+          formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS, // 表单id
+          assignees: approverList,
+          processId: form.value.processId,
+        }
+        submit(params).then(() => {
+          ElMessage.success('提交成功')
+          loading.close()
+          close()
+        }).catch(() => {
+          loading.close()
+        })
+      }
+      else {
+        ElMessage.warning('请先保存！')
+      }
+    })
+  }
+}
+// 提交按钮
 const handleSubmit = () => {
-  if (submitId.value) {
-    const loading = ElLoading.service({
-      lock: true,
-      background: 'rgba(255, 255, 255, 0.8)',
-    })
-    const params = {
-      id: submitId.value,
-      formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS, // 表单id
-    }
-    submit(params).then(() => {
-      ElMessage.success('提交成功')
-      loading.close()
-      close()
-    }).catch(() => {
-      loading.close()
-    })
-  }
-  else {
-    ElMessage.warning('请先保存！')
-  }
+  selectApproverRef.value.initDialog()
 }
 
 // ------------------------------------------审批-----------------------------------------
@@ -737,7 +765,7 @@
   }
 
   else if (val === '同意') {
-    approvalDialog.value.initDialog('agree', query.taskId, infoId.value, query.decisionItem)
+    approvalDialog.value.initDialog('agree', query.taskId, infoId.value, query.decisionItem, form.value.processId)
   }
   else if (val === '驳回') {
     approvalDialog.value.initDialog('reject', query.taskId, infoId.value, query.decisionItem)
@@ -802,7 +830,11 @@
   await getDict()
   form.value.processId = query.processId as string // 流程实例
   if (pageType.value !== 'add') { // 编辑、详情
-    getDetail()
+    getDetail().then(() => {
+      nextTick(() => {
+        form.value.processId = query.processId as string // 流程实例
+      })
+    })
     if (query.approvalStatusName !== '草稿箱') {
       getApprovalRecord(form.value.processId) // 获取审批流程
     }
@@ -1005,7 +1037,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="12">
             <el-form-item label="证书单位名称:" prop="certificationCompany">
               <el-input
                 v-model.trim="form.certificationCompany"
@@ -1321,7 +1353,9 @@
     <!-- 样品增加弹窗 -->
     <!-- <select-sample v-model:visible="sampleVisible" :is-use-customer-no="false" :is-multi="isMulti" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" /> -->
     <!-- 审批弹窗 -->
-    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <approval-dialog ref="approvalDialog" :last-name="customApproval.approvalLastName.measureData" @onSuccess="approvalSuccess" />
+    <!-- 选择审批人弹窗 -->
+    <select-approver-dialog ref="selectApproverRef" @confirm="confirmSelectApprover" />
     <!-- 选择委托单组件 -->
     <select-order v-model:visible="orderVisible" @confirm-checkout="confirmCheckoutOrder" @change-visible="changeOrderVisible" />
     <!-- 选择环境记录单弹窗 -->

diff --git a/public/config/customApproval.json b/public/config/customApproval.json
new file mode 100644
index 0000000..f791343
--- /dev/null
+++ b/public/config/customApproval.json
@@ -0,0 +1,7 @@
+{
+  "approvalLastName--Describe": "审批流程最后一个节点的名字，用来判断审批自选的时候是否是最后一个节点",
+  "approvalLastName": {
+    "measureData--Describe": "计量数据管理",
+    "measureData": "审批人"
+  }
+}
diff --git a/src/api/system/process.ts b/src/api/system/process.ts
index c2d4419..6bef77b 100644
--- a/src/api/system/process.ts
+++ b/src/api/system/process.ts
@@ -121,3 +121,11 @@
     data,
   })
 }
+// 动态添加审批人
+export function addApprovalUser(data: object) {
+  return request({
+    url: '/approval/operate/addTaskApprover',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components.d.ts b/src/components.d.ts
index 6cd708a..fde4221 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -13,6 +13,8 @@
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
     ApprovalDialogByProcess: typeof import('./components/Approval/ApprovalDialogByProcess.vue')['default']
+    ApprovalDialogCustom: typeof import('./components/Approval/ApprovalDialogCustom.vue')['default']
+    'ApprovalDialogCustom copy': typeof import('./components/Approval/ApprovalDialogCustom copy.vue')['default']
     ApprovalRecord: typeof import('./components/ApprovalRecord/ApprovalRecord.vue')['default']
     ApprovalRecordTable: typeof import('./components/ApprovalRecord/ApprovalRecordTable.vue')['default']
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
@@ -27,6 +29,7 @@
     CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default']
     CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
+    copy: typeof import('./components/Approval/ApprovalDialogCustom copy.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
@@ -64,6 +67,7 @@
     SearchArea: typeof import('./components/SearchArea/index.vue')['default']
     SearchBar: typeof import('./components/SearchBar/index.vue')['default']
     SearchItem: typeof import('./components/SearchArea/SearchItem.vue')['default']
+    SelectApproverDialog: typeof import('./components/Approval/selectApproverDialog.vue')['default']
     SelectEmployeesDialog: typeof import('./components/dialog/selectEmployeesDialog.vue')['default']
     SelectRoleDialog: typeof import('./components/dialog/selectRoleDialog.vue')['default']
     SelectStaffDialog: typeof import('./components/dialog/selectStaffDialog.vue')['default']
diff --git a/src/components/Approval/ApprovalDialogCustom copy.vue b/src/components/Approval/ApprovalDialogCustom copy.vue
new file mode 100644
index 0000000..d2f3dac
--- /dev/null
+++ b/src/components/Approval/ApprovalDialogCustom copy.vue
@@ -0,0 +1,274 @@
+<!-- 审批弹窗-审批人自选使用 -->
+<script lang="ts" setup name="ApprovalDialogCustom">
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
+import { fetchApproval, submitApproval } from '@/api/approval'
+import { getUserList } from '@/api/system/user'
+import { addApprovalUser } from '@/api/system/process'
+/**
+ * 审批弹窗
+ */
+const props = defineProps({
+  /**
+   * 提示文字
+   */
+  title: {
+    type: String,
+    default: '审批操作',
+  },
+  // 流程最后一个节点的名字
+  lastName: {
+    type: String,
+    required: true,
+  },
+  approvalModule: { // 审批的菜单模块
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['onSuccess', 'refuse', 'reject'])
+// 弹窗显示状态
+const dialogVisible = ref(false)
+// 默认表单
+const defaultFormData = {
+  type: '', // 审批类型
+  taskId: '', // 任务id
+  comments: '', // 备注
+  user: '', // 当前用户
+  approvalTime: '', // 当前时间
+  id: '',
+  userList: [] as any,
+  processId: '',
+}
+// 弹窗类型 agree同意 refuse拒绝 reject驳回 revoke取消
+const type = ref('agree')
+// 表单数据对象
+const formData = reactive({ ...defaultFormData })
+// 是否展示 下一节点审批节点 审批人
+const isShowUser = ref(false)
+// 保存按钮加载状态
+const btnLoading = ref(false)
+
+// agree同意 refuse拒绝 reject驳回 revoke取消
+const userInfo = useUserStore()
+
+// ---------------表单提交--------------------------------
+// 表单对象
+const dataFormRef = ref<FormInstance>()
+// 校验规则
+const rules: FormRules = reactive({
+  comments: [{ required: true, message: '审批结论必填', trigger: ['blur', 'change'] }],
+  userList: [{ required: true, message: '节点审批人必选', trigger: ['blur', 'change'] }],
+})
+/**
+ * 初始化审批弹窗
+ * @param type 审批类型
+ * @param taskId 任务id
+ * @param id 列表id
+ */
+function initDialog(type: string, taskId: string, id?: string, processId?: string) {
+  console.log('流程实例id--processId', processId)
+  if (type === 'agree') { // 同意的时候判断是否显示选择下一个节点审批人
+    isShowUser.value = true
+    getApprovalRecord(processId!)
+  }
+
+  formData.type = type
+  formData.taskId = taskId
+  formData.user = userInfo.name
+  formData.approvalTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  formData.userList = []
+  formData.processId = processId!
+  formData.comments = ''
+  formData.id = id!
+  dialogVisible.value = true
+}
+// 提交表单
+function submitForm() {
+  if (dataFormRef) {
+    dataFormRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        if (formData.userList.includes(userInfo.id)) {
+          ElMessage.warning('下一节点审批人不能含有当前用户')
+          return
+        }
+        btnLoading.value = true
+        if (formData.type === 'agree') {
+          const agree = () => {
+            submitApproval(formData.type, { taskId: formData.taskId, comments: formData.comments }).then((res) => {
+              ElMessage.success('审批完成')
+              btnLoading.value = false
+              dialogVisible.value = false
+              emit('onSuccess')
+            }).catch((_) => {
+              btnLoading.value = false
+            })
+          }
+
+          if (isShowUser.value) {
+            addApprovalUser({
+              assignees: formData.userList,
+              processInstanceId: formData.processId,
+            }).then(() => {
+              agree()
+            })
+          }
+          else {
+            agree()
+          }
+        }
+        else if (formData.type === 'reject') {
+          dialogVisible.value = false
+          btnLoading.value = false
+          emit('reject', formData.comments, formData.taskId, formData.id)
+        }
+        else if (formData.type === 'refuse') {
+          dialogVisible.value = false
+          btnLoading.value = false
+          emit('refuse', formData.comments, formData.taskId, formData.id)
+        }
+      }
+    })
+  }
+}
+// 关闭弹窗
+function handleClose() {
+  dialogVisible.value = false
+}
+
+// 获取审批记录 根据当前节点判断显示 审批人选择
+function getApprovalRecord(processId: string) {
+  fetchApproval(processId).then((res) => {
+    console.log(res.data, 'res')
+    if (res.data.length) {
+      const data = res.data[res.data.length - 1]
+      if (data.length) {
+        console.log('最后一个审批人名字', data[data.length - 1].taskName)
+        console.log('config文件里面定义的最后一个审批人的名字', props.lastName)
+        console.log('是否显示选择下一个节点审批人表单', !(data[data.length - 1].taskName === props.lastName))
+        if (data[data.length - 1].taskName === props.lastName) {
+          isShowUser.value = false
+        }
+      }
+    }
+  })
+}
+
+// 获取审批人
+const userList = ref<any[]>([])
+const fetchDict = () => {
+  // getUserList({ offset: 1, limit: 99999 }).then((res) => {
+  //   userList.value = res.data.rows
+  // })
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+}
+fetchDict()
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <div class="approval-dialog">
+    <el-dialog
+      v-model="dialogVisible"
+      title="审批操作"
+      width="700"
+      :before-close="handleClose"
+    >
+      <el-form
+        ref="dataFormRef"
+        label-position="left"
+        label-width="140px"
+        :model="formData"
+        :rules="rules"
+      >
+        <el-row :gutter="24">
+          <el-col :span="24">
+            <el-form-item label="审批意见:">
+              <el-radio-group v-model="formData.type" disabled>
+                <el-radio label="agree" size="large">
+                  同意
+                </el-radio>
+                <el-radio label="reject" size="large">
+                  驳回
+                </el-radio>
+                <el-radio label="refuse" size="large">
+                  拒绝
+                </el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="24">
+            <el-form-item label="审批结论:" prop="comments">
+              <el-input
+                v-model="formData.comments"
+                :rows="4"
+                show-word-limit
+                type="textarea"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row v-if="isShowUser && formData.type === 'agree'" :gutter="24">
+          <el-col :span="24">
+            <el-form-item label="下一节点审批人:" prop="userList">
+              <el-select v-model="formData.userList" filterable multiple placeholder="审批人" style="width: 100%;">
+                <el-option v-for="(item) in userList" :key="item.id" :label="item.name" :value="item.id">
+                  <span style="float: left;">{{ item.name }}</span>
+                  <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.deptName }}</span>
+                </el-option>
+              </el-select>
+              <div v-if="props.approvalModule === 'fileApproval'" style="color: red;font-size: 11px;">
+                <span v-if="isShowUser">***注意：《作业指导书》请选择专业组长审核；程序文件、质量手册等选择质量负责人审核***</span>
+                <span v-if="!isShowUser">***注意：《作业指导书》请选择技术负责人；程序文件、质量手册等选择主任审核***</span>
+              </div>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="12">
+            <el-form-item label="审批人:">
+              <el-input
+                v-model="formData.user"
+                placeholder="审批人"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="审批时间:">
+              <el-input
+                v-model="formData.approvalTime"
+                style="width: 100%;"
+                placeholder="审批时间"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <template #footer>
+        <el-button type="primary" :loading="btnLoading" @click="submitForm">
+          提交
+        </el-button>
+        <el-button type="info" @click="handleClose">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<style lang="scss">
+.approval-dialog {
+  .el-radio__label {
+    display: block !important;
+  }
+}
+</style>
diff --git a/src/components/Approval/ApprovalDialogCustom.vue b/src/components/Approval/ApprovalDialogCustom.vue
new file mode 100644
index 0000000..0bda369
--- /dev/null
+++ b/src/components/Approval/ApprovalDialogCustom.vue
@@ -0,0 +1,308 @@
+<script lang="ts" setup name="ApprovalDialog">
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
+import { fetchApproval, submitApproval } from '@/api/approval'
+import { changeWorkbenchApproveStatus } from '@/api/workbench/workbench'
+import { getUserList } from '@/api/system/user'
+import { addApprovalUser } from '@/api/system/process'
+import { certificatePrintByProcess } from '@/api/business/lab/cert'
+/**
+ * 审批弹窗
+ */
+const props = defineProps({
+  /**
+   * 提示文字
+   */
+  title: {
+    type: String,
+    default: '审批操作',
+  },
+  // 流程最后一个节点的名字
+  lastName: {
+    type: String,
+    required: true,
+  },
+})
+const emit = defineEmits(['onSuccess'])
+// 弹窗显示状态
+const dialogVisible = ref(false)
+// 是否展示 下一节点审批节点 审批人
+const isShowUser = ref(false)
+// 默认表单
+const defaultFormData = {
+  type: '', // 审批类型
+  taskId: '', // 任务id
+  comments: '', // 备注
+  user: '', // 当前用户
+  approvalTime: '', // 当前时间
+  userList: [] as any,
+  processId: '',
+}
+// 弹窗类型 agree同意 refuse拒绝 reject驳回 revoke取消
+const type = ref('agree')
+// 表单数据对象
+const formData = reactive({ ...defaultFormData })
+
+// 保存按钮加载状态
+const btnLoading = ref(false)
+
+// agree同意 refuse拒绝 reject驳回 revoke取消
+const userInfo = useUserStore()
+const decisionItem = ref('')
+
+// ---------------表单提交--------------------------------
+// 表单对象
+const dataFormRef = ref<FormInstance>()
+// 校验规则
+const rules: FormRules = reactive({
+  comments: [{ required: true, message: '审批结论必填', trigger: ['blur', 'change'] }],
+  userList: [{ required: true, message: '节点审批人必选', trigger: ['blur', 'change'] }],
+})
+const dataId = ref()
+/**
+ * 初始化审批弹窗
+ * @param type 审批类型
+ * @param taskId 任务id
+ */
+function initDialog(type: string, taskId: string, id: string, decisionItemParam = '1', processId?: string) {
+  console.log('流程实例id--processId', processId)
+  if (type === 'agree') { // 同意的时候判断是否显示选择下一个节点审批人
+    isShowUser.value = true
+    getApprovalRecord(processId!)
+  }
+  dataId.value = id
+  decisionItem.value = `${decisionItemParam}`
+  formData.type = type
+  formData.taskId = taskId
+  formData.user = userInfo.name
+  formData.userList = []
+  formData.approvalTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  formData.comments = ''
+  formData.processId = processId!
+  dialogVisible.value = true
+}
+// 提交表单
+function submitForm() {
+  if (dataFormRef) {
+    dataFormRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        if (formData.userList.includes(userInfo.id)) {
+          ElMessage.warning('下一节点审批人不能含有当前用户')
+          return
+        }
+        btnLoading.value = true
+        const handleApproval = () => {
+          submitApproval(formData.type, { taskId: formData.taskId, comments: formData.comments }).then((res) => {
+            ElMessage.success('审批完成')
+            btnLoading.value = false
+            dialogVisible.value = false
+            emit('onSuccess')
+          }).catch((_) => {
+            btnLoading.value = false
+          })
+        }
+        if (formData.type === 'agree') {
+          if (isShowUser.value) {
+            addApprovalUser({
+              assignees: formData.userList,
+              processInstanceId: formData.processId,
+            }).then(() => {
+              handleApproval()
+            })
+          }
+          else {
+            handleApproval()
+          }
+          certificatePrintByProcess(dataId.value)
+          // .then(() => {
+          //   // ElMessage.success('审批完成')
+          //   btnLoading.value = false
+          //   dialogVisible.value = false
+          //   emit('onSuccess')
+          // })
+        }
+        else {
+          handleApproval()
+        }
+        // 改变总工作台审批提醒的已处理状态
+        if (sessionStorage.getItem('workbenchApproveParams')) {
+          const row = JSON.parse(sessionStorage.getItem('workbenchApproveParams')!)
+          changeWorkbenchApproveStatus({
+            id: row.id,
+            status: 1,
+            businessId: row.businessId,
+            decisionItem: Number(row.decisionItem),
+            formId: row.formId,
+            processId: row.processId,
+            taskId: row.taskId,
+          })
+        }
+        // if (formData.type) {
+        //   submitApproval(formData.type, { taskId: formData.taskId, comments: formData.comments }).then((res) => {
+        //     if (formData.type === 'agree') {
+        //       certificatePrintByProcess(dataId.value).then(() => {
+        //         ElMessage.success('审批完成')
+        //         btnLoading.value = false
+        //         dialogVisible.value = false
+        //         emit('onSuccess')
+        //       })
+        //     }
+        //     else {
+        //       ElMessage.success('审批完成')
+        //       btnLoading.value = false
+        //       dialogVisible.value = false
+        //       emit('onSuccess')
+        //     }
+
+        //     // 改变总工作台审批提醒的已处理状态
+        //     if (sessionStorage.getItem('workbenchApproveParams')) {
+        //       const row = JSON.parse(sessionStorage.getItem('workbenchApproveParams')!)
+        //       changeWorkbenchApproveStatus({
+        //         id: row.id,
+        //         status: 1,
+        //         businessId: row.businessId,
+        //         decisionItem: Number(row.decisionItem),
+        //         formId: row.formId,
+        //         processId: row.processId,
+        //         taskId: row.taskId,
+        //       })
+        //     }
+        //   }).catch((_) => {
+        //     btnLoading.value = false
+        //   })
+        // }
+      }
+    })
+  }
+}
+// 关闭弹窗
+function handleClose() {
+  dialogVisible.value = false
+}
+// 获取审批记录 根据当前节点判断显示 审批人选择
+function getApprovalRecord(processId: string) {
+  fetchApproval(processId).then((res) => {
+    console.log(res.data, 'res')
+    if (res.data.length) {
+      const data = res.data[res.data.length - 1]
+      if (data.length) {
+        console.log('最后一个审批人名字', data[data.length - 1].taskName)
+        console.log('config文件里面定义的最后一个审批人的名字', props.lastName)
+        console.log('是否显示选择下一个节点审批人表单', !(data[data.length - 1].taskName === props.lastName))
+        if (data[data.length - 1].taskName === props.lastName) {
+          isShowUser.value = false
+        }
+      }
+    }
+  })
+}
+
+// 获取审批人
+const userList = ref<any[]>([])
+const fetchDict = () => {
+  // getUserList({ offset: 1, limit: 99999 }).then((res) => {
+  //   userList.value = res.data.rows
+  // })
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+}
+fetchDict()
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    title="审批操作"
+    width="700"
+    :before-close="handleClose"
+  >
+    <el-form
+      ref="dataFormRef"
+      v-loading="btnLoading"
+      label-position="left"
+      label-width="130px"
+      :model="formData"
+      :rules="rules"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见:">
+            <el-radio-group v-model="formData.type" disabled>
+              <el-radio label="agree" size="large">
+                同意
+              </el-radio>
+              <el-radio v-if="decisionItem !== '3'" label="reject" size="large">
+                驳回
+              </el-radio>
+              <el-radio v-if="decisionItem !== '2'" label="refuse" size="large">
+                拒绝
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论:" prop="comments">
+            <el-input
+              v-model="formData.comments"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="isShowUser && formData.type === 'agree'" :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="下一节点审批人:" prop="userList">
+            <el-select v-model="formData.userList" filterable multiple placeholder="审批人" style="width: 100%;">
+              <el-option v-for="(item) in userList" :key="item.id" :label="item.name" :value="item.id">
+                <span style="float: left;">{{ item.name }}</span>
+                <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.deptName }}</span>
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人:">
+            <el-input
+              v-model="formData.user"
+              placeholder="审批人"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间:">
+            <el-input
+              v-model="formData.approvalTime"
+              style="width: 100%;"
+              placeholder="审批时间"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <el-button type="primary" :loading="btnLoading" @click="submitForm">
+        提交
+      </el-button>
+      <el-button type="info" @click="handleClose">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/components/Approval/selectApproverDialog.vue b/src/components/Approval/selectApproverDialog.vue
new file mode 100644
index 0000000..866ef12
--- /dev/null
+++ b/src/components/Approval/selectApproverDialog.vue
@@ -0,0 +1,225 @@
+<!-- 审批人自选--选择审批人 -->
+<script lang="ts" setup name="selectApproverDialog">
+import { ElButton, ElDialog, ElMessage } from 'element-plus'
+import { getUserList } from '@/api/system/user'
+import { toTreeList } from '@/utils/structure'
+import { getDeptTreeList } from '@/api/system/dept'
+
+const props = defineProps({
+  title: {
+    type: String,
+    default: '选择审批人',
+  },
+})
+// ----------------------- 以下是字段定义 emits props ---------------------
+const emits = defineEmits(['closeRefresh', 'confirm'])
+// 对话框是否显示
+const dialogVisible = ref(false)
+const defaultProps = {
+  children: 'children',
+  label: 'name',
+}
+// 查询参数
+const listQuery = reactive({
+  keywords: '',
+  beginTime: '',
+  endTime: '',
+  deptId: '',
+  offset: 1,
+  limit: 20,
+  sort: 'id',
+  deptType: '',
+})
+const list = ref([])
+const checkoutList = ref([])
+const total = ref(0)
+const treeData = ref([])
+const loadingTable = ref<boolean>(false)
+const loadingTree = ref<boolean>(false)
+const columns = [
+  { text: '账号', value: 'account', align: 'center' },
+  { text: '所在组织机构', value: 'deptName', align: 'center' },
+  { text: '真实姓名', value: 'name', align: 'center' },
+  { text: '角色', value: 'roleName', align: 'center' },
+  { text: '手机号', value: 'phone', align: 'center' },
+  { text: '注册时间', value: 'createtime', align: 'center' },
+]
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 获取列表数据
+const fetchData = () => {
+  loadingTable.value = true
+  getUserList(listQuery).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
+}
+
+// 查询数据
+const search = () => {
+  fetchData()
+}
+
+// 重置
+const reset = () => {
+  listQuery.keywords = ''
+  listQuery.beginTime = ''
+  listQuery.endTime = ''
+  listQuery.offset = 1
+  listQuery.limit = 20
+  listQuery.sort = 'id'
+  listQuery.deptType = ''
+  fetchData()
+}
+
+// 点击树形结构
+const handleNodeClick = (data: any) => {
+  listQuery.deptId = data.id as string
+  fetchData()
+}
+
+// 获取组织列表树数据
+const fetchTreeData = () => {
+  loadingTree.value = true
+  getDeptTreeList(listQuery).then((res) => {
+    treeData.value = toTreeList(res.data, '0', true)
+    loadingTree.value = false
+  }).catch(() => {
+    loadingTree.value = false
+  })
+}
+
+// ----------初始化、关闭对话框相关-----------------
+function initDialog() {
+  dialogVisible.value = true
+  // 获取树形结构数据
+  fetchTreeData()
+  // 获取列表数据
+  fetchData()
+}
+
+// 点击确定
+const confirm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请至少选择一个审批人')
+    return false
+  }
+  const ids = checkoutList.value.map((item: { id: string }) => item.id)
+  emits('confirm', ids)
+  dialogClose()
+}
+// 关闭弹窗
+function dialogClose() {
+  dialogVisible.value = false
+}
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    :title="props.title"
+    width="90%"
+    :before-close="dialogClose"
+    append-to-body
+    :open-delay="0"
+    :close-on-click-modal="false"
+  >
+    <div class="container">
+      <!-- 左侧组织机构 -->
+      <div class="left-container">
+        <div class="dept-div">
+          <el-card class="box-card" shadow="always">
+            <template #header>
+              <div class="clearfix">
+                <span>组织机构</span>
+              </div>
+            </template>
+            <el-scrollbar height="520px" class="user-dept-scroll">
+              <el-tree
+                v-loading="loadingTree" :data="treeData" :props="defaultProps" default-expand-all
+                :expand-on-click-node="false" highlight-current @node-click="handleNodeClick"
+              />
+            </el-scrollbar>
+          </el-card>
+        </div>
+      </div>
+      <!-- 右侧表格 -->
+      <div ref="tableContainer" class="table">
+        <!-- 筛选条件 -->
+        <search-area :need-clear="true" @search="search" @clear="reset">
+          <search-item>
+            <el-input v-model.trim="listQuery.keywords" placeholder="账户/真实姓名/手机号" clearable />
+          </search-item>
+          <search-item>
+            <el-date-picker
+              v-model="listQuery.beginTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="选择开始时间"
+            />
+          </search-item>
+          <search-item>
+            <el-date-picker
+              v-model="listQuery.endTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="选择结束时间"
+            />
+          </search-item>
+        </search-area>
+        <!-- 表头标题 -->
+        <table-container :title-show="false">
+          <normal-table
+            :data="list" :total="total" :columns="columns" :query="listQuery"
+            :list-loading="loadingTable" is-showmulti-select
+            :height="520"
+            @change="changePage"
+            @multi-select="handleSelectionChange"
+          >
+            <template #preColumns>
+              <el-table-column label="#" width="55" align="center">
+                <template #default="scope">
+                  {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+                </template>
+              </el-table-column>
+            </template>
+          </normal-table>
+        </table-container>
+      </div>
+    </div>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="confirm">
+          确定
+        </el-button>
+        <el-button @click="dialogClose">
+          取消
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.container {
+  width: 100%;
+  display: flex;
+
+  .left-container {
+    width: 22%;
+  }
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
+
+  .table {
+    width: 78%;
+  }
+}
+</style>
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 2ea30d3..b76a306 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -133,7 +133,17 @@
       return
     }
   }
-  if (!approverConfig.value.noHanderAction) {
+  // 审批人自选
+  else if (approverConfig.value.settype === 4) {
+    if (!approverConfig.value.tempExamineMode) {
+      ElMessage({
+        message: '请选择审批方式',
+        type: 'warning',
+      })
+      return
+    }
+  }
+  if (approverConfig.value.settype !== 4 && !approverConfig.value.noHanderAction) {
     ElMessage({
       message: '审批人为空的选项不能为空',
       type: 'warning',
@@ -202,6 +212,9 @@
         <el-radio :label="7" :disabled="disabledVal === '0'">
           连续多级主管
         </el-radio>
+        <el-radio :label="4">
+          审批人自选
+        </el-radio>
       </el-radio-group>
       <!-- 选择好的成员或者角色 -->
       <p v-if="approverConfig && approverConfig.nodeUserList && approverConfig.nodeUserList.length" class="selected_list">
@@ -240,10 +253,10 @@
       </div>
 
       <!-- 审批方式 -->
-      <h5 v-if="approverConfig.settype === 2 || approverConfig.settype === 11 || (approverConfig.settype === 1 && approverConfig && approverConfig.nodeUserList && approverConfig.nodeUserList.length > 1)" class="add-person">
+      <h5 v-if="approverConfig.settype === 4 ||approverConfig.settype === 2 || approverConfig.settype === 11 || (approverConfig.settype === 1 && approverConfig && approverConfig.nodeUserList && approverConfig.nodeUserList.length > 1)" class="add-person">
         多人审批时采用的审批方式
       </h5>
-      <el-radio-group v-if="approverConfig.settype === 2 || approverConfig.settype === 11 || (approverConfig.settype === 1 && approverConfig && approverConfig.nodeUserList && approverConfig.nodeUserList.length > 1)" v-model="approverConfig.tempExamineMode" style="width: 100%;margin-bottom: 16px;">
+      <el-radio-group v-if="approverConfig.settype === 4 ||approverConfig.settype === 2 || approverConfig.settype === 11 || (approverConfig.settype === 1 && approverConfig && approverConfig.nodeUserList && approverConfig.nodeUserList.length > 1)" v-model="approverConfig.tempExamineMode" style="width: 100%;margin-bottom: 16px;">
         <el-radio :label="2">
           会签（需所有审批人同意）
         </el-radio>
@@ -270,10 +283,10 @@
       </div>
 
       <!-- 审批为空时 -->
-      <h5 class="add-person">
+      <h5 v-if="approverConfig.settype !== 4" class="add-person">
         审批人为空时
       </h5>
-      <el-radio-group v-model="approverConfig.noHanderAction" style="width: 100%;margin-bottom: 16px;">
+      <el-radio-group v-if="approverConfig.settype !== 4" v-model="approverConfig.noHanderAction" style="width: 100%;margin-bottom: 16px;">
         <el-radio :label="1">
           自动审批通过
         </el-radio>
diff --git a/src/plugins/preload.ts b/src/plugins/preload.ts
index a4cc107..9873f6c 100644
--- a/src/plugins/preload.ts
+++ b/src/plugins/preload.ts
@@ -53,6 +53,9 @@
     else if (nodeConfig.settype == 7) {
       return `从直接主管到通讯录中级别最高的第${nodeConfig.examineEndDirectorLevel}个层级主管`
     }
+    else if (nodeConfig.settype == 4) {
+      return '审批人自选'
+    }
   },
   dealStr(str: any, obj: any) {
     const arr = [] as any
diff --git a/src/views/business/lab/measureData/measureDataDetail.vue b/src/views/business/lab/measureData/measureDataDetail.vue
index 5ff18a9..19dfd61 100644
--- a/src/views/business/lab/measureData/measureDataDetail.vue
+++ b/src/views/business/lab/measureData/measureDataDetail.vue
@@ -14,14 +14,15 @@
 import type { IEquipmentList, IForm, ISampleList } from './measureData-interface'
 import selectMeasueDataDialog from './dialog/selectMeasueDataDialog.vue'
 import selectTechFilesDialog from './dialog/selectTechFilesDialog.vue'
+import selectApproverDialog from '@/components/Approval/selectApproverDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
 import { getCustomerList } from '@/api/customer/customer'
 import { getPhotoUrl, listPageApi } from '@/api/system/tool'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { UploadFile } from '@/api/measure/file'
 import { updateSample } from '@/api/customer/sampleList'
 import { getStaffList } from '@/api/measure/person'
-// import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-import ApprovalDialog from '@/components/Approval/ApprovalDialogByProcess.vue'
+// import ApprovalDialog from '@/components/Approval/ApprovalDialogByProcess.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { addMeasureData, downLoadTemplate, draftUpdateMeasureData, failUpdateMeasureData, getMeasureDataDetail, submit } from '@/api/business/lab/measureData'
 import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
@@ -33,7 +34,7 @@
 import type { dictType } from '@/global'
 import { getOrderDetail } from '@/api/business/schedule/order'
 import { exportFile } from '@/utils/exportUtils'
-import { logout } from '@/api/system/login'
+import customApproval from '/public/config/customApproval.json'
 
 const user = useUserStore() // 用户信息
 const textMap: { [key: string]: string } = {
@@ -547,44 +548,42 @@
 }
 
 // 获取详情信息
-function getDetail(id?: string, certificateReportCode?: string) {
+async function getDetail(id?: string, certificateReportCode?: string) {
   const loading = ElLoading.service({
     lock: true,
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  getMeasureDataDetail({ id: infoId.value! || id! }).then((res) => {
-    loading.close()
-    form.value = res.data
-    fileList.value = res.data.fileList // 依据的技术文件
-    if (Array.isArray(res.data.fileList)) {
-      form.value.techFilesName = fileList.value.map((item: { fileName: string }) => item.fileName).join(',')
+  const res = await getMeasureDataDetail({ id: infoId.value! || id! })
+  loading.close()
+  form.value = res.data
+  form.value.processId = ''
+  fileList.value = res.data.fileList // 依据的技术文件
+  if (Array.isArray(res.data.fileList)) {
+    form.value.techFilesName = fileList.value.map((item: { fileName: string }) => item.fileName).join(',')
+  }
+  sampleList.value = [{
+    sampleNo: res.data.sampleNo, // 样品编号
+    sampleName: res.data.sampleName, // 样品名称
+    sampleModel: res.data.sampleModel, // 型号
+    manufacturingNo: res.data.manufacturingNo, // 出厂编号
+    manufacturer: res.data.manufacturer, // 生产厂家
+    remark: res.data.sampleRemark, // 备注
+    id: res.data.sampleId,
+  }]
+  equipmentInfoList.value = res.data.equipmentInfoList.map((item: { validDate: string }) => {
+    return {
+      ...item,
+      validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
     }
-    sampleList.value = [{
-      sampleNo: res.data.sampleNo, // 样品编号
-      sampleName: res.data.sampleName, // 样品名称
-      sampleModel: res.data.sampleModel, // 型号
-      manufacturingNo: res.data.manufacturingNo, // 出厂编号
-      manufacturer: res.data.manufacturer, // 生产厂家
-      remark: res.data.sampleRemark, // 备注
-      id: res.data.sampleId,
-    }]
-    equipmentInfoList.value = res.data.equipmentInfoList.map((item: { validDate: string }) => {
-      return {
-        ...item,
-        validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
-      }
-    }) // 所用的计量标准器具
+  }) // 所用的计量标准器具
 
-    businessEnvironmentRecord.value = res.data.businessEnvironmentRecord // 环境记录单数据
-    form.value.environmentCode = res.data.businessEnvironmentRecord.environmentCode// 环境记录单编号
-    if (id && certificateReportCode) {
-      form.value.oldCertificateCode = certificateReportCode
-      form.value.invalid = 1
-      form.value.measurePerson = user.name // 检定员名字
-    }
-  }).catch(() => {
-    loading.close()
-  })
+  businessEnvironmentRecord.value = res.data.businessEnvironmentRecord // 环境记录单数据
+  form.value.environmentCode = res.data.businessEnvironmentRecord.environmentCode// 环境记录单编号
+  if (id && certificateReportCode) {
+    form.value.oldCertificateCode = certificateReportCode
+    form.value.invalid = 1
+    form.value.measurePerson = user.name // 检定员名字
+  }
 }
 
 // 关闭新增页面的回调
@@ -643,6 +642,11 @@
 
       else if (pageType.value === 'edit' || (pageType.value === 'add' && infoId.value)) { // 编辑
         if (query.approvalStatusName === '未通过-驳回') { // 未通过-驳回
+          const param = {
+            ...params,
+            processId: form.value.processId,
+            // assignees: approverList,
+          }
           failUpdateMeasureData(params).then((res) => {
             handleUpdateSample()
             ElMessage.success('保存成功')
@@ -664,29 +668,53 @@
     }
   })
 }
+// -----------------------------------提交-------------------------------------------------------
+const selectApproverRef = ref() // 审批人自选组件ref
+// 选好审批人
+const confirmSelectApprover = async (approverList: string[] = []) => {
+  if (!approverList.length) {
+    ElMessage.warning('无审批人，无法提交！')
+    return false
+  }
+  console.log('审批人', approverList)
+  console.log('processId', form.value.processId)
 
-// 提交
+  if (form.value === null || form.value.processId === undefined || form.value.processId === '') {
+    // 流程id为空 表示还未进入流程中 直接提交
+
+    ElMessageBox.confirm(`是否提交计量数据管理 ${form.value.certificateReportCode}-${form.value.certificateReportName}`, '提示', {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    }).then(() => {
+      if (submitId.value) {
+        const loading = ElLoading.service({
+          lock: true,
+          background: 'rgba(255, 255, 255, 0.8)',
+        })
+        const params = {
+          id: submitId.value,
+          formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS, // 表单id
+          assignees: approverList,
+          processId: form.value.processId,
+        }
+        submit(params).then(() => {
+          ElMessage.success('提交成功')
+          loading.close()
+          close()
+        }).catch(() => {
+          loading.close()
+        })
+      }
+      else {
+        ElMessage.warning('请先保存！')
+      }
+    })
+  }
+}
+// 提交按钮
 const handleSubmit = () => {
-  if (submitId.value) {
-    const loading = ElLoading.service({
-      lock: true,
-      background: 'rgba(255, 255, 255, 0.8)',
-    })
-    const params = {
-      id: submitId.value,
-      formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS, // 表单id
-    }
-    submit(params).then(() => {
-      ElMessage.success('提交成功')
-      loading.close()
-      close()
-    }).catch(() => {
-      loading.close()
-    })
-  }
-  else {
-    ElMessage.warning('请先保存！')
-  }
+  selectApproverRef.value.initDialog()
 }
 
 // ------------------------------------------审批-----------------------------------------
@@ -737,7 +765,7 @@
   }
 
   else if (val === '同意') {
-    approvalDialog.value.initDialog('agree', query.taskId, infoId.value, query.decisionItem)
+    approvalDialog.value.initDialog('agree', query.taskId, infoId.value, query.decisionItem, form.value.processId)
   }
   else if (val === '驳回') {
     approvalDialog.value.initDialog('reject', query.taskId, infoId.value, query.decisionItem)
@@ -802,7 +830,11 @@
   await getDict()
   form.value.processId = query.processId as string // 流程实例
   if (pageType.value !== 'add') { // 编辑、详情
-    getDetail()
+    getDetail().then(() => {
+      nextTick(() => {
+        form.value.processId = query.processId as string // 流程实例
+      })
+    })
     if (query.approvalStatusName !== '草稿箱') {
       getApprovalRecord(form.value.processId) // 获取审批流程
     }
@@ -1005,7 +1037,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="12">
             <el-form-item label="证书单位名称:" prop="certificationCompany">
               <el-input
                 v-model.trim="form.certificationCompany"
@@ -1321,7 +1353,9 @@
     <!-- 样品增加弹窗 -->
     <!-- <select-sample v-model:visible="sampleVisible" :is-use-customer-no="false" :is-multi="isMulti" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" /> -->
     <!-- 审批弹窗 -->
-    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <approval-dialog ref="approvalDialog" :last-name="customApproval.approvalLastName.measureData" @onSuccess="approvalSuccess" />
+    <!-- 选择审批人弹窗 -->
+    <select-approver-dialog ref="selectApproverRef" @confirm="confirmSelectApprover" />
     <!-- 选择委托单组件 -->
     <select-order v-model:visible="orderVisible" @confirm-checkout="confirmCheckoutOrder" @change-visible="changeOrderVisible" />
     <!-- 选择环境记录单弹窗 -->
diff --git a/src/views/business/lab/measureData/measureDataList.vue b/src/views/business/lab/measureData/measureDataList.vue
index 181fc10..fe0d70d 100644
--- a/src/views/business/lab/measureData/measureDataList.vue
+++ b/src/views/business/lab/measureData/measureDataList.vue
@@ -10,11 +10,13 @@
 import type { dictType } from '@/global'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
 // import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-import ApprovalDialog from '@/components/Approval/ApprovalDialogByProcess.vue'
+// import ApprovalDialog from '@/components/Approval/ApprovalDialogByProcess.vue'
 import ButtonBox from '@/components/buttonBox/buttonBox.vue'
 import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
 import { cancelApproval } from '@/api/approval'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
+import customApproval from '/public/config/customApproval.json'
 import { deleteMeasureData, getMeasureDataList, submit } from '@/api/business/lab/measureData'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter() // 初始化路由
@@ -236,7 +238,7 @@
       })
   }
   else if (val === '同意') {
-    approvalDialog.value.initDialog('agree', row.taskId, row.id, row.decisionItem)
+    approvalDialog.value.initDialog('agree', row.taskId, row.id, row.decisionItem, row.processId)
     // approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
   }
   else if (val === '驳回') {
@@ -506,7 +508,7 @@
           </el-table-column>
         </template>
       </normal-table>
-      <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+      <approval-dialog :last-name="customApproval.approvalLastName.measureData"  ref="approvalDialog" @on-success="approvalSuccess" />
       <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
     </table-container>
   </app-container>