diff --git a/src/views/resource/common/selectPersonBydeptIdDialog.vue b/src/views/resource/common/selectPersonBydeptIdDialog.vue
new file mode 100644
index 0000000..24048be
--- /dev/null
+++ b/src/views/resource/common/selectPersonBydeptIdDialog.vue
@@ -0,0 +1,214 @@
+<!-- 选择发放人员 -->
+<script lang="ts" setup name="SelectDistributorDialog">
+import { ElButton, ElDialog, ElMessage } from 'element-plus'
+import { toTreeList } from '@/utils/structure'
+import { getAllUserList } from '@/api/system/user'
+import { getAllDeptList } from '@/api/system/dept'
+
+const props = defineProps({
+  title: {
+    type: String,
+    default: '选择人员',
+  },
+})
+// ----------------------- 以下是字段定义 emits props ---------------------
+const emits = defineEmits(['closeRefresh'])
+// 对话框是否显示
+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
+  getAllUserList(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
+  getAllDeptList(listQuery).then((res) => {
+    treeData.value = toTreeList(res.data, '0', true)
+    loadingTree.value = false
+  }).catch(() => {
+    loadingTree.value = false
+  })
+}
+
+// ----------初始化、关闭对话框相关-----------------
+function initDialog() {
+  dialogVisible.value = true
+  // 获取树形结构数据
+  fetchTreeData()
+  // 获取列表数据
+  fetchData()
+}
+// 关闭弹窗
+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 :loading="btnLoading" type="primary" @click="submitForm">
+          保存
+        </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/views/resource/common/selectPersonBydeptIdDialog.vue b/src/views/resource/common/selectPersonBydeptIdDialog.vue
new file mode 100644
index 0000000..24048be
--- /dev/null
+++ b/src/views/resource/common/selectPersonBydeptIdDialog.vue
@@ -0,0 +1,214 @@
+<!-- 选择发放人员 -->
+<script lang="ts" setup name="SelectDistributorDialog">
+import { ElButton, ElDialog, ElMessage } from 'element-plus'
+import { toTreeList } from '@/utils/structure'
+import { getAllUserList } from '@/api/system/user'
+import { getAllDeptList } from '@/api/system/dept'
+
+const props = defineProps({
+  title: {
+    type: String,
+    default: '选择人员',
+  },
+})
+// ----------------------- 以下是字段定义 emits props ---------------------
+const emits = defineEmits(['closeRefresh'])
+// 对话框是否显示
+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
+  getAllUserList(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
+  getAllDeptList(listQuery).then((res) => {
+    treeData.value = toTreeList(res.data, '0', true)
+    loadingTree.value = false
+  }).catch(() => {
+    loadingTree.value = false
+  })
+}
+
+// ----------初始化、关闭对话框相关-----------------
+function initDialog() {
+  dialogVisible.value = true
+  // 获取树形结构数据
+  fetchTreeData()
+  // 获取列表数据
+  fetchData()
+}
+// 关闭弹窗
+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 :loading="btnLoading" type="primary" @click="submitForm">
+          保存
+        </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/views/resource/customer/examine/detail.vue b/src/views/resource/customer/examine/detail.vue
index 035a858..3deb65a 100644
--- a/src/views/resource/customer/examine/detail.vue
+++ b/src/views/resource/customer/examine/detail.vue
@@ -6,6 +6,7 @@
 import ListTemplateDialog from './listTemplateDialog.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import { getDictByCode } from '@/api/system/dict'
+import { getFileMethodList } from '@/api/resource/fileTechnology'
 import { getInfo } from '@/api/equipment/standard/book'
 import { deleteExamineRevoked, failUpdateExamine, getExamineDetail, refuseApproval, revokeApproval, saveExamine, submitExamine, updateDraftExamine } from '@/api/resource/examine'
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
@@ -13,6 +14,7 @@
 import useUserStore from '@/store/modules/user'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
+import FilterTechnologyMethod from '@/views/resource/common/filterTechMethod.vue'
 
 // 从路由中传过来的参数
 const type = ref<string>('')
@@ -600,6 +602,39 @@
     loading.close()
   })
 }
+// -----------------------------------选择测试、校准检定方法------------------------------------------
+const methodFilterRef = ref()
+// 点击选择测试校准检定方法
+const showTechMethodFilter = () => {
+  methodFilterRef.value.showOrHideFilterDialog(true)
+}
+// 选好测试校准检定方法
+const methodSelectedHandler = (method: { fileName: string }) => {
+  examineInfo.value.measureMethodName = method.fileName
+  methodFilterRef.value.showOrHideFilterDialog(false)
+}
+
+// ====================下拉========================
+const measureMethodNameList = ref([]) // 选择测试校准检定方法下拉数据
+const fecthTechMethodList = () => {
+  const params = {
+    labCode: '',
+    groupCode: '',
+    fileNo: '', // 文件编号
+    fileName: '', // 文件名
+    fileDistributeNo: '', // 文件发放号
+    activeDateStart: '', //
+    activeDateEnd: '',
+    noveltyStatus: '',
+    offset: 1,
+    limit: 20,
+  }
+  getFileMethodList(params).then((response) => {
+    measureMethodNameList.value = response.data.rows
+  })
+}
+
+// -------------------------------------------------------------------------------------------------
 
 const initDialog = (params: any) => {
   // 从路由中获取参数
@@ -692,6 +727,7 @@
 
 onMounted(() => {
   console.log('要求委托书、合同评审表详情页面')
+  fecthTechMethodList() // 获取测试校准检定方法
   initDict()
   initDialog(route.query)
 })
@@ -914,9 +950,26 @@
         <el-form ref="examineMethodForm" :model="examineInfo" :rules="examineRules" label-position="right" label-width="250">
           <detail-block title="测试、校准或检定方法">
             <el-row :gutter="24">
-              <el-col :span="24">
+              <el-col :span="12">
                 <el-form-item label="测试、校准或检定方法名称" prop="measureMethodName">
-                  <el-input v-model="examineInfo.measureMethodName" type="textarea" :rows="3" placeholder="请填写测试、校准或检定方法名称" :clearable="true" :disabled="type === 'detail'" />
+                  <!-- <el-input v-model="examineInfo.measureMethodName" disabled placeholder="请选择测试、校准或检定方法名称" :disabled="type === 'detail'">
+                    <template #append>
+                      <el-button size="small" @click="showTechMethodFilter">
+                        选择
+                      </el-button>
+                    </template>
+                  </el-input> -->
+                  <el-select
+                    v-model="examineInfo.measureMethodName"
+                    placeholder="测试、校准或检定方法名称"
+                    filterable
+                    style="width: 100%;"
+                  >
+                    <el-option v-for="item in measureMethodNameList" :key="item.id" :label="item.fileName" :value="item.fileName">
+                      <span style="float: left;">{{ item.fileName }}</span>
+                      <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.noveltyStatusName }}</span>
+                    </el-option>
+                  </el-select>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -996,6 +1049,8 @@
       <approval-record-table :process-id="examineInfo.processId" />
     </template>
   </app-container>
+  <!-- 选择测试校准检定方法组件 -->
+  <filter-technology-method ref="methodFilterRef" @record-selected="methodSelectedHandler" />
 </template>
 
 <style lang="scss">

diff --git a/src/views/resource/common/selectPersonBydeptIdDialog.vue b/src/views/resource/common/selectPersonBydeptIdDialog.vue
new file mode 100644
index 0000000..24048be
--- /dev/null
+++ b/src/views/resource/common/selectPersonBydeptIdDialog.vue
@@ -0,0 +1,214 @@
+<!-- 选择发放人员 -->
+<script lang="ts" setup name="SelectDistributorDialog">
+import { ElButton, ElDialog, ElMessage } from 'element-plus'
+import { toTreeList } from '@/utils/structure'
+import { getAllUserList } from '@/api/system/user'
+import { getAllDeptList } from '@/api/system/dept'
+
+const props = defineProps({
+  title: {
+    type: String,
+    default: '选择人员',
+  },
+})
+// ----------------------- 以下是字段定义 emits props ---------------------
+const emits = defineEmits(['closeRefresh'])
+// 对话框是否显示
+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
+  getAllUserList(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
+  getAllDeptList(listQuery).then((res) => {
+    treeData.value = toTreeList(res.data, '0', true)
+    loadingTree.value = false
+  }).catch(() => {
+    loadingTree.value = false
+  })
+}
+
+// ----------初始化、关闭对话框相关-----------------
+function initDialog() {
+  dialogVisible.value = true
+  // 获取树形结构数据
+  fetchTreeData()
+  // 获取列表数据
+  fetchData()
+}
+// 关闭弹窗
+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 :loading="btnLoading" type="primary" @click="submitForm">
+          保存
+        </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/views/resource/customer/examine/detail.vue b/src/views/resource/customer/examine/detail.vue
index 035a858..3deb65a 100644
--- a/src/views/resource/customer/examine/detail.vue
+++ b/src/views/resource/customer/examine/detail.vue
@@ -6,6 +6,7 @@
 import ListTemplateDialog from './listTemplateDialog.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import { getDictByCode } from '@/api/system/dict'
+import { getFileMethodList } from '@/api/resource/fileTechnology'
 import { getInfo } from '@/api/equipment/standard/book'
 import { deleteExamineRevoked, failUpdateExamine, getExamineDetail, refuseApproval, revokeApproval, saveExamine, submitExamine, updateDraftExamine } from '@/api/resource/examine'
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
@@ -13,6 +14,7 @@
 import useUserStore from '@/store/modules/user'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
+import FilterTechnologyMethod from '@/views/resource/common/filterTechMethod.vue'
 
 // 从路由中传过来的参数
 const type = ref<string>('')
@@ -600,6 +602,39 @@
     loading.close()
   })
 }
+// -----------------------------------选择测试、校准检定方法------------------------------------------
+const methodFilterRef = ref()
+// 点击选择测试校准检定方法
+const showTechMethodFilter = () => {
+  methodFilterRef.value.showOrHideFilterDialog(true)
+}
+// 选好测试校准检定方法
+const methodSelectedHandler = (method: { fileName: string }) => {
+  examineInfo.value.measureMethodName = method.fileName
+  methodFilterRef.value.showOrHideFilterDialog(false)
+}
+
+// ====================下拉========================
+const measureMethodNameList = ref([]) // 选择测试校准检定方法下拉数据
+const fecthTechMethodList = () => {
+  const params = {
+    labCode: '',
+    groupCode: '',
+    fileNo: '', // 文件编号
+    fileName: '', // 文件名
+    fileDistributeNo: '', // 文件发放号
+    activeDateStart: '', //
+    activeDateEnd: '',
+    noveltyStatus: '',
+    offset: 1,
+    limit: 20,
+  }
+  getFileMethodList(params).then((response) => {
+    measureMethodNameList.value = response.data.rows
+  })
+}
+
+// -------------------------------------------------------------------------------------------------
 
 const initDialog = (params: any) => {
   // 从路由中获取参数
@@ -692,6 +727,7 @@
 
 onMounted(() => {
   console.log('要求委托书、合同评审表详情页面')
+  fecthTechMethodList() // 获取测试校准检定方法
   initDict()
   initDialog(route.query)
 })
@@ -914,9 +950,26 @@
         <el-form ref="examineMethodForm" :model="examineInfo" :rules="examineRules" label-position="right" label-width="250">
           <detail-block title="测试、校准或检定方法">
             <el-row :gutter="24">
-              <el-col :span="24">
+              <el-col :span="12">
                 <el-form-item label="测试、校准或检定方法名称" prop="measureMethodName">
-                  <el-input v-model="examineInfo.measureMethodName" type="textarea" :rows="3" placeholder="请填写测试、校准或检定方法名称" :clearable="true" :disabled="type === 'detail'" />
+                  <!-- <el-input v-model="examineInfo.measureMethodName" disabled placeholder="请选择测试、校准或检定方法名称" :disabled="type === 'detail'">
+                    <template #append>
+                      <el-button size="small" @click="showTechMethodFilter">
+                        选择
+                      </el-button>
+                    </template>
+                  </el-input> -->
+                  <el-select
+                    v-model="examineInfo.measureMethodName"
+                    placeholder="测试、校准或检定方法名称"
+                    filterable
+                    style="width: 100%;"
+                  >
+                    <el-option v-for="item in measureMethodNameList" :key="item.id" :label="item.fileName" :value="item.fileName">
+                      <span style="float: left;">{{ item.fileName }}</span>
+                      <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.noveltyStatusName }}</span>
+                    </el-option>
+                  </el-select>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -996,6 +1049,8 @@
       <approval-record-table :process-id="examineInfo.processId" />
     </template>
   </app-container>
+  <!-- 选择测试校准检定方法组件 -->
+  <filter-technology-method ref="methodFilterRef" @record-selected="methodSelectedHandler" />
 </template>
 
 <style lang="scss">
diff --git a/src/views/resource/file/grantNotice/detail.vue b/src/views/resource/file/grantNotice/detail.vue
index 49811b8..944fa56 100644
--- a/src/views/resource/file/grantNotice/detail.vue
+++ b/src/views/resource/file/grantNotice/detail.vue
@@ -8,6 +8,7 @@
 import selectCustomerContratList from './dialog/selectCustomerContratList.vue'
 import selectFileApprovalDialog from './dialog/selectFileApprovalDialog.vue'
 import selectSourceChangeDialog from './dialog/selectSourceChangeDialog.vue'
+import selectDistributorDialog from './dialog/selectDistributorDialog.vue'
 import selectMethodDialog from '@/views/resource/file/methodConfirm/selectMethodDialog.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -201,8 +202,8 @@
           grantType, // 文件发放类型
           grantTypeName: title, // 文件发放类型名称
           id: '',
-          approvalFileId: type === '2' ? item.fileId: item.id, // 文件审批表的关联文件表id
-          fileApprovalId: type === '2' ? item.fileId: item.id, // 文件审批表id
+          approvalFileId: type === '2' ? item.fileId : item.id, // 文件审批表的关联文件表id
+          fileApprovalId: type === '2' ? item.fileId : item.id, // 文件审批表id
         })
       }
     })
@@ -671,7 +672,22 @@
   })
 }
 
-// --------------------------------------------------------------------------------------------------
+// ------------------------------------选择发放人员--------------------------------------------------------------
+const selectDistributorRef = ref() // 选择发放人员组件ref
+// 点击选择发放人员
+const selectDistributor = () => {
+  selectDistributorRef.value.initDialog()
+}
+
+// 确认选择发放人员
+const confirmSelectPerson = (val: any) => {
+  console.log('确定选择的数据', val)
+  grantNoticeForm.value.distributorNames = val.map((item: { staffName: string }) => item.staffName)
+  console.log(grantNoticeForm.value.distributorNames)
+  grantNoticeForm.value.distributor = val.map((item: { id: string }) => item.id)
+  console.log(grantNoticeForm.value.distributor)
+}
+// --------------------------------------------------------------------------------------------------------
 
 const initDict = async () => {
   fetchStaffList()
@@ -734,17 +750,17 @@
   }
 }
 
-const changeDistributor = (val: any) => {
-  console.log(val)
-  grantNoticeForm.value.distributorNames = []
-  val.forEach((id: string) => {
-    const index = staffUserList.value.findIndex(i => i.id === id)
-    if (index !== -1) {
-      grantNoticeForm.value.distributorNames.push(`${staffUserList.value[index].name}`)
-    }
-  })
-  console.log(grantNoticeForm.value.distributorNames)
-}
+// const changeDistributor = (val: any) => {
+//   console.log(val)
+//   grantNoticeForm.value.distributorNames = []
+//   val.forEach((id: string) => {
+//     const index = staffUserList.value.findIndex(i => i.id === id)
+//     if (index !== -1) {
+//       grantNoticeForm.value.distributorNames.push(`${staffUserList.value[index].name}`)
+//     }
+//   })
+//   console.log(grantNoticeForm.value.distributorNames)
+// }
 
 watch(() => status.value, (val) => {
   if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
@@ -857,16 +873,27 @@
               </el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="24">
             <el-form-item label="发放人员" prop="distributor">
-              <el-select v-model="grantNoticeForm.distributor" :disabled="type === 'detail'" multiple placeholder="请选择发放人员" style="width: 100%;" filterable @change="changeDistributor">
+              <!-- <el-select v-model="grantNoticeForm.distributor" :disabled="type === 'detail'" multiple placeholder="请选择发放人员" style="width: 100%;" filterable @change="changeDistributor">
                 <el-option
                   v-for="item in staffUserList"
                   :key="item.id"
                   :label="item.name"
                   :value="item.id"
                 />
-              </el-select>
+              </el-select> -->
+              <el-input
+                v-model="grantNoticeForm.distributorNames"
+                placeholder="请选择发放人员"
+                disabled
+              >
+                <template v-if="type !== 'detail'" #append>
+                  <el-button size="small" @click="selectDistributor">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -947,5 +974,7 @@
     <select-method-dialog ref="selectMethodDialogRef" @confirm="(list: any, listParam: any) => confirmSelectFile(listParam, '2')" />
     <!-- 选择溯源链变更 -->
     <select-source-change-dialog ref="selectSourceChangeDialogRef" @confirm="(listParam: any) => confirmSelectFile(listParam, '5')" />
+    <!-- 选择发放人员 -->
+    <select-distributor-dialog ref="selectDistributorRef" title="选择发放人员(数据来源于计量人员)" @confirm="confirmSelectPerson" />
   </app-container>
 </template>

diff --git a/src/views/resource/common/selectPersonBydeptIdDialog.vue b/src/views/resource/common/selectPersonBydeptIdDialog.vue
new file mode 100644
index 0000000..24048be
--- /dev/null
+++ b/src/views/resource/common/selectPersonBydeptIdDialog.vue
@@ -0,0 +1,214 @@
+<!-- 选择发放人员 -->
+<script lang="ts" setup name="SelectDistributorDialog">
+import { ElButton, ElDialog, ElMessage } from 'element-plus'
+import { toTreeList } from '@/utils/structure'
+import { getAllUserList } from '@/api/system/user'
+import { getAllDeptList } from '@/api/system/dept'
+
+const props = defineProps({
+  title: {
+    type: String,
+    default: '选择人员',
+  },
+})
+// ----------------------- 以下是字段定义 emits props ---------------------
+const emits = defineEmits(['closeRefresh'])
+// 对话框是否显示
+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
+  getAllUserList(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
+  getAllDeptList(listQuery).then((res) => {
+    treeData.value = toTreeList(res.data, '0', true)
+    loadingTree.value = false
+  }).catch(() => {
+    loadingTree.value = false
+  })
+}
+
+// ----------初始化、关闭对话框相关-----------------
+function initDialog() {
+  dialogVisible.value = true
+  // 获取树形结构数据
+  fetchTreeData()
+  // 获取列表数据
+  fetchData()
+}
+// 关闭弹窗
+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 :loading="btnLoading" type="primary" @click="submitForm">
+          保存
+        </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/views/resource/customer/examine/detail.vue b/src/views/resource/customer/examine/detail.vue
index 035a858..3deb65a 100644
--- a/src/views/resource/customer/examine/detail.vue
+++ b/src/views/resource/customer/examine/detail.vue
@@ -6,6 +6,7 @@
 import ListTemplateDialog from './listTemplateDialog.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import { getDictByCode } from '@/api/system/dict'
+import { getFileMethodList } from '@/api/resource/fileTechnology'
 import { getInfo } from '@/api/equipment/standard/book'
 import { deleteExamineRevoked, failUpdateExamine, getExamineDetail, refuseApproval, revokeApproval, saveExamine, submitExamine, updateDraftExamine } from '@/api/resource/examine'
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
@@ -13,6 +14,7 @@
 import useUserStore from '@/store/modules/user'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
+import FilterTechnologyMethod from '@/views/resource/common/filterTechMethod.vue'
 
 // 从路由中传过来的参数
 const type = ref<string>('')
@@ -600,6 +602,39 @@
     loading.close()
   })
 }
+// -----------------------------------选择测试、校准检定方法------------------------------------------
+const methodFilterRef = ref()
+// 点击选择测试校准检定方法
+const showTechMethodFilter = () => {
+  methodFilterRef.value.showOrHideFilterDialog(true)
+}
+// 选好测试校准检定方法
+const methodSelectedHandler = (method: { fileName: string }) => {
+  examineInfo.value.measureMethodName = method.fileName
+  methodFilterRef.value.showOrHideFilterDialog(false)
+}
+
+// ====================下拉========================
+const measureMethodNameList = ref([]) // 选择测试校准检定方法下拉数据
+const fecthTechMethodList = () => {
+  const params = {
+    labCode: '',
+    groupCode: '',
+    fileNo: '', // 文件编号
+    fileName: '', // 文件名
+    fileDistributeNo: '', // 文件发放号
+    activeDateStart: '', //
+    activeDateEnd: '',
+    noveltyStatus: '',
+    offset: 1,
+    limit: 20,
+  }
+  getFileMethodList(params).then((response) => {
+    measureMethodNameList.value = response.data.rows
+  })
+}
+
+// -------------------------------------------------------------------------------------------------
 
 const initDialog = (params: any) => {
   // 从路由中获取参数
@@ -692,6 +727,7 @@
 
 onMounted(() => {
   console.log('要求委托书、合同评审表详情页面')
+  fecthTechMethodList() // 获取测试校准检定方法
   initDict()
   initDialog(route.query)
 })
@@ -914,9 +950,26 @@
         <el-form ref="examineMethodForm" :model="examineInfo" :rules="examineRules" label-position="right" label-width="250">
           <detail-block title="测试、校准或检定方法">
             <el-row :gutter="24">
-              <el-col :span="24">
+              <el-col :span="12">
                 <el-form-item label="测试、校准或检定方法名称" prop="measureMethodName">
-                  <el-input v-model="examineInfo.measureMethodName" type="textarea" :rows="3" placeholder="请填写测试、校准或检定方法名称" :clearable="true" :disabled="type === 'detail'" />
+                  <!-- <el-input v-model="examineInfo.measureMethodName" disabled placeholder="请选择测试、校准或检定方法名称" :disabled="type === 'detail'">
+                    <template #append>
+                      <el-button size="small" @click="showTechMethodFilter">
+                        选择
+                      </el-button>
+                    </template>
+                  </el-input> -->
+                  <el-select
+                    v-model="examineInfo.measureMethodName"
+                    placeholder="测试、校准或检定方法名称"
+                    filterable
+                    style="width: 100%;"
+                  >
+                    <el-option v-for="item in measureMethodNameList" :key="item.id" :label="item.fileName" :value="item.fileName">
+                      <span style="float: left;">{{ item.fileName }}</span>
+                      <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.noveltyStatusName }}</span>
+                    </el-option>
+                  </el-select>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -996,6 +1049,8 @@
       <approval-record-table :process-id="examineInfo.processId" />
     </template>
   </app-container>
+  <!-- 选择测试校准检定方法组件 -->
+  <filter-technology-method ref="methodFilterRef" @record-selected="methodSelectedHandler" />
 </template>
 
 <style lang="scss">
diff --git a/src/views/resource/file/grantNotice/detail.vue b/src/views/resource/file/grantNotice/detail.vue
index 49811b8..944fa56 100644
--- a/src/views/resource/file/grantNotice/detail.vue
+++ b/src/views/resource/file/grantNotice/detail.vue
@@ -8,6 +8,7 @@
 import selectCustomerContratList from './dialog/selectCustomerContratList.vue'
 import selectFileApprovalDialog from './dialog/selectFileApprovalDialog.vue'
 import selectSourceChangeDialog from './dialog/selectSourceChangeDialog.vue'
+import selectDistributorDialog from './dialog/selectDistributorDialog.vue'
 import selectMethodDialog from '@/views/resource/file/methodConfirm/selectMethodDialog.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -201,8 +202,8 @@
           grantType, // 文件发放类型
           grantTypeName: title, // 文件发放类型名称
           id: '',
-          approvalFileId: type === '2' ? item.fileId: item.id, // 文件审批表的关联文件表id
-          fileApprovalId: type === '2' ? item.fileId: item.id, // 文件审批表id
+          approvalFileId: type === '2' ? item.fileId : item.id, // 文件审批表的关联文件表id
+          fileApprovalId: type === '2' ? item.fileId : item.id, // 文件审批表id
         })
       }
     })
@@ -671,7 +672,22 @@
   })
 }
 
-// --------------------------------------------------------------------------------------------------
+// ------------------------------------选择发放人员--------------------------------------------------------------
+const selectDistributorRef = ref() // 选择发放人员组件ref
+// 点击选择发放人员
+const selectDistributor = () => {
+  selectDistributorRef.value.initDialog()
+}
+
+// 确认选择发放人员
+const confirmSelectPerson = (val: any) => {
+  console.log('确定选择的数据', val)
+  grantNoticeForm.value.distributorNames = val.map((item: { staffName: string }) => item.staffName)
+  console.log(grantNoticeForm.value.distributorNames)
+  grantNoticeForm.value.distributor = val.map((item: { id: string }) => item.id)
+  console.log(grantNoticeForm.value.distributor)
+}
+// --------------------------------------------------------------------------------------------------------
 
 const initDict = async () => {
   fetchStaffList()
@@ -734,17 +750,17 @@
   }
 }
 
-const changeDistributor = (val: any) => {
-  console.log(val)
-  grantNoticeForm.value.distributorNames = []
-  val.forEach((id: string) => {
-    const index = staffUserList.value.findIndex(i => i.id === id)
-    if (index !== -1) {
-      grantNoticeForm.value.distributorNames.push(`${staffUserList.value[index].name}`)
-    }
-  })
-  console.log(grantNoticeForm.value.distributorNames)
-}
+// const changeDistributor = (val: any) => {
+//   console.log(val)
+//   grantNoticeForm.value.distributorNames = []
+//   val.forEach((id: string) => {
+//     const index = staffUserList.value.findIndex(i => i.id === id)
+//     if (index !== -1) {
+//       grantNoticeForm.value.distributorNames.push(`${staffUserList.value[index].name}`)
+//     }
+//   })
+//   console.log(grantNoticeForm.value.distributorNames)
+// }
 
 watch(() => status.value, (val) => {
   if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
@@ -857,16 +873,27 @@
               </el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="24">
             <el-form-item label="发放人员" prop="distributor">
-              <el-select v-model="grantNoticeForm.distributor" :disabled="type === 'detail'" multiple placeholder="请选择发放人员" style="width: 100%;" filterable @change="changeDistributor">
+              <!-- <el-select v-model="grantNoticeForm.distributor" :disabled="type === 'detail'" multiple placeholder="请选择发放人员" style="width: 100%;" filterable @change="changeDistributor">
                 <el-option
                   v-for="item in staffUserList"
                   :key="item.id"
                   :label="item.name"
                   :value="item.id"
                 />
-              </el-select>
+              </el-select> -->
+              <el-input
+                v-model="grantNoticeForm.distributorNames"
+                placeholder="请选择发放人员"
+                disabled
+              >
+                <template v-if="type !== 'detail'" #append>
+                  <el-button size="small" @click="selectDistributor">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -947,5 +974,7 @@
     <select-method-dialog ref="selectMethodDialogRef" @confirm="(list: any, listParam: any) => confirmSelectFile(listParam, '2')" />
     <!-- 选择溯源链变更 -->
     <select-source-change-dialog ref="selectSourceChangeDialogRef" @confirm="(listParam: any) => confirmSelectFile(listParam, '5')" />
+    <!-- 选择发放人员 -->
+    <select-distributor-dialog ref="selectDistributorRef" title="选择发放人员(数据来源于计量人员)" @confirm="confirmSelectPerson" />
   </app-container>
 </template>
diff --git a/src/views/resource/file/grantNotice/dialog/selectDistributorDialog.vue b/src/views/resource/file/grantNotice/dialog/selectDistributorDialog.vue
new file mode 100644
index 0000000..406a920
--- /dev/null
+++ b/src/views/resource/file/grantNotice/dialog/selectDistributorDialog.vue
@@ -0,0 +1,272 @@
+<!-- 选择发放人员 -->
+<script lang="ts" setup name="SelectDistributorDialog">
+import { ElButton, ElDialog, ElMessage } from 'element-plus'
+import { toTreeList } from '@/utils/structure'
+import { getAllUserList } from '@/api/system/user'
+import { getAllDeptList } from '@/api/system/dept'
+import { getStaffList } from '@/api/resource/register'
+import { getDictByCode } from '@/api/system/dict'
+
+const props = defineProps({
+  title: {
+    type: String,
+    default: '选择人员',
+  },
+})
+// ----------------------- 以下是字段定义 emits props ---------------------
+const emits = defineEmits(['closeRefresh', 'confirm'])
+// 对话框是否显示
+const dialogVisible = ref(false)
+const tableRef = ref()
+const defaultProps = {
+  children: 'children',
+  label: 'name',
+}
+// 查询参数
+const listQuery = reactive({
+  name: '',
+  deptName: '',
+  rankExperience: '', // 军衔/时间
+  titleExperience: '', // 职称职务/时间
+  treatmentExperience: '', // 待遇等级时间
+  labCode: '', // 实验室
+  groupCode: '', // 组别
+  offset: 1,
+  limit: 20,
+})
+const list = ref([])
+const checkoutList = ref([])
+const total = ref(0)
+const treeData = ref([]) as any
+const loadingTable = ref<boolean>(false)
+const loadingTree = ref<boolean>(false)
+const columns = [
+  { text: '姓名', value: 'staffName', align: 'center' },
+  { text: '出生日期', value: 'birthday', align: 'center', width: '160' },
+  { text: '军官/文职证号', value: 'officerNo', align: 'center', width: '160' },
+  { text: '工作部门', value: 'deptName', align: 'center' },
+  { text: '军衔/时间', value: 'rankExperience', align: 'center' },
+  { text: '待遇级别/时间', value: 'treatmentExperience', align: 'center' },
+  { text: '职称职务/时间', value: 'titleExperience', align: 'center' },
+]
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 获取列表数据
+const fetchData = () => {
+  loadingTable.value = true
+  getStaffList(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.name = ''
+  listQuery.deptName = ''
+  listQuery.rankExperience = '' // 军衔/时间
+  listQuery.titleExperience = '' // 职称职务/时间
+  listQuery.treatmentExperience = '' // 待遇等级时间
+  listQuery.labCode = '' // 实验室
+  listQuery.groupCode = '' // 组别
+  listQuery.offset = 1
+  listQuery.limit = 20
+  fetchData()
+}
+
+// 点击树形结构
+const handleNodeClick = (data: any, node: any, dom: any) => {
+  console.log('节点所对应的对象、', data)
+  console.log('节点对应的 Node、', node)
+  console.log('节点组件本身', dom)
+  if (node.isLeaf) { // 叶子节点
+    listQuery.labCode = node.parent.data.value as string
+    listQuery.groupCode = data.value as string
+  }
+  else {
+    listQuery.labCode = data.value as string
+    listQuery.groupCode = '' as string
+  }
+
+  fetchData()
+}
+
+// 获取组织列表树数据
+const fetchTreeData = async () => {
+  // loadingTree.value = true
+  // getAllDeptList(listQuery).then((res) => {
+  //   treeData.value = toTreeList(res.data, '0', true)
+  //   loadingTree.value = false
+  // }).catch(() => {
+  //   loadingTree.value = false
+  // })
+  // 实验室
+  const labResponse = await getDictByCode('bizGroupCodeEquipment')
+  const labDeptList = labResponse.data.map((item: { name: string }) => {
+    return {
+      ...item,
+      label: item.name,
+    }
+  })
+  const groupResponse = await getDictByCode('bizGroupCode')
+  const groupCodeList = groupResponse.data.map((item: { name: string }) => {
+    return {
+      ...item,
+      label: item.name,
+    }
+  })
+  treeData.value = []
+  labDeptList.forEach((labItem: any) => {
+    treeData.value.push({
+      ...labItem,
+      children: groupCodeList,
+    })
+  })
+}
+
+// ----------初始化、关闭对话框相关-----------------
+function initDialog() {
+  dialogVisible.value = true
+
+  // 获取树形结构数据
+  fetchTreeData()
+  // 获取列表数据
+  fetchData()
+  nextTick(() => {
+    if (tableRef.value) {
+      tableRef.value.clearMulti() // 清除上次的多选
+    }
+  })
+}
+
+// 点击确定
+const confirm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('至少选中一条数据')
+    return false
+  }
+  emits('confirm', checkoutList.value)
+  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="listQuery.name" placeholder="姓名" clearable />
+          </search-item>
+          <search-item>
+            <el-input v-model="listQuery.deptName" placeholder="工作部门" clearable />
+          </search-item>
+          <search-item>
+            <el-input v-model="listQuery.rankExperience" placeholder="军衔/时间" clearable />
+          </search-item>
+          <search-item>
+            <el-input v-model="listQuery.treatmentExperience" placeholder="待遇级别/时间" clearable />
+          </search-item>
+          <search-item>
+            <el-input v-model="listQuery.titleExperience" placeholder="职称职务/时间" clearable />
+          </search-item>
+        </search-area>
+        <!-- 表头标题 -->
+        <table-container :title-show="false">
+          <normal-table
+            ref="tableRef"
+            :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 :loading="btnLoading" 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>