diff --git a/src/components.d.ts b/src/components.d.ts
index 6d8ba2e..c627659 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -60,6 +60,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']
+    SelectDeptDialog: typeof import('./components/dialog/selectDeptDialog.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.d.ts b/src/components.d.ts
index 6d8ba2e..c627659 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -60,6 +60,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']
+    SelectDeptDialog: typeof import('./components/dialog/selectDeptDialog.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/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 5a31c59..00451c0 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -54,21 +54,74 @@
   // 是否显示当前页，否则跳转第一页
   // listQuery.value.offset = 1
   // }
+  // fetchApproval({ processId: listQuery.value.processId }).then((response) => {
+  //   console.log(response.data, 'response')
+  //   response.data.forEach((item: Array<IList>, index: number) => {
+  //     item.forEach((i: any) => {
+  //       list.value.push({
+  //         cindex: index,
+  //         nodeNumber: i.approvalStatus === '发起人' ? 0 : list.value[index - 1].nodeNumber + 1,
+  //         assigneeName: i.assigneeName, // 姓名
+  //         approvalStatus: i.approvalStatus, // 审批类型
+  //         finishTime: i.finishTime ? i.finishTime : '-', // 完成时间
+  //         duration: i.approvalStatus === '发起人' || !i.duration ? '-' : i.duration, // 用时
+  //         comment: i.comment.comment ? i.comment.comment : '-', // 审批意见
+  //         type: i.comment.type ? approvalLogTypeMap.value[i.comment.type] : '-', // 意见类别
+  //       })
+  //     })
+  //   })
+  //   total.value = parseInt(response.data.total)
+  //   loadingTable.value = false
+  // }).catch(() => {
+  //   loadingTable.value = false
+  // })
+
   fetchApproval({ processId: listQuery.value.processId }).then((response) => {
-    console.log(response.data, 'response')
     response.data.forEach((item: Array<IList>, index: number) => {
-      item.forEach((i: any) => {
-        list.value.push({
-          cindex: index,
-          nodeNumber: i.approvalStatus === '发起人' ? 0 : list.value[index - 1].nodeNumber + 1,
-          assigneeName: i.assigneeName, // 姓名
-          approvalStatus: i.approvalStatus, // 审批类型
-          finishTime: i.finishTime ? i.finishTime : '-', // 完成时间
-          duration: i.approvalStatus === '发起人' || !i.duration ? '-' : i.duration, // 用时
-          comment: i.comment.comment ? i.comment.comment : '-', // 审批意见
-          type: i.comment.type ? approvalLogTypeMap.value[i.comment.type] : '-', // 意见类别
+      console.log(item, item.length, item[0].countersignOrSign === 2)
+
+      if (item.length > 1 && item[0].countersignOrSign === 2) { // 或签
+        console.log('或签数据处理', item)
+
+        let name = ''// 姓名
+        let approvalStatus = ''// 审批类型
+        let finishTime = ''// 审批类型
+        let duration = ''// 用时
+        let comment = ''// 审批意见
+        let type = '-'// 审批意见
+        item.forEach((i: any, index) => {
+          name = name + (index > 0 ? `， ${i.assigneeName}` : `${i.assigneeName}`) // 姓名
+          approvalStatus = i.approvalStatus // 审批类型
+          finishTime = i.finishTime ? i.finishTime : finishTime // 完成时间
+          duration = i.duration ? i.duration : duration // 用时
+          finishTime = finishTime + i.finishTime
+          comment = comment + i.comment // 审批意见
+          type = i.comment.type ? approvalLogTypeMap.value[i.comment.type] : '-' // 意见类别
         })
-      })
+        list.value.push({
+          nodeNumber: index,
+          approvalStatus, // 审批类型
+          assigneeName: name, // 姓名
+          finishTime, // 完成时间
+          duration, // 用时
+          comment, // 审批意见
+          type, // 意见类别
+        })
+        console.log('list.v*******alue', list.value)
+      }
+      else {
+        item.forEach((i: any) => {
+          list.value.push({
+            nodeNumber: index,
+            assigneeName: i.assigneeName, // 姓名
+            approvalStatus: i.approvalStatus, // 审批类型
+            finishTime: i.finishTime ? i.finishTime : '-', // 完成时间
+            duration: i.approvalStatus === '发起人' || !i.duration ? '-' : i.duration, // 用时
+            comment: i.comment.comment ? i.comment.comment : '-', // 审批意见
+            type: i.comment.type ? approvalLogTypeMap.value[i.comment.type] : '-', // 意见类别
+          })
+        })
+      }
     })
     total.value = parseInt(response.data.total)
     loadingTable.value = false

diff --git a/src/components.d.ts b/src/components.d.ts
index 6d8ba2e..c627659 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -60,6 +60,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']
+    SelectDeptDialog: typeof import('./components/dialog/selectDeptDialog.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/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 5a31c59..00451c0 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -54,21 +54,74 @@
   // 是否显示当前页，否则跳转第一页
   // listQuery.value.offset = 1
   // }
+  // fetchApproval({ processId: listQuery.value.processId }).then((response) => {
+  //   console.log(response.data, 'response')
+  //   response.data.forEach((item: Array<IList>, index: number) => {
+  //     item.forEach((i: any) => {
+  //       list.value.push({
+  //         cindex: index,
+  //         nodeNumber: i.approvalStatus === '发起人' ? 0 : list.value[index - 1].nodeNumber + 1,
+  //         assigneeName: i.assigneeName, // 姓名
+  //         approvalStatus: i.approvalStatus, // 审批类型
+  //         finishTime: i.finishTime ? i.finishTime : '-', // 完成时间
+  //         duration: i.approvalStatus === '发起人' || !i.duration ? '-' : i.duration, // 用时
+  //         comment: i.comment.comment ? i.comment.comment : '-', // 审批意见
+  //         type: i.comment.type ? approvalLogTypeMap.value[i.comment.type] : '-', // 意见类别
+  //       })
+  //     })
+  //   })
+  //   total.value = parseInt(response.data.total)
+  //   loadingTable.value = false
+  // }).catch(() => {
+  //   loadingTable.value = false
+  // })
+
   fetchApproval({ processId: listQuery.value.processId }).then((response) => {
-    console.log(response.data, 'response')
     response.data.forEach((item: Array<IList>, index: number) => {
-      item.forEach((i: any) => {
-        list.value.push({
-          cindex: index,
-          nodeNumber: i.approvalStatus === '发起人' ? 0 : list.value[index - 1].nodeNumber + 1,
-          assigneeName: i.assigneeName, // 姓名
-          approvalStatus: i.approvalStatus, // 审批类型
-          finishTime: i.finishTime ? i.finishTime : '-', // 完成时间
-          duration: i.approvalStatus === '发起人' || !i.duration ? '-' : i.duration, // 用时
-          comment: i.comment.comment ? i.comment.comment : '-', // 审批意见
-          type: i.comment.type ? approvalLogTypeMap.value[i.comment.type] : '-', // 意见类别
+      console.log(item, item.length, item[0].countersignOrSign === 2)
+
+      if (item.length > 1 && item[0].countersignOrSign === 2) { // 或签
+        console.log('或签数据处理', item)
+
+        let name = ''// 姓名
+        let approvalStatus = ''// 审批类型
+        let finishTime = ''// 审批类型
+        let duration = ''// 用时
+        let comment = ''// 审批意见
+        let type = '-'// 审批意见
+        item.forEach((i: any, index) => {
+          name = name + (index > 0 ? `， ${i.assigneeName}` : `${i.assigneeName}`) // 姓名
+          approvalStatus = i.approvalStatus // 审批类型
+          finishTime = i.finishTime ? i.finishTime : finishTime // 完成时间
+          duration = i.duration ? i.duration : duration // 用时
+          finishTime = finishTime + i.finishTime
+          comment = comment + i.comment // 审批意见
+          type = i.comment.type ? approvalLogTypeMap.value[i.comment.type] : '-' // 意见类别
         })
-      })
+        list.value.push({
+          nodeNumber: index,
+          approvalStatus, // 审批类型
+          assigneeName: name, // 姓名
+          finishTime, // 完成时间
+          duration, // 用时
+          comment, // 审批意见
+          type, // 意见类别
+        })
+        console.log('list.v*******alue', list.value)
+      }
+      else {
+        item.forEach((i: any) => {
+          list.value.push({
+            nodeNumber: index,
+            assigneeName: i.assigneeName, // 姓名
+            approvalStatus: i.approvalStatus, // 审批类型
+            finishTime: i.finishTime ? i.finishTime : '-', // 完成时间
+            duration: i.approvalStatus === '发起人' || !i.duration ? '-' : i.duration, // 用时
+            comment: i.comment.comment ? i.comment.comment : '-', // 审批意见
+            type: i.comment.type ? approvalLogTypeMap.value[i.comment.type] : '-', // 意见类别
+          })
+        })
+      }
     })
     total.value = parseInt(response.data.total)
     loadingTable.value = false
diff --git a/src/components/ApprovalRecord/approval-interface.ts b/src/components/ApprovalRecord/approval-interface.ts
index b950897..1604410 100644
--- a/src/components/ApprovalRecord/approval-interface.ts
+++ b/src/components/ApprovalRecord/approval-interface.ts
@@ -9,4 +9,5 @@
   duration: string // 用时
   approvalLogs?: any[]
   approvalLogsList?: any[]
+  countersignOrSign?: number // 类型 1会签、2或签
 }

diff --git a/src/components.d.ts b/src/components.d.ts
index 6d8ba2e..c627659 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -60,6 +60,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']
+    SelectDeptDialog: typeof import('./components/dialog/selectDeptDialog.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/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 5a31c59..00451c0 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -54,21 +54,74 @@
   // 是否显示当前页，否则跳转第一页
   // listQuery.value.offset = 1
   // }
+  // fetchApproval({ processId: listQuery.value.processId }).then((response) => {
+  //   console.log(response.data, 'response')
+  //   response.data.forEach((item: Array<IList>, index: number) => {
+  //     item.forEach((i: any) => {
+  //       list.value.push({
+  //         cindex: index,
+  //         nodeNumber: i.approvalStatus === '发起人' ? 0 : list.value[index - 1].nodeNumber + 1,
+  //         assigneeName: i.assigneeName, // 姓名
+  //         approvalStatus: i.approvalStatus, // 审批类型
+  //         finishTime: i.finishTime ? i.finishTime : '-', // 完成时间
+  //         duration: i.approvalStatus === '发起人' || !i.duration ? '-' : i.duration, // 用时
+  //         comment: i.comment.comment ? i.comment.comment : '-', // 审批意见
+  //         type: i.comment.type ? approvalLogTypeMap.value[i.comment.type] : '-', // 意见类别
+  //       })
+  //     })
+  //   })
+  //   total.value = parseInt(response.data.total)
+  //   loadingTable.value = false
+  // }).catch(() => {
+  //   loadingTable.value = false
+  // })
+
   fetchApproval({ processId: listQuery.value.processId }).then((response) => {
-    console.log(response.data, 'response')
     response.data.forEach((item: Array<IList>, index: number) => {
-      item.forEach((i: any) => {
-        list.value.push({
-          cindex: index,
-          nodeNumber: i.approvalStatus === '发起人' ? 0 : list.value[index - 1].nodeNumber + 1,
-          assigneeName: i.assigneeName, // 姓名
-          approvalStatus: i.approvalStatus, // 审批类型
-          finishTime: i.finishTime ? i.finishTime : '-', // 完成时间
-          duration: i.approvalStatus === '发起人' || !i.duration ? '-' : i.duration, // 用时
-          comment: i.comment.comment ? i.comment.comment : '-', // 审批意见
-          type: i.comment.type ? approvalLogTypeMap.value[i.comment.type] : '-', // 意见类别
+      console.log(item, item.length, item[0].countersignOrSign === 2)
+
+      if (item.length > 1 && item[0].countersignOrSign === 2) { // 或签
+        console.log('或签数据处理', item)
+
+        let name = ''// 姓名
+        let approvalStatus = ''// 审批类型
+        let finishTime = ''// 审批类型
+        let duration = ''// 用时
+        let comment = ''// 审批意见
+        let type = '-'// 审批意见
+        item.forEach((i: any, index) => {
+          name = name + (index > 0 ? `， ${i.assigneeName}` : `${i.assigneeName}`) // 姓名
+          approvalStatus = i.approvalStatus // 审批类型
+          finishTime = i.finishTime ? i.finishTime : finishTime // 完成时间
+          duration = i.duration ? i.duration : duration // 用时
+          finishTime = finishTime + i.finishTime
+          comment = comment + i.comment // 审批意见
+          type = i.comment.type ? approvalLogTypeMap.value[i.comment.type] : '-' // 意见类别
         })
-      })
+        list.value.push({
+          nodeNumber: index,
+          approvalStatus, // 审批类型
+          assigneeName: name, // 姓名
+          finishTime, // 完成时间
+          duration, // 用时
+          comment, // 审批意见
+          type, // 意见类别
+        })
+        console.log('list.v*******alue', list.value)
+      }
+      else {
+        item.forEach((i: any) => {
+          list.value.push({
+            nodeNumber: index,
+            assigneeName: i.assigneeName, // 姓名
+            approvalStatus: i.approvalStatus, // 审批类型
+            finishTime: i.finishTime ? i.finishTime : '-', // 完成时间
+            duration: i.approvalStatus === '发起人' || !i.duration ? '-' : i.duration, // 用时
+            comment: i.comment.comment ? i.comment.comment : '-', // 审批意见
+            type: i.comment.type ? approvalLogTypeMap.value[i.comment.type] : '-', // 意见类别
+          })
+        })
+      }
     })
     total.value = parseInt(response.data.total)
     loadingTable.value = false
diff --git a/src/components/ApprovalRecord/approval-interface.ts b/src/components/ApprovalRecord/approval-interface.ts
index b950897..1604410 100644
--- a/src/components/ApprovalRecord/approval-interface.ts
+++ b/src/components/ApprovalRecord/approval-interface.ts
@@ -9,4 +9,5 @@
   duration: string // 用时
   approvalLogs?: any[]
   approvalLogsList?: any[]
+  countersignOrSign?: number // 类型 1会签、2或签
 }
diff --git a/src/components/dialog/selectDeptDialog.vue b/src/components/dialog/selectDeptDialog.vue
new file mode 100644
index 0000000..6812ec4
--- /dev/null
+++ b/src/components/dialog/selectDeptDialog.vue
@@ -0,0 +1,279 @@
+<!-- 选择部门 -->
+<script setup lang="ts" name="SelectEmployeesDialog">
+import { computed, onMounted, reactive, ref, watch } from 'vue'
+import type { IEmployees } from './dialog'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDeptList } from '@/api/system/dept'
+import type { deptType } from '@/global'
+import { getDictByCode } from '@/api/system/dict'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  data: {
+    type: Array,
+    default: () => [],
+  },
+  // 默认查询组织
+  deptId: {
+    type: String,
+    default: '',
+  },
+  // 是否显示部门选择下拉菜单
+  showDeptSelect: {
+    type: Boolean,
+    default: true,
+  },
+  // 是否多选
+  multi: {
+    type: Boolean,
+    default: true,
+  },
+})
+const emits = defineEmits(['update:visible', 'change'])
+const table = ref() // 表格ref
+
+// 表格表头
+const columns = ref<TableColumn[]>([
+  { text: '部门编号', value: 'deptId', align: 'center' },
+  { text: '部门名称', value: 'fullName', align: 'center' },
+  { text: '部门类型', value: 'deptTypeName', align: 'center' },
+  { text: '部门类别', value: 'deptCategoryName', align: 'center' },
+  { text: '负责人', value: 'directorName', align: 'center' },
+])
+
+// 表格数据
+const list = ref<IEmployees[]>([])
+
+const loading = ref(false)
+const total = ref(0)
+// 查询参数
+const listQuery = ref({
+  deptName: '', // 部门名称
+  deptId: '', // 部门id
+  limit: 20,
+  offset: 1,
+})
+// 默认给deptId赋值
+// listQuery.value.deptId = props.deptId
+const checkedList = ref([])
+// 多选的数据
+const multipleTable = ref([])
+const singleChecked = ref('') // 单选选中id
+const closeDialog = () => {
+  emits('update:visible', false)
+}
+const visibleDialog = computed({
+  get() {
+    return props.visible
+  },
+  set() {
+    closeDialog()
+  },
+})
+
+watch(() => props.visible, (val) => {
+  // 清除上次选中
+  if (!val) {
+    table.value.clearMulti()
+  }
+})
+
+// -----------------------------------------字典--------------------------------------------------------------
+const deptTypeList = ref<deptType[]>([]) // 部门类型
+const deptTypeMap = ref({}) as any// 部门类型{1：管理部门}
+const deptCategoryMap = ref({}) as any// 部门类别{无线电}
+
+/**
+ * 获取字典
+ */
+async function getDict() {
+  loading.value = true
+  // 获取部门类型
+  const response = await getDictByCode('deptType')
+  // 部门类型{1：管理部门}
+  response.data.forEach((item: any) => {
+    deptTypeMap.value[`${item.value}`] = item.name
+  })
+
+  // 获取部门类别
+  const res = await getDictByCode('eqptDeviceType')
+  // 部门类别{无线电}
+  res.data.forEach((item: any) => {
+    deptCategoryMap.value[`${item.value}`] = item.name
+  })
+}
+
+// 点击确定，保存选择的成员配置
+const saveDialog = () => {
+  // 多选
+  if (props.multi) {
+    const checkedList = multipleTable.value.map((item: any) => {
+      return {
+        ...item,
+        type: 3, // type: 1.成员 2.角色 3.部门
+        targetId: item.deptId,
+        name: item.fullName,
+      }
+    })
+    emits('change', checkedList)
+  }
+  else {
+    const checkValue = list.value.find(item => item.id == singleChecked.value)
+    emits('change', checkValue)
+  }
+}
+
+const select = ref('')
+// 获取列表数据
+const fetchData = (isNowPage = false) => {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  loading.value = true
+  getDeptList(listQuery.value).then((res) => {
+    list.value = res.data.list.map((item: any) => {
+      return {
+        ...item,
+        deptTypeName: deptTypeMap.value[item.deptType], // 部门类型
+        deptCategoryName: deptCategoryMap.value[item.tips!], // 部门类别
+      }
+    })
+    total.value = res.data.total
+    loading.value = false
+  })
+}
+
+// 多选
+const multiSelect = (val: any) => {
+  multipleTable.value = val
+}
+
+// 查询数据
+const search = () => {
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+onMounted(() => {
+  getDict().then(() => {
+    // 获取列表数据
+    fetchData(true)
+  })
+})
+</script>
+
+<template>
+  <div class="select-emplotees-dialog">
+    <el-dialog v-model="visibleDialog" title="选择部门" width="65%" max-width="80%" append-to-body custom-class="chengyuan-dialog promoter_person">
+      <!-- 右侧表格 -->
+      <div ref="tableContainer" class="table-area">
+        <!-- 筛选条件 -->
+        <search-area @search="search">
+          <search-item>
+            <el-input v-model.trim="listQuery.deptId" placeholder="部门编号" class="short-input" clearable />
+          </search-item>
+          <search-item>
+            <el-input v-model.trim="listQuery.deptName" placeholder="部门名称" class="short-input" clearable />
+          </search-item>
+        </search-area>
+        <!-- 表头标题 -->
+        <table-container :title-show="false" style="margin-top: 0;padding-top: 0;">
+          <!-- 查询结果Table显示 -->
+          <normal-table
+            ref="table"
+            :data="list"
+            :total="total"
+            :columns="columns"
+            :query="listQuery"
+            :list-loading="loading"
+            :is-showmulti-select="multi"
+            height="260"
+            :page-sizes="[20]"
+            @change="changePage"
+            @multi-select="multiSelect"
+          >
+            <!-- 序号 -->
+            <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>
+              <el-table-column v-if="!props.multi" label="" width="40" align="center">
+                <template #default="scope">
+                  <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+                </template>
+              </el-table-column>
+            </template>
+          </normal-table>
+        </table-container>
+      </div>
+      <!-- </div> -->
+      <template #footer>
+        <el-button @click="closeDialog">
+          取 消
+        </el-button>
+        <el-button type="primary" @click="saveDialog">
+          确 定
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<style lang="scss">
+@import "@/css/dialog.css";
+
+.chengyuan-dialog {
+  .el-table .cell {
+    white-space: nowrap;
+  }
+
+  .el-dialog__body {
+    display: flex;
+    overflow: auto;
+  }
+}
+</style>
+
+<style lang="scss" scoped>
+.chengyuan-dialog {
+  width: 100%;
+
+  .left-container {
+    white-space: nowrap;
+    height: 100%;
+  }
+
+  .table-area {
+    flex: 1;
+    overflow: auto;
+
+    :deep(.el-radio__label) {
+      display: none;
+    }
+
+    .pagination {
+      margin-top: 10px;
+      width: 100%;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+    }
+  }
+}
+</style>

diff --git a/src/components.d.ts b/src/components.d.ts
index 6d8ba2e..c627659 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -60,6 +60,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']
+    SelectDeptDialog: typeof import('./components/dialog/selectDeptDialog.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/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 5a31c59..00451c0 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -54,21 +54,74 @@
   // 是否显示当前页，否则跳转第一页
   // listQuery.value.offset = 1
   // }
+  // fetchApproval({ processId: listQuery.value.processId }).then((response) => {
+  //   console.log(response.data, 'response')
+  //   response.data.forEach((item: Array<IList>, index: number) => {
+  //     item.forEach((i: any) => {
+  //       list.value.push({
+  //         cindex: index,
+  //         nodeNumber: i.approvalStatus === '发起人' ? 0 : list.value[index - 1].nodeNumber + 1,
+  //         assigneeName: i.assigneeName, // 姓名
+  //         approvalStatus: i.approvalStatus, // 审批类型
+  //         finishTime: i.finishTime ? i.finishTime : '-', // 完成时间
+  //         duration: i.approvalStatus === '发起人' || !i.duration ? '-' : i.duration, // 用时
+  //         comment: i.comment.comment ? i.comment.comment : '-', // 审批意见
+  //         type: i.comment.type ? approvalLogTypeMap.value[i.comment.type] : '-', // 意见类别
+  //       })
+  //     })
+  //   })
+  //   total.value = parseInt(response.data.total)
+  //   loadingTable.value = false
+  // }).catch(() => {
+  //   loadingTable.value = false
+  // })
+
   fetchApproval({ processId: listQuery.value.processId }).then((response) => {
-    console.log(response.data, 'response')
     response.data.forEach((item: Array<IList>, index: number) => {
-      item.forEach((i: any) => {
-        list.value.push({
-          cindex: index,
-          nodeNumber: i.approvalStatus === '发起人' ? 0 : list.value[index - 1].nodeNumber + 1,
-          assigneeName: i.assigneeName, // 姓名
-          approvalStatus: i.approvalStatus, // 审批类型
-          finishTime: i.finishTime ? i.finishTime : '-', // 完成时间
-          duration: i.approvalStatus === '发起人' || !i.duration ? '-' : i.duration, // 用时
-          comment: i.comment.comment ? i.comment.comment : '-', // 审批意见
-          type: i.comment.type ? approvalLogTypeMap.value[i.comment.type] : '-', // 意见类别
+      console.log(item, item.length, item[0].countersignOrSign === 2)
+
+      if (item.length > 1 && item[0].countersignOrSign === 2) { // 或签
+        console.log('或签数据处理', item)
+
+        let name = ''// 姓名
+        let approvalStatus = ''// 审批类型
+        let finishTime = ''// 审批类型
+        let duration = ''// 用时
+        let comment = ''// 审批意见
+        let type = '-'// 审批意见
+        item.forEach((i: any, index) => {
+          name = name + (index > 0 ? `， ${i.assigneeName}` : `${i.assigneeName}`) // 姓名
+          approvalStatus = i.approvalStatus // 审批类型
+          finishTime = i.finishTime ? i.finishTime : finishTime // 完成时间
+          duration = i.duration ? i.duration : duration // 用时
+          finishTime = finishTime + i.finishTime
+          comment = comment + i.comment // 审批意见
+          type = i.comment.type ? approvalLogTypeMap.value[i.comment.type] : '-' // 意见类别
         })
-      })
+        list.value.push({
+          nodeNumber: index,
+          approvalStatus, // 审批类型
+          assigneeName: name, // 姓名
+          finishTime, // 完成时间
+          duration, // 用时
+          comment, // 审批意见
+          type, // 意见类别
+        })
+        console.log('list.v*******alue', list.value)
+      }
+      else {
+        item.forEach((i: any) => {
+          list.value.push({
+            nodeNumber: index,
+            assigneeName: i.assigneeName, // 姓名
+            approvalStatus: i.approvalStatus, // 审批类型
+            finishTime: i.finishTime ? i.finishTime : '-', // 完成时间
+            duration: i.approvalStatus === '发起人' || !i.duration ? '-' : i.duration, // 用时
+            comment: i.comment.comment ? i.comment.comment : '-', // 审批意见
+            type: i.comment.type ? approvalLogTypeMap.value[i.comment.type] : '-', // 意见类别
+          })
+        })
+      }
     })
     total.value = parseInt(response.data.total)
     loadingTable.value = false
diff --git a/src/components/ApprovalRecord/approval-interface.ts b/src/components/ApprovalRecord/approval-interface.ts
index b950897..1604410 100644
--- a/src/components/ApprovalRecord/approval-interface.ts
+++ b/src/components/ApprovalRecord/approval-interface.ts
@@ -9,4 +9,5 @@
   duration: string // 用时
   approvalLogs?: any[]
   approvalLogsList?: any[]
+  countersignOrSign?: number // 类型 1会签、2或签
 }
diff --git a/src/components/dialog/selectDeptDialog.vue b/src/components/dialog/selectDeptDialog.vue
new file mode 100644
index 0000000..6812ec4
--- /dev/null
+++ b/src/components/dialog/selectDeptDialog.vue
@@ -0,0 +1,279 @@
+<!-- 选择部门 -->
+<script setup lang="ts" name="SelectEmployeesDialog">
+import { computed, onMounted, reactive, ref, watch } from 'vue'
+import type { IEmployees } from './dialog'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDeptList } from '@/api/system/dept'
+import type { deptType } from '@/global'
+import { getDictByCode } from '@/api/system/dict'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  data: {
+    type: Array,
+    default: () => [],
+  },
+  // 默认查询组织
+  deptId: {
+    type: String,
+    default: '',
+  },
+  // 是否显示部门选择下拉菜单
+  showDeptSelect: {
+    type: Boolean,
+    default: true,
+  },
+  // 是否多选
+  multi: {
+    type: Boolean,
+    default: true,
+  },
+})
+const emits = defineEmits(['update:visible', 'change'])
+const table = ref() // 表格ref
+
+// 表格表头
+const columns = ref<TableColumn[]>([
+  { text: '部门编号', value: 'deptId', align: 'center' },
+  { text: '部门名称', value: 'fullName', align: 'center' },
+  { text: '部门类型', value: 'deptTypeName', align: 'center' },
+  { text: '部门类别', value: 'deptCategoryName', align: 'center' },
+  { text: '负责人', value: 'directorName', align: 'center' },
+])
+
+// 表格数据
+const list = ref<IEmployees[]>([])
+
+const loading = ref(false)
+const total = ref(0)
+// 查询参数
+const listQuery = ref({
+  deptName: '', // 部门名称
+  deptId: '', // 部门id
+  limit: 20,
+  offset: 1,
+})
+// 默认给deptId赋值
+// listQuery.value.deptId = props.deptId
+const checkedList = ref([])
+// 多选的数据
+const multipleTable = ref([])
+const singleChecked = ref('') // 单选选中id
+const closeDialog = () => {
+  emits('update:visible', false)
+}
+const visibleDialog = computed({
+  get() {
+    return props.visible
+  },
+  set() {
+    closeDialog()
+  },
+})
+
+watch(() => props.visible, (val) => {
+  // 清除上次选中
+  if (!val) {
+    table.value.clearMulti()
+  }
+})
+
+// -----------------------------------------字典--------------------------------------------------------------
+const deptTypeList = ref<deptType[]>([]) // 部门类型
+const deptTypeMap = ref({}) as any// 部门类型{1：管理部门}
+const deptCategoryMap = ref({}) as any// 部门类别{无线电}
+
+/**
+ * 获取字典
+ */
+async function getDict() {
+  loading.value = true
+  // 获取部门类型
+  const response = await getDictByCode('deptType')
+  // 部门类型{1：管理部门}
+  response.data.forEach((item: any) => {
+    deptTypeMap.value[`${item.value}`] = item.name
+  })
+
+  // 获取部门类别
+  const res = await getDictByCode('eqptDeviceType')
+  // 部门类别{无线电}
+  res.data.forEach((item: any) => {
+    deptCategoryMap.value[`${item.value}`] = item.name
+  })
+}
+
+// 点击确定，保存选择的成员配置
+const saveDialog = () => {
+  // 多选
+  if (props.multi) {
+    const checkedList = multipleTable.value.map((item: any) => {
+      return {
+        ...item,
+        type: 3, // type: 1.成员 2.角色 3.部门
+        targetId: item.deptId,
+        name: item.fullName,
+      }
+    })
+    emits('change', checkedList)
+  }
+  else {
+    const checkValue = list.value.find(item => item.id == singleChecked.value)
+    emits('change', checkValue)
+  }
+}
+
+const select = ref('')
+// 获取列表数据
+const fetchData = (isNowPage = false) => {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  loading.value = true
+  getDeptList(listQuery.value).then((res) => {
+    list.value = res.data.list.map((item: any) => {
+      return {
+        ...item,
+        deptTypeName: deptTypeMap.value[item.deptType], // 部门类型
+        deptCategoryName: deptCategoryMap.value[item.tips!], // 部门类别
+      }
+    })
+    total.value = res.data.total
+    loading.value = false
+  })
+}
+
+// 多选
+const multiSelect = (val: any) => {
+  multipleTable.value = val
+}
+
+// 查询数据
+const search = () => {
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+onMounted(() => {
+  getDict().then(() => {
+    // 获取列表数据
+    fetchData(true)
+  })
+})
+</script>
+
+<template>
+  <div class="select-emplotees-dialog">
+    <el-dialog v-model="visibleDialog" title="选择部门" width="65%" max-width="80%" append-to-body custom-class="chengyuan-dialog promoter_person">
+      <!-- 右侧表格 -->
+      <div ref="tableContainer" class="table-area">
+        <!-- 筛选条件 -->
+        <search-area @search="search">
+          <search-item>
+            <el-input v-model.trim="listQuery.deptId" placeholder="部门编号" class="short-input" clearable />
+          </search-item>
+          <search-item>
+            <el-input v-model.trim="listQuery.deptName" placeholder="部门名称" class="short-input" clearable />
+          </search-item>
+        </search-area>
+        <!-- 表头标题 -->
+        <table-container :title-show="false" style="margin-top: 0;padding-top: 0;">
+          <!-- 查询结果Table显示 -->
+          <normal-table
+            ref="table"
+            :data="list"
+            :total="total"
+            :columns="columns"
+            :query="listQuery"
+            :list-loading="loading"
+            :is-showmulti-select="multi"
+            height="260"
+            :page-sizes="[20]"
+            @change="changePage"
+            @multi-select="multiSelect"
+          >
+            <!-- 序号 -->
+            <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>
+              <el-table-column v-if="!props.multi" label="" width="40" align="center">
+                <template #default="scope">
+                  <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+                </template>
+              </el-table-column>
+            </template>
+          </normal-table>
+        </table-container>
+      </div>
+      <!-- </div> -->
+      <template #footer>
+        <el-button @click="closeDialog">
+          取 消
+        </el-button>
+        <el-button type="primary" @click="saveDialog">
+          确 定
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<style lang="scss">
+@import "@/css/dialog.css";
+
+.chengyuan-dialog {
+  .el-table .cell {
+    white-space: nowrap;
+  }
+
+  .el-dialog__body {
+    display: flex;
+    overflow: auto;
+  }
+}
+</style>
+
+<style lang="scss" scoped>
+.chengyuan-dialog {
+  width: 100%;
+
+  .left-container {
+    white-space: nowrap;
+    height: 100%;
+  }
+
+  .table-area {
+    flex: 1;
+    overflow: auto;
+
+    :deep(.el-radio__label) {
+      display: none;
+    }
+
+    .pagination {
+      margin-top: 10px;
+      width: 100%;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+    }
+  }
+}
+</style>
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index 3746fe7..e7b4b8f 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,9 +1,9 @@
 <!-- 条件设置 -->
 <script setup lang="ts" name="ConsitionDrawer">
 import { computed, ref, watch } from 'vue'
+import { id } from 'element-plus/es/locale'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
-
 const workFlowStore = useWorkFlowStore() // store
 const conditionVisible = ref(false) // 控制选择条件对话框显隐
 const conditionsConfig = ref({ // 多个条件数据配置
@@ -13,9 +13,11 @@
 const PriorityLevel = ref() // 优先级
 const conditions = ref([]) as any // 条件选项（可以选择的条件）
 const conditionList = ref([]) as any// 条件列表
-const checkedList = ref([]) as any// 选择的人员
-const conditionRoleVisible = ref(false) // 条件选择人员对话框显隐
-
+const checkedList = ref([]) as any// 选择的人员、角色、部门
+const conditionRoleVisible = ref(false) // 条件选择角色对话框显隐
+const conditionPersonVisible = ref(false) // 条件选择人员对话框显隐
+const conditionDeptVisible = ref(false) // 条件选择部门对话框显隐
+const selectConditionTypeFront = ref('1') // 选择条件类型，1人员、2角色、3部门
 const { setCondition, setConditionsConfig } = workFlowStore
 
 // 关闭条件抽屉
@@ -25,6 +27,10 @@
 // 监听控制条件抽屉显隐字段
 const visible = computed({
   get() {
+    if (workFlowStore.conditionDrawer && !conditionConfig.value.conditionList.length) {
+      clickfq(conditionList.value, { columnId: 0 }, 'columnId') // 把发起人条件加进来
+      sureCondition()
+    }
     return workFlowStore.conditionDrawer
   },
   set() {
@@ -68,32 +74,32 @@
 }
 
 // 点击确定--抽屉添加条件条件
-const sureCondition = () => {
+function sureCondition() {
   // 1.弹窗有，外面无+
   // 2.弹窗有，外面有不变
-  for (let i = 0; i < conditionList.value.length; i++) {
-    const { columnId } = conditionList.value[i] // 条件id
-    if ($func.toggleClass(conditionConfig.value.conditionList, conditionList.value[i], 'columnId')) {
-      continue
-    }
-    if (columnId === 0) { // 发起人
-      conditionConfig.value.nodeUserList = [] // 发起人列表置空
-      conditionConfig.value.conditionList.push({ // 条件列表增加发起人条件
-        type: 1,
-        columnId, // 条件id
-        showName: '发起人',
-      })
-    }
-  }
+  // for (let i = 0; i < conditionList.value.length; i++) {
+  //   const { columnId } = conditionList.value[i] // 条件id
+  //   if ($func.toggleClass(conditionConfig.value.conditionList, conditionList.value[i], 'columnId')) {
+  //     continue
+  //   }
+  //   if (columnId === 0) { // 发起人
+  conditionConfig.value.nodeUserList = [] // 发起人列表置空
+  conditionConfig.value.conditionList.push({ // 条件列表增加发起人条件
+    type: 1,
+    columnId: 0, // 条件id
+    showName: '发起人',
+  })
+  // }
+  // }
   // 3.弹窗无，外面有-
-  for (let i = conditionConfig.value.conditionList.length - 1; i >= 0; i--) {
-    if (!$func.toggleClass(conditionList.value, conditionConfig.value.conditionList[i], 'columnId')) {
-      conditionConfig.value.conditionList.splice(i, 1)
-    }
-  }
+  // for (let i = conditionConfig.value.conditionList.length - 1; i >= 0; i--) {
+  //   if (!$func.toggleClass(conditionList.value, conditionConfig.value.conditionList[i], 'columnId')) {
+  //     conditionConfig.value.conditionList.splice(i, 1)
+  //   }
+  // }
   // 条件列表排序
-  conditionConfig.value.conditionList.sort((a: any, b: any) => { return a.columnId - b.columnId })
-  conditionVisible.value = false // 关闭选择条件对话框
+  // conditionConfig.value.conditionList.sort((a: any, b: any) => { return a.columnId - b.columnId })
+  // conditionVisible.value = false // 关闭选择条件对话框
 }
 
 // 抽屉点击确定--保存条件
@@ -110,6 +116,8 @@
   for (let i = 0; i < conditionsConfig.value.conditionNodes.length; i++) {
     conditionsConfig.value.conditionNodes[i].error = $func.conditionStr(conditionsConfig.value, i) === '请设置条件' && i !== conditionsConfig.value.conditionNodes.length - 1
   }
+  console.log(conditionsConfig.value)
+
   // 保存条件设置
   setConditionsConfig({
     value: conditionsConfig.value,
@@ -117,21 +125,41 @@
     id: workFlowStore.conditionsConfigValue.id,
   })
 }
-// 添加条件--人员
-const addConditionRole = () => {
-  conditionRoleVisible.value = true
+// 添加条件--人员、角色、部门
+const addSelectCondition = () => {
+  if (selectConditionTypeFront.value === '1') { // 人员
+    conditionPersonVisible.value = true
+  }
+  else if (selectConditionTypeFront.value === '2') { // 角色
+    conditionRoleVisible.value = true
+  }
+  else { // 部门
+    conditionDeptVisible.value = true
+  }
+
   checkedList.value = conditionConfig.value.nodeUserList
 }
-// 选好角色了
-const sureConditionRole = (data: any) => {
-  conditionConfig.value.nodeUserList = data
+// 选好人员、角色、部门了
+const sureSelectedCondition = (data: any) => {
+  // conditionConfig.value.nodeUserList = data
+  data.forEach((item: any) => {
+    if (conditionConfig.value.nodeUserList.every((ele: any) => ele.targetId !== item.targetId)) {
+      conditionConfig.value.nodeUserList.push(item)
+    }
+  })
   conditionRoleVisible.value = false
+  conditionPersonVisible.value = false
+  conditionDeptVisible.value = false
 }
 
 // 点击发起人
-const clickfq = (conditionList: any, param: any, columnId: number | string) => {
+function clickfq(conditionList: any, param: any, columnId: number | string) {
   $func.toChecked(conditionList, param, columnId)
 }
+// 条件变化清空列表
+watch(() => selectConditionTypeFront.value, (newValue) => {
+  conditionConfig.value.nodeUserList = []
+}, { immediate: true })
 </script>
 
 <template>
@@ -151,36 +179,61 @@
         <p class="tip">
           当审批单同时满足以下条件时进入此流程
         </p>
-        <el-button
+        <!-- <el-button
           type="primary"
           @click="addCondition"
         >
           添加条件
-        </el-button>
+        </el-button> -->
+        <div style="display: flex;justify-content: space-between;">
+          <el-radio-group v-model="selectConditionTypeFront" style="margin-bottom: 20px;">
+            <el-radio label="1">
+              人员
+            </el-radio>
+            <el-radio label="2">
+              角色
+            </el-radio>
+            <el-radio label="3">
+              部门
+            </el-radio>
+          </el-radio-group>
+          <div>
+            <el-button type="primary" @click="addSelectCondition">
+              选择
+            </el-button>
+            <el-button
+              v-if="conditionConfig.nodeUserList && conditionConfig.nodeUserList.length !== 0"
+              type="info" @click="conditionConfig.nodeUserList = []"
+            >
+              清空
+            </el-button>
+          </div>
+        </div>
 
         <ul>
           <li v-for="(item, index) in conditionConfig.conditionList" :key="index">
-            <span class="ellipsis">{{ item.type === 1 ? '发起人' : item.showName }}：</span>
+            <!-- <span class="ellipsis">{{ item.type === 1 ? '发起人' : item.showName }}：</span> -->
+            <span class="ellipsis">{{ selectConditionTypeFront === '1' ? '人员' : selectConditionTypeFront === '2' ? '角色' : '部门' }}：</span>
             <div v-if="item.type === 1">
-              <el-input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole" />
-              <p v-if="conditionConfig && conditionConfig.nodeUserList && conditionConfig.nodeUserList.length" class="selected_list">
+              <el-input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addSelectCondition" />
+              <p v-if="conditionConfig && conditionConfig.nodeUserList && conditionConfig.nodeUserList.length" style="border: none;" class="selected_list">
                 <span v-for="(item, index) in conditionConfig.nodeUserList" :key="index" class="people-box">
                   {{ item.name }}
                   <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')">
                     <close />
                   </el-icon>
                 </span>
-                <a v-if="conditionConfig.nodeUserList && conditionConfig.nodeUserList.length !== 0" @click="conditionConfig.nodeUserList = []">清除</a>
+                <!-- <a v-if="conditionConfig.nodeUserList && conditionConfig.nodeUserList.length !== 0" @click="conditionConfig.nodeUserList = []">清除</a> -->
               </p>
             </div>
-            <a v-if="item.type === 1" @click="conditionConfig.nodeUserList = [];$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
-            <a v-if="item.type === 2" @click="$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
+            <!-- <a v-if="item.type === 1" @click="conditionConfig.nodeUserList = [];$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a> -->
+            <!-- <a v-if="item.type === 2" @click="$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a> -->
           </li>
         </ul>
 
         <el-dialog v-model="conditionVisible" title="选择条件" width="480px" append-to-body custom-class="condition_list">
-          <p>请选择用来区分审批流程的条件字段</p>
-          <p class="check_box">
+          <!-- <p>请选择用来区分审批流程的条件字段</p> -->
+          <!-- <p class="check_box">
             <a
               :class="$func.toggleClass(conditionList, { columnId: 0 }, 'columnId') && 'active'"
               @click="clickfq(conditionList, { columnId: 0 }, 'columnId')"
@@ -189,7 +242,22 @@
               v-for="(item, index) in conditions" :key="index" :class="$func.toggleClass(conditionList, item, 'columnId') && 'active'"
               @click="$func.toChecked(conditionList, item, 'columnId')"
             >{{ item.showName }}</a>
-          </p>
+          </p> -->
+          <!-- <el-checkbox :checked="true" disabled>
+            发起人
+          </el-checkbox> -->
+          <h6>发起人的：</h6>
+          <el-radio-group v-model="selectConditionTypeFront">
+            <el-radio label="1">
+              人员
+            </el-radio>
+            <el-radio label="2">
+              角色
+            </el-radio>
+            <el-radio label="3">
+              部门
+            </el-radio>
+          </el-radio-group>
           <template #footer>
             <el-button @click="conditionVisible = false">
               取 消
@@ -203,9 +271,23 @@
 
       <!-- 成员弹框 -->
       <select-employees-dialog
+        v-model:visible="conditionPersonVisible"
+        v-model:data="checkedList"
+        @change="sureSelectedCondition"
+      />
+
+      <!-- 角色弹框 -->
+      <select-role-dialog
         v-model:visible="conditionRoleVisible"
         v-model:data="checkedList"
-        @change="sureConditionRole"
+        @change="sureSelectedCondition"
+      />
+
+      <!-- 部门弹框 -->
+      <select-dept-dialog
+        v-model:visible="conditionDeptVisible"
+        v-model:data="checkedList"
+        @change="sureSelectedCondition"
       />
       <div class="demo-drawer__footer clear" style="margin-top: 50px;">
         <el-button type="primary" @click="saveCondition">