diff --git a/src/api/resource/questionnaire.ts b/src/api/resource/questionnaire.ts
index f40c875..9e55dc7 100644
--- a/src/api/resource/questionnaire.ts
+++ b/src/api/resource/questionnaire.ts
@@ -17,3 +17,22 @@
     data,
   })
 }
+
+// 发送
+export function send(data: { ids: string[] }) {
+  return request({
+    url: `${prefix}/questionnaire/send`,
+    method: 'post',
+    data,
+  })
+}
+
+remindWorker
+// 催办
+export function remindWorker(data: { id: string }) {
+  return request({
+    url: `${prefix}/questionnaire/remindWorker`,
+    method: 'post',
+    data,
+  })
+}

diff --git a/src/api/resource/questionnaire.ts b/src/api/resource/questionnaire.ts
index f40c875..9e55dc7 100644
--- a/src/api/resource/questionnaire.ts
+++ b/src/api/resource/questionnaire.ts
@@ -17,3 +17,22 @@
     data,
   })
 }
+
+// 发送
+export function send(data: { ids: string[] }) {
+  return request({
+    url: `${prefix}/questionnaire/send`,
+    method: 'post',
+    data,
+  })
+}
+
+remindWorker
+// 催办
+export function remindWorker(data: { id: string }) {
+  return request({
+    url: `${prefix}/questionnaire/remindWorker`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/resource/common/filterConsumableCheck.vue b/src/views/resource/common/filterConsumableCheck.vue
new file mode 100644
index 0000000..14f6d0a
--- /dev/null
+++ b/src/views/resource/common/filterConsumableCheck.vue
@@ -0,0 +1,198 @@
+<!-- 选择物资验收记录 -->
+<script lang="ts" setup name="FilterConsumableCheck">
+import { ElMessage } from 'element-plus'
+import type { Ref } from 'vue'
+import { ref } from 'vue'
+import dayjs from 'dayjs'
+import type { DateModelType } from 'element-plus'
+import { getLocationList } from '@/api/business/taskMeasure/measureData'
+import { getGoodsCheckList } from '@/api/resource/supplierConsumable'
+import { getStaffList } from '@/api/resource/register'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { getCustomerInfoList } from '@/api/resource/customer'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  recordNo: '', // 记录单编号
+  createDept: '',
+  createUserName: '', // 创建人
+  acceptTimeStart: '', // 创建时间-起始
+  acceptTimeEnd: '', // 创建时间-结束
+  approvalStatus: '0', // 审批状态
+  formId: SCHEDULE.CHECK_MATERIAL_RECORD_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
+  offset: 1,
+  limit: 20,
+})
+// 多选选中的内容
+const checkoutList = ref([])
+const loadingTable = ref(false)
+const list = ref([]) // 表格数据
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '文件编号', value: 'recordNo', align: 'center', width: '200' },
+  { text: '物资名称', value: 'goodsName', align: 'center' },
+  { text: '规格型号', value: 'goodsModel', align: 'center' },
+  { text: '验收部门', value: 'createDept', align: 'center', width: '160' },
+  { text: '验收人', value: 'createUserName', align: 'center', width: '120' },
+  { text: '验收时间', value: 'createTime', align: 'center', width: '120' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '100' },
+])
+const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
+
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getGoodsCheckList(listQuery.value).then((response) => {
+    if (response.code === 200) {
+      list.value = response.data.rows.map((item: any) => {
+        return {
+          ...item,
+          createTime: item.createTime!.length > 16 ? item.createTime!.substring(0, 10) : '',
+        }
+      })
+      total.value = parseInt(response.data.total)
+    }
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
+}
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    recordNo: '', // 记录单编号
+    createDept: '',
+    createUserName: '', // 创建人
+    acceptTimeStart: '', // 创建时间-起始
+    acceptTimeEnd: '', // 创建时间-结束
+    approvalStatus: '0', // 审批状态
+    formId: SCHEDULE.CHECK_MATERIAL_RECORD_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
+    offset: 1,
+    limit: 20,
+  }
+  dateRange.value = ['', '']
+  fetchData()
+}
+// 搜索
+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
+  }
+  search()
+}
+// 点击确定
+const confirmSelect = (row: any) => {
+  emits('confirm', [row])
+  dialogFormVisible.value = false
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData()
+}
+
+watch(dateRange, (val) => {
+  if (val) {
+    listQuery.value.acceptTimeStart = dayjs(val[0]).format('YYYY-MM-DD') === 'Invalid Date' ? '' : dayjs(val[0]).format('YYYY-MM-DD')
+    listQuery.value.acceptTimeEnd = dayjs(val[1]).format('YYYY-MM-DD') === 'Invalid Date' ? '' : dayjs(val[1]).format('YYYY-MM-DD')
+  }
+  else {
+    listQuery.value.acceptTimeStart = ''
+    listQuery.value.acceptTimeEnd = ''
+  }
+})
+
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择工作间" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input v-model="listQuery.recordNo" placeholder="文件编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.createDept" placeholder="验收部门" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.createUserName" placeholder="验收人" clearable />
+      </search-item>
+      <search-item>
+        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="验收时间（开始）" end-placeholder="验收时间（结束）" />
+      </search-item>
+    </search-area>
+
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        :height="520"
+        :is-show-single-select-button="true"
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column fixed="right" label="操作" align="center" width="130">
+            <template #default="{ row }">
+              <el-button size="small" type="primary" @click="confirmSelect(row)">
+                选定
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <!-- <el-button type="primary" @click="confirmSelect">确认</el-button> -->
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>

diff --git a/src/api/resource/questionnaire.ts b/src/api/resource/questionnaire.ts
index f40c875..9e55dc7 100644
--- a/src/api/resource/questionnaire.ts
+++ b/src/api/resource/questionnaire.ts
@@ -17,3 +17,22 @@
     data,
   })
 }
+
+// 发送
+export function send(data: { ids: string[] }) {
+  return request({
+    url: `${prefix}/questionnaire/send`,
+    method: 'post',
+    data,
+  })
+}
+
+remindWorker
+// 催办
+export function remindWorker(data: { id: string }) {
+  return request({
+    url: `${prefix}/questionnaire/remindWorker`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/resource/common/filterConsumableCheck.vue b/src/views/resource/common/filterConsumableCheck.vue
new file mode 100644
index 0000000..14f6d0a
--- /dev/null
+++ b/src/views/resource/common/filterConsumableCheck.vue
@@ -0,0 +1,198 @@
+<!-- 选择物资验收记录 -->
+<script lang="ts" setup name="FilterConsumableCheck">
+import { ElMessage } from 'element-plus'
+import type { Ref } from 'vue'
+import { ref } from 'vue'
+import dayjs from 'dayjs'
+import type { DateModelType } from 'element-plus'
+import { getLocationList } from '@/api/business/taskMeasure/measureData'
+import { getGoodsCheckList } from '@/api/resource/supplierConsumable'
+import { getStaffList } from '@/api/resource/register'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { getCustomerInfoList } from '@/api/resource/customer'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  recordNo: '', // 记录单编号
+  createDept: '',
+  createUserName: '', // 创建人
+  acceptTimeStart: '', // 创建时间-起始
+  acceptTimeEnd: '', // 创建时间-结束
+  approvalStatus: '0', // 审批状态
+  formId: SCHEDULE.CHECK_MATERIAL_RECORD_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
+  offset: 1,
+  limit: 20,
+})
+// 多选选中的内容
+const checkoutList = ref([])
+const loadingTable = ref(false)
+const list = ref([]) // 表格数据
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '文件编号', value: 'recordNo', align: 'center', width: '200' },
+  { text: '物资名称', value: 'goodsName', align: 'center' },
+  { text: '规格型号', value: 'goodsModel', align: 'center' },
+  { text: '验收部门', value: 'createDept', align: 'center', width: '160' },
+  { text: '验收人', value: 'createUserName', align: 'center', width: '120' },
+  { text: '验收时间', value: 'createTime', align: 'center', width: '120' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '100' },
+])
+const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
+
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getGoodsCheckList(listQuery.value).then((response) => {
+    if (response.code === 200) {
+      list.value = response.data.rows.map((item: any) => {
+        return {
+          ...item,
+          createTime: item.createTime!.length > 16 ? item.createTime!.substring(0, 10) : '',
+        }
+      })
+      total.value = parseInt(response.data.total)
+    }
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
+}
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    recordNo: '', // 记录单编号
+    createDept: '',
+    createUserName: '', // 创建人
+    acceptTimeStart: '', // 创建时间-起始
+    acceptTimeEnd: '', // 创建时间-结束
+    approvalStatus: '0', // 审批状态
+    formId: SCHEDULE.CHECK_MATERIAL_RECORD_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
+    offset: 1,
+    limit: 20,
+  }
+  dateRange.value = ['', '']
+  fetchData()
+}
+// 搜索
+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
+  }
+  search()
+}
+// 点击确定
+const confirmSelect = (row: any) => {
+  emits('confirm', [row])
+  dialogFormVisible.value = false
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData()
+}
+
+watch(dateRange, (val) => {
+  if (val) {
+    listQuery.value.acceptTimeStart = dayjs(val[0]).format('YYYY-MM-DD') === 'Invalid Date' ? '' : dayjs(val[0]).format('YYYY-MM-DD')
+    listQuery.value.acceptTimeEnd = dayjs(val[1]).format('YYYY-MM-DD') === 'Invalid Date' ? '' : dayjs(val[1]).format('YYYY-MM-DD')
+  }
+  else {
+    listQuery.value.acceptTimeStart = ''
+    listQuery.value.acceptTimeEnd = ''
+  }
+})
+
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择工作间" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input v-model="listQuery.recordNo" placeholder="文件编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.createDept" placeholder="验收部门" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.createUserName" placeholder="验收人" clearable />
+      </search-item>
+      <search-item>
+        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="验收时间（开始）" end-placeholder="验收时间（结束）" />
+      </search-item>
+    </search-area>
+
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        :height="520"
+        :is-show-single-select-button="true"
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column fixed="right" label="操作" align="center" width="130">
+            <template #default="{ row }">
+              <el-button size="small" type="primary" @click="confirmSelect(row)">
+                选定
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <!-- <el-button type="primary" @click="confirmSelect">确认</el-button> -->
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/resource/common/filterCustomerStaff.vue b/src/views/resource/common/filterCustomerStaff.vue
index 610bf51..fd40e61 100644
--- a/src/views/resource/common/filterCustomerStaff.vue
+++ b/src/views/resource/common/filterCustomerStaff.vue
@@ -1,5 +1,6 @@
 <!-- 筛选系统用户弹窗 -->
 <script name="FilterCustomerStaff" lang="ts" setup>
+import { ElMessage } from 'element-plus'
 import type { ICustomerFilter, ICustomerTree } from './common-interface'
 import type { ICustomerInfo } from '@/views/resource/customer/info/customer-info'
 import type { IlistQueryType } from '@/views/system/user/user-interface'
@@ -7,11 +8,15 @@
 import { getCustomerInfoList } from '@/api/resource/customer'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 
-defineProps({
+const props = defineProps({
   title: {
     type: String,
     default: '请选择',
   },
+  isMulti: { // 是否多选
+    type: Boolean,
+    default: false,
+  },
 })
 
 const emit = defineEmits(['recordSelected'])
@@ -20,9 +25,10 @@
   children: 'children',
   label: 'customerName',
 }
-
+const tableLoading = ref(false)
 // 定义变量
 const customerIdSelected = ref<string>('')
+const customerDeptIdSelected = ref<string>('')
 const customerNameSelected = ref<string>('')
 const disabledCustomerName = ref(false) // 委托方筛选是否禁用
 const getCustomerName = ref('') // 委托方
@@ -44,7 +50,9 @@
   endTime: '',
   deptType: '',
 })
+const tableRef = ref()
 const sysUserList = ref([])
+const checkoutList = ref([]) // 多选
 const total = ref<number>(0) // 数据总条数
 const columns = ref <Array<TableColumn>>([
   { text: '账号', value: 'account', align: 'center' },
@@ -53,9 +61,13 @@
 ]) // 表头
 
 const customerTree = ref<Array<ICustomerTree>>([])
-
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
 // 查询用户列表
 const getSysUserList = () => {
+  tableLoading.value = true
   getAllUserList(sysUserQuery.value).then((res) => {
     if (res.code === 200) {
       sysUserList.value = res.data.rows.map((item: any) => {
@@ -63,10 +75,12 @@
           ...item,
           customerId: customerIdSelected.value,
           customerName: customerNameSelected.value,
+          customerDeptId: customerDeptIdSelected,
         }
       })
       total.value = Number(res.data.total)
     }
+    tableLoading.value = false
   })
 }
 
@@ -101,17 +115,25 @@
 
   // 赋值选中的委托方
   customerIdSelected.value = data.id
+  customerDeptIdSelected.value = data.deptId
   customerNameSelected.value = data.customerName
 
   getSysUserList()
 }
 
-// 选中用户
+// 单选选定
 const selectSingleUser = (row: Object) => {
   emit('recordSelected', row)
 }
 
-const showOrHideFilterDialog = (show: boolean, customerName = '', disabledCustomerNameParam = false) => {
+/**
+ * 弹窗显隐
+ * @param show 控制弹窗显隐
+ * @param customerName 委托方名称
+ * @param disabledCustomerNameParam 禁止修改委托方名称
+ * @param writerNames 委托方意见登记表--[]则清空原有的多选
+ */
+const showOrHideFilterDialog = (show: boolean, customerName = '', disabledCustomerNameParam = false, writerNames = []) => {
   if (show === false) {
     customerQuery.value.customerName = ''
     customerQuery.value.approvalStatus = '0'
@@ -136,6 +158,21 @@
   }
 
   showFilterDialog.value = show
+
+  if (!writerNames.length && show && tableRef.value) {
+    console.log('清除多选')
+    tableRef.value.clearMulti()
+  }
+}
+
+// 多选确定
+const submitEquipmentSelected = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('至少选中一条数据')
+    return false
+  }
+  emit('recordSelected', checkoutList.value)
+  showOrHideFilterDialog(false)
 }
 
 defineExpose({
@@ -176,13 +213,18 @@
         </search-area>
 
         <!-- 表格数据展示 -->
-        <table-container :title-show="false">
+        <table-container v-loading="tableLoading" :title-show="false">
           <!-- 表格区域 -->
           <normal-table
             id="sysUserFilter"
+            ref="tableRef"
             :data="sysUserList" :total="total" :columns="columns"
             :query="{ limit: sysUserQuery.limit, offset: sysUserQuery.offset }"
+            is-showmulti-select
+            :is-multi="isMulti"
+            :height="520"
             @change="changePage"
+            @multi-select="handleSelectionChange"
           >
             <template #preColumns>
               <el-table-column label="序号" width="55" align="center">
@@ -191,7 +233,7 @@
                 </template>
               </el-table-column>
             </template>
-            <template #columns>
+            <template v-if="!props.isMulti" #columns>
               <el-table-column fixed="right" label="操作" align="center" width="130">
                 <template #default="{ row }">
                   <el-button size="small" type="primary" @click="selectSingleUser(row)">
@@ -204,6 +246,15 @@
         </table-container>
       </div>
     </div>
+    <!-- 多选 -->
+    <template v-if="props.isMulti" #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitEquipmentSelected">
+          确定
+        </el-button>
+        <el-button @click="showOrHideFilterDialog(false)">取消</el-button>
+      </span>
+    </template>
   </el-dialog>
 </template>
 

diff --git a/src/api/resource/questionnaire.ts b/src/api/resource/questionnaire.ts
index f40c875..9e55dc7 100644
--- a/src/api/resource/questionnaire.ts
+++ b/src/api/resource/questionnaire.ts
@@ -17,3 +17,22 @@
     data,
   })
 }
+
+// 发送
+export function send(data: { ids: string[] }) {
+  return request({
+    url: `${prefix}/questionnaire/send`,
+    method: 'post',
+    data,
+  })
+}
+
+remindWorker
+// 催办
+export function remindWorker(data: { id: string }) {
+  return request({
+    url: `${prefix}/questionnaire/remindWorker`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/resource/common/filterConsumableCheck.vue b/src/views/resource/common/filterConsumableCheck.vue
new file mode 100644
index 0000000..14f6d0a
--- /dev/null
+++ b/src/views/resource/common/filterConsumableCheck.vue
@@ -0,0 +1,198 @@
+<!-- 选择物资验收记录 -->
+<script lang="ts" setup name="FilterConsumableCheck">
+import { ElMessage } from 'element-plus'
+import type { Ref } from 'vue'
+import { ref } from 'vue'
+import dayjs from 'dayjs'
+import type { DateModelType } from 'element-plus'
+import { getLocationList } from '@/api/business/taskMeasure/measureData'
+import { getGoodsCheckList } from '@/api/resource/supplierConsumable'
+import { getStaffList } from '@/api/resource/register'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { getCustomerInfoList } from '@/api/resource/customer'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  recordNo: '', // 记录单编号
+  createDept: '',
+  createUserName: '', // 创建人
+  acceptTimeStart: '', // 创建时间-起始
+  acceptTimeEnd: '', // 创建时间-结束
+  approvalStatus: '0', // 审批状态
+  formId: SCHEDULE.CHECK_MATERIAL_RECORD_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
+  offset: 1,
+  limit: 20,
+})
+// 多选选中的内容
+const checkoutList = ref([])
+const loadingTable = ref(false)
+const list = ref([]) // 表格数据
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '文件编号', value: 'recordNo', align: 'center', width: '200' },
+  { text: '物资名称', value: 'goodsName', align: 'center' },
+  { text: '规格型号', value: 'goodsModel', align: 'center' },
+  { text: '验收部门', value: 'createDept', align: 'center', width: '160' },
+  { text: '验收人', value: 'createUserName', align: 'center', width: '120' },
+  { text: '验收时间', value: 'createTime', align: 'center', width: '120' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '100' },
+])
+const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
+
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getGoodsCheckList(listQuery.value).then((response) => {
+    if (response.code === 200) {
+      list.value = response.data.rows.map((item: any) => {
+        return {
+          ...item,
+          createTime: item.createTime!.length > 16 ? item.createTime!.substring(0, 10) : '',
+        }
+      })
+      total.value = parseInt(response.data.total)
+    }
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
+}
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    recordNo: '', // 记录单编号
+    createDept: '',
+    createUserName: '', // 创建人
+    acceptTimeStart: '', // 创建时间-起始
+    acceptTimeEnd: '', // 创建时间-结束
+    approvalStatus: '0', // 审批状态
+    formId: SCHEDULE.CHECK_MATERIAL_RECORD_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
+    offset: 1,
+    limit: 20,
+  }
+  dateRange.value = ['', '']
+  fetchData()
+}
+// 搜索
+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
+  }
+  search()
+}
+// 点击确定
+const confirmSelect = (row: any) => {
+  emits('confirm', [row])
+  dialogFormVisible.value = false
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData()
+}
+
+watch(dateRange, (val) => {
+  if (val) {
+    listQuery.value.acceptTimeStart = dayjs(val[0]).format('YYYY-MM-DD') === 'Invalid Date' ? '' : dayjs(val[0]).format('YYYY-MM-DD')
+    listQuery.value.acceptTimeEnd = dayjs(val[1]).format('YYYY-MM-DD') === 'Invalid Date' ? '' : dayjs(val[1]).format('YYYY-MM-DD')
+  }
+  else {
+    listQuery.value.acceptTimeStart = ''
+    listQuery.value.acceptTimeEnd = ''
+  }
+})
+
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择工作间" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input v-model="listQuery.recordNo" placeholder="文件编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.createDept" placeholder="验收部门" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.createUserName" placeholder="验收人" clearable />
+      </search-item>
+      <search-item>
+        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="验收时间（开始）" end-placeholder="验收时间（结束）" />
+      </search-item>
+    </search-area>
+
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        :height="520"
+        :is-show-single-select-button="true"
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column fixed="right" label="操作" align="center" width="130">
+            <template #default="{ row }">
+              <el-button size="small" type="primary" @click="confirmSelect(row)">
+                选定
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <!-- <el-button type="primary" @click="confirmSelect">确认</el-button> -->
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/resource/common/filterCustomerStaff.vue b/src/views/resource/common/filterCustomerStaff.vue
index 610bf51..fd40e61 100644
--- a/src/views/resource/common/filterCustomerStaff.vue
+++ b/src/views/resource/common/filterCustomerStaff.vue
@@ -1,5 +1,6 @@
 <!-- 筛选系统用户弹窗 -->
 <script name="FilterCustomerStaff" lang="ts" setup>
+import { ElMessage } from 'element-plus'
 import type { ICustomerFilter, ICustomerTree } from './common-interface'
 import type { ICustomerInfo } from '@/views/resource/customer/info/customer-info'
 import type { IlistQueryType } from '@/views/system/user/user-interface'
@@ -7,11 +8,15 @@
 import { getCustomerInfoList } from '@/api/resource/customer'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 
-defineProps({
+const props = defineProps({
   title: {
     type: String,
     default: '请选择',
   },
+  isMulti: { // 是否多选
+    type: Boolean,
+    default: false,
+  },
 })
 
 const emit = defineEmits(['recordSelected'])
@@ -20,9 +25,10 @@
   children: 'children',
   label: 'customerName',
 }
-
+const tableLoading = ref(false)
 // 定义变量
 const customerIdSelected = ref<string>('')
+const customerDeptIdSelected = ref<string>('')
 const customerNameSelected = ref<string>('')
 const disabledCustomerName = ref(false) // 委托方筛选是否禁用
 const getCustomerName = ref('') // 委托方
@@ -44,7 +50,9 @@
   endTime: '',
   deptType: '',
 })
+const tableRef = ref()
 const sysUserList = ref([])
+const checkoutList = ref([]) // 多选
 const total = ref<number>(0) // 数据总条数
 const columns = ref <Array<TableColumn>>([
   { text: '账号', value: 'account', align: 'center' },
@@ -53,9 +61,13 @@
 ]) // 表头
 
 const customerTree = ref<Array<ICustomerTree>>([])
-
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
 // 查询用户列表
 const getSysUserList = () => {
+  tableLoading.value = true
   getAllUserList(sysUserQuery.value).then((res) => {
     if (res.code === 200) {
       sysUserList.value = res.data.rows.map((item: any) => {
@@ -63,10 +75,12 @@
           ...item,
           customerId: customerIdSelected.value,
           customerName: customerNameSelected.value,
+          customerDeptId: customerDeptIdSelected,
         }
       })
       total.value = Number(res.data.total)
     }
+    tableLoading.value = false
   })
 }
 
@@ -101,17 +115,25 @@
 
   // 赋值选中的委托方
   customerIdSelected.value = data.id
+  customerDeptIdSelected.value = data.deptId
   customerNameSelected.value = data.customerName
 
   getSysUserList()
 }
 
-// 选中用户
+// 单选选定
 const selectSingleUser = (row: Object) => {
   emit('recordSelected', row)
 }
 
-const showOrHideFilterDialog = (show: boolean, customerName = '', disabledCustomerNameParam = false) => {
+/**
+ * 弹窗显隐
+ * @param show 控制弹窗显隐
+ * @param customerName 委托方名称
+ * @param disabledCustomerNameParam 禁止修改委托方名称
+ * @param writerNames 委托方意见登记表--[]则清空原有的多选
+ */
+const showOrHideFilterDialog = (show: boolean, customerName = '', disabledCustomerNameParam = false, writerNames = []) => {
   if (show === false) {
     customerQuery.value.customerName = ''
     customerQuery.value.approvalStatus = '0'
@@ -136,6 +158,21 @@
   }
 
   showFilterDialog.value = show
+
+  if (!writerNames.length && show && tableRef.value) {
+    console.log('清除多选')
+    tableRef.value.clearMulti()
+  }
+}
+
+// 多选确定
+const submitEquipmentSelected = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('至少选中一条数据')
+    return false
+  }
+  emit('recordSelected', checkoutList.value)
+  showOrHideFilterDialog(false)
 }
 
 defineExpose({
@@ -176,13 +213,18 @@
         </search-area>
 
         <!-- 表格数据展示 -->
-        <table-container :title-show="false">
+        <table-container v-loading="tableLoading" :title-show="false">
           <!-- 表格区域 -->
           <normal-table
             id="sysUserFilter"
+            ref="tableRef"
             :data="sysUserList" :total="total" :columns="columns"
             :query="{ limit: sysUserQuery.limit, offset: sysUserQuery.offset }"
+            is-showmulti-select
+            :is-multi="isMulti"
+            :height="520"
             @change="changePage"
+            @multi-select="handleSelectionChange"
           >
             <template #preColumns>
               <el-table-column label="序号" width="55" align="center">
@@ -191,7 +233,7 @@
                 </template>
               </el-table-column>
             </template>
-            <template #columns>
+            <template v-if="!props.isMulti" #columns>
               <el-table-column fixed="right" label="操作" align="center" width="130">
                 <template #default="{ row }">
                   <el-button size="small" type="primary" @click="selectSingleUser(row)">
@@ -204,6 +246,15 @@
         </table-container>
       </div>
     </div>
+    <!-- 多选 -->
+    <template v-if="props.isMulti" #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitEquipmentSelected">
+          确定
+        </el-button>
+        <el-button @click="showOrHideFilterDialog(false)">取消</el-button>
+      </span>
+    </template>
   </el-dialog>
 </template>
 
diff --git a/src/views/resource/common/filterSysUser.vue b/src/views/resource/common/filterSysUser.vue
index 71ec72d..4efa44f 100644
--- a/src/views/resource/common/filterSysUser.vue
+++ b/src/views/resource/common/filterSysUser.vue
@@ -1,7 +1,8 @@
 <!-- 筛选系统用户弹窗 -->
 <script name="FilterSysUser" lang="ts" setup>
+import { ElMessage } from 'element-plus'
 import type { IlistQueryType, addInfo } from '@/views/system/user/user-interface'
-import { getUserList } from '@/api/system/user'
+import { getAllUserList } from '@/api/system/user'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
 
@@ -11,6 +12,10 @@
     type: Boolean,
     default: true,
   },
+  isMulti: { // 是否多选
+    type: Boolean,
+    default: false,
+  },
 })
 const emit = defineEmits(['recordSelected'])
 const tableLoading = ref(false)
@@ -28,6 +33,7 @@
 })
 const pid = ref<string>('')
 const sysUserList = ref<Array<addInfo>>([])
+const checkoutList = ref<Array<addInfo>>([]) // 多选
 const total = ref<number>(0) // 数据总条数
 const columns = ref <Array<TableColumn>>([
   { text: '账号', value: 'account', align: 'center' },
@@ -35,7 +41,10 @@
   { text: '部门', value: 'deptName', align: 'center' },
   { text: '人员类别', value: 'avatarName', align: 'center' },
 ]) // 表头
-
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
 const staffTypeMap = ref({}) as any// 人员类别
 // 获取字典
 const fetchDict = async () => {
@@ -48,7 +57,7 @@
 
 const getSysUserList = () => {
   tableLoading.value = true
-  getUserList(searchQuery).then((res) => {
+  getAllUserList(searchQuery).then((res) => {
     if (res.code === 200) {
       sysUserList.value = res.data.rows.map((item: { avatar: string }) => {
         return {
@@ -62,6 +71,19 @@
   })
 }
 
+// 重置
+const reset = () => {
+  searchQuery.keywords = ''
+  searchQuery.deptId = ''
+  searchQuery.offset = 1
+  searchQuery.limit = 20
+  searchQuery.sort = ''
+  searchQuery.beginTime = ''
+  searchQuery.endTime = ''
+  searchQuery.deptType = ''
+  getSysUserList()
+}
+
 // 逻辑
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -73,10 +95,12 @@
   getSysUserList()
 }
 
+// 单选确定
 const selectSingleUser = (row: addInfo) => {
   emit('recordSelected', row)
 }
 
+// 取消
 const showOrHideFilterDialog = (show: boolean, deptId = '') => {
   if (show === false) {
     searchQuery.keywords = ''
@@ -95,6 +119,16 @@
   showFilterDialog.value = show
 }
 
+// 多选确定
+const submitEquipmentSelected = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('至少选中一条数据')
+    return false
+  }
+  emit('recordSelected', checkoutList.value)
+  showOrHideFilterDialog(false)
+}
+
 defineExpose({
   showOrHideFilterDialog,
 })
@@ -102,7 +136,7 @@
 
 <template>
   <el-dialog v-model="showFilterDialog" title="选择用户" :append-to-body="true" :close-on-click-modal="false" top="10vh">
-    <search-area :need-clear="false" @search="getSysUserList">
+    <search-area :need-clear="true" @search="getSysUserList" @clear="reset">
       <search-item>
         <el-input v-model="searchQuery.keywords" placeholder="姓名" clearable />
       </search-item>
@@ -119,7 +153,11 @@
         v-loading="tableLoading" :data="sysUserList" :total="total"
         :columns="columns"
         :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+        is-showmulti-select
+        :is-multi="isMulti"
+        :height="520"
         @change="changePage"
+        @multi-select="handleSelectionChange"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
@@ -128,7 +166,8 @@
             </template>
           </el-table-column>
         </template>
-        <template #columns>
+        <!-- 单选 -->
+        <template v-if="!props.isMulti" #columns>
           <el-table-column fixed="right" label="操作" align="center" width="130">
             <template #default="{ row }">
               <el-button size="small" type="primary" @click="selectSingleUser(row)">
@@ -139,5 +178,14 @@
         </template>
       </normal-table>
     </table-container>
+    <!-- 多选 -->
+    <template v-if="props.isMulti" #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitEquipmentSelected">
+          确定
+        </el-button>
+        <el-button @click="showOrHideFilterDialog(false)">取消</el-button>
+      </span>
+    </template>
   </el-dialog>
 </template>

diff --git a/src/api/resource/questionnaire.ts b/src/api/resource/questionnaire.ts
index f40c875..9e55dc7 100644
--- a/src/api/resource/questionnaire.ts
+++ b/src/api/resource/questionnaire.ts
@@ -17,3 +17,22 @@
     data,
   })
 }
+
+// 发送
+export function send(data: { ids: string[] }) {
+  return request({
+    url: `${prefix}/questionnaire/send`,
+    method: 'post',
+    data,
+  })
+}
+
+remindWorker
+// 催办
+export function remindWorker(data: { id: string }) {
+  return request({
+    url: `${prefix}/questionnaire/remindWorker`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/resource/common/filterConsumableCheck.vue b/src/views/resource/common/filterConsumableCheck.vue
new file mode 100644
index 0000000..14f6d0a
--- /dev/null
+++ b/src/views/resource/common/filterConsumableCheck.vue
@@ -0,0 +1,198 @@
+<!-- 选择物资验收记录 -->
+<script lang="ts" setup name="FilterConsumableCheck">
+import { ElMessage } from 'element-plus'
+import type { Ref } from 'vue'
+import { ref } from 'vue'
+import dayjs from 'dayjs'
+import type { DateModelType } from 'element-plus'
+import { getLocationList } from '@/api/business/taskMeasure/measureData'
+import { getGoodsCheckList } from '@/api/resource/supplierConsumable'
+import { getStaffList } from '@/api/resource/register'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { getCustomerInfoList } from '@/api/resource/customer'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  recordNo: '', // 记录单编号
+  createDept: '',
+  createUserName: '', // 创建人
+  acceptTimeStart: '', // 创建时间-起始
+  acceptTimeEnd: '', // 创建时间-结束
+  approvalStatus: '0', // 审批状态
+  formId: SCHEDULE.CHECK_MATERIAL_RECORD_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
+  offset: 1,
+  limit: 20,
+})
+// 多选选中的内容
+const checkoutList = ref([])
+const loadingTable = ref(false)
+const list = ref([]) // 表格数据
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '文件编号', value: 'recordNo', align: 'center', width: '200' },
+  { text: '物资名称', value: 'goodsName', align: 'center' },
+  { text: '规格型号', value: 'goodsModel', align: 'center' },
+  { text: '验收部门', value: 'createDept', align: 'center', width: '160' },
+  { text: '验收人', value: 'createUserName', align: 'center', width: '120' },
+  { text: '验收时间', value: 'createTime', align: 'center', width: '120' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '100' },
+])
+const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
+
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getGoodsCheckList(listQuery.value).then((response) => {
+    if (response.code === 200) {
+      list.value = response.data.rows.map((item: any) => {
+        return {
+          ...item,
+          createTime: item.createTime!.length > 16 ? item.createTime!.substring(0, 10) : '',
+        }
+      })
+      total.value = parseInt(response.data.total)
+    }
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
+}
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    recordNo: '', // 记录单编号
+    createDept: '',
+    createUserName: '', // 创建人
+    acceptTimeStart: '', // 创建时间-起始
+    acceptTimeEnd: '', // 创建时间-结束
+    approvalStatus: '0', // 审批状态
+    formId: SCHEDULE.CHECK_MATERIAL_RECORD_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
+    offset: 1,
+    limit: 20,
+  }
+  dateRange.value = ['', '']
+  fetchData()
+}
+// 搜索
+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
+  }
+  search()
+}
+// 点击确定
+const confirmSelect = (row: any) => {
+  emits('confirm', [row])
+  dialogFormVisible.value = false
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData()
+}
+
+watch(dateRange, (val) => {
+  if (val) {
+    listQuery.value.acceptTimeStart = dayjs(val[0]).format('YYYY-MM-DD') === 'Invalid Date' ? '' : dayjs(val[0]).format('YYYY-MM-DD')
+    listQuery.value.acceptTimeEnd = dayjs(val[1]).format('YYYY-MM-DD') === 'Invalid Date' ? '' : dayjs(val[1]).format('YYYY-MM-DD')
+  }
+  else {
+    listQuery.value.acceptTimeStart = ''
+    listQuery.value.acceptTimeEnd = ''
+  }
+})
+
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择工作间" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input v-model="listQuery.recordNo" placeholder="文件编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.createDept" placeholder="验收部门" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.createUserName" placeholder="验收人" clearable />
+      </search-item>
+      <search-item>
+        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="验收时间（开始）" end-placeholder="验收时间（结束）" />
+      </search-item>
+    </search-area>
+
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        :height="520"
+        :is-show-single-select-button="true"
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column fixed="right" label="操作" align="center" width="130">
+            <template #default="{ row }">
+              <el-button size="small" type="primary" @click="confirmSelect(row)">
+                选定
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <!-- <el-button type="primary" @click="confirmSelect">确认</el-button> -->
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/resource/common/filterCustomerStaff.vue b/src/views/resource/common/filterCustomerStaff.vue
index 610bf51..fd40e61 100644
--- a/src/views/resource/common/filterCustomerStaff.vue
+++ b/src/views/resource/common/filterCustomerStaff.vue
@@ -1,5 +1,6 @@
 <!-- 筛选系统用户弹窗 -->
 <script name="FilterCustomerStaff" lang="ts" setup>
+import { ElMessage } from 'element-plus'
 import type { ICustomerFilter, ICustomerTree } from './common-interface'
 import type { ICustomerInfo } from '@/views/resource/customer/info/customer-info'
 import type { IlistQueryType } from '@/views/system/user/user-interface'
@@ -7,11 +8,15 @@
 import { getCustomerInfoList } from '@/api/resource/customer'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 
-defineProps({
+const props = defineProps({
   title: {
     type: String,
     default: '请选择',
   },
+  isMulti: { // 是否多选
+    type: Boolean,
+    default: false,
+  },
 })
 
 const emit = defineEmits(['recordSelected'])
@@ -20,9 +25,10 @@
   children: 'children',
   label: 'customerName',
 }
-
+const tableLoading = ref(false)
 // 定义变量
 const customerIdSelected = ref<string>('')
+const customerDeptIdSelected = ref<string>('')
 const customerNameSelected = ref<string>('')
 const disabledCustomerName = ref(false) // 委托方筛选是否禁用
 const getCustomerName = ref('') // 委托方
@@ -44,7 +50,9 @@
   endTime: '',
   deptType: '',
 })
+const tableRef = ref()
 const sysUserList = ref([])
+const checkoutList = ref([]) // 多选
 const total = ref<number>(0) // 数据总条数
 const columns = ref <Array<TableColumn>>([
   { text: '账号', value: 'account', align: 'center' },
@@ -53,9 +61,13 @@
 ]) // 表头
 
 const customerTree = ref<Array<ICustomerTree>>([])
-
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
 // 查询用户列表
 const getSysUserList = () => {
+  tableLoading.value = true
   getAllUserList(sysUserQuery.value).then((res) => {
     if (res.code === 200) {
       sysUserList.value = res.data.rows.map((item: any) => {
@@ -63,10 +75,12 @@
           ...item,
           customerId: customerIdSelected.value,
           customerName: customerNameSelected.value,
+          customerDeptId: customerDeptIdSelected,
         }
       })
       total.value = Number(res.data.total)
     }
+    tableLoading.value = false
   })
 }
 
@@ -101,17 +115,25 @@
 
   // 赋值选中的委托方
   customerIdSelected.value = data.id
+  customerDeptIdSelected.value = data.deptId
   customerNameSelected.value = data.customerName
 
   getSysUserList()
 }
 
-// 选中用户
+// 单选选定
 const selectSingleUser = (row: Object) => {
   emit('recordSelected', row)
 }
 
-const showOrHideFilterDialog = (show: boolean, customerName = '', disabledCustomerNameParam = false) => {
+/**
+ * 弹窗显隐
+ * @param show 控制弹窗显隐
+ * @param customerName 委托方名称
+ * @param disabledCustomerNameParam 禁止修改委托方名称
+ * @param writerNames 委托方意见登记表--[]则清空原有的多选
+ */
+const showOrHideFilterDialog = (show: boolean, customerName = '', disabledCustomerNameParam = false, writerNames = []) => {
   if (show === false) {
     customerQuery.value.customerName = ''
     customerQuery.value.approvalStatus = '0'
@@ -136,6 +158,21 @@
   }
 
   showFilterDialog.value = show
+
+  if (!writerNames.length && show && tableRef.value) {
+    console.log('清除多选')
+    tableRef.value.clearMulti()
+  }
+}
+
+// 多选确定
+const submitEquipmentSelected = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('至少选中一条数据')
+    return false
+  }
+  emit('recordSelected', checkoutList.value)
+  showOrHideFilterDialog(false)
 }
 
 defineExpose({
@@ -176,13 +213,18 @@
         </search-area>
 
         <!-- 表格数据展示 -->
-        <table-container :title-show="false">
+        <table-container v-loading="tableLoading" :title-show="false">
           <!-- 表格区域 -->
           <normal-table
             id="sysUserFilter"
+            ref="tableRef"
             :data="sysUserList" :total="total" :columns="columns"
             :query="{ limit: sysUserQuery.limit, offset: sysUserQuery.offset }"
+            is-showmulti-select
+            :is-multi="isMulti"
+            :height="520"
             @change="changePage"
+            @multi-select="handleSelectionChange"
           >
             <template #preColumns>
               <el-table-column label="序号" width="55" align="center">
@@ -191,7 +233,7 @@
                 </template>
               </el-table-column>
             </template>
-            <template #columns>
+            <template v-if="!props.isMulti" #columns>
               <el-table-column fixed="right" label="操作" align="center" width="130">
                 <template #default="{ row }">
                   <el-button size="small" type="primary" @click="selectSingleUser(row)">
@@ -204,6 +246,15 @@
         </table-container>
       </div>
     </div>
+    <!-- 多选 -->
+    <template v-if="props.isMulti" #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitEquipmentSelected">
+          确定
+        </el-button>
+        <el-button @click="showOrHideFilterDialog(false)">取消</el-button>
+      </span>
+    </template>
   </el-dialog>
 </template>
 
diff --git a/src/views/resource/common/filterSysUser.vue b/src/views/resource/common/filterSysUser.vue
index 71ec72d..4efa44f 100644
--- a/src/views/resource/common/filterSysUser.vue
+++ b/src/views/resource/common/filterSysUser.vue
@@ -1,7 +1,8 @@
 <!-- 筛选系统用户弹窗 -->
 <script name="FilterSysUser" lang="ts" setup>
+import { ElMessage } from 'element-plus'
 import type { IlistQueryType, addInfo } from '@/views/system/user/user-interface'
-import { getUserList } from '@/api/system/user'
+import { getAllUserList } from '@/api/system/user'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
 
@@ -11,6 +12,10 @@
     type: Boolean,
     default: true,
   },
+  isMulti: { // 是否多选
+    type: Boolean,
+    default: false,
+  },
 })
 const emit = defineEmits(['recordSelected'])
 const tableLoading = ref(false)
@@ -28,6 +33,7 @@
 })
 const pid = ref<string>('')
 const sysUserList = ref<Array<addInfo>>([])
+const checkoutList = ref<Array<addInfo>>([]) // 多选
 const total = ref<number>(0) // 数据总条数
 const columns = ref <Array<TableColumn>>([
   { text: '账号', value: 'account', align: 'center' },
@@ -35,7 +41,10 @@
   { text: '部门', value: 'deptName', align: 'center' },
   { text: '人员类别', value: 'avatarName', align: 'center' },
 ]) // 表头
-
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
 const staffTypeMap = ref({}) as any// 人员类别
 // 获取字典
 const fetchDict = async () => {
@@ -48,7 +57,7 @@
 
 const getSysUserList = () => {
   tableLoading.value = true
-  getUserList(searchQuery).then((res) => {
+  getAllUserList(searchQuery).then((res) => {
     if (res.code === 200) {
       sysUserList.value = res.data.rows.map((item: { avatar: string }) => {
         return {
@@ -62,6 +71,19 @@
   })
 }
 
+// 重置
+const reset = () => {
+  searchQuery.keywords = ''
+  searchQuery.deptId = ''
+  searchQuery.offset = 1
+  searchQuery.limit = 20
+  searchQuery.sort = ''
+  searchQuery.beginTime = ''
+  searchQuery.endTime = ''
+  searchQuery.deptType = ''
+  getSysUserList()
+}
+
 // 逻辑
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -73,10 +95,12 @@
   getSysUserList()
 }
 
+// 单选确定
 const selectSingleUser = (row: addInfo) => {
   emit('recordSelected', row)
 }
 
+// 取消
 const showOrHideFilterDialog = (show: boolean, deptId = '') => {
   if (show === false) {
     searchQuery.keywords = ''
@@ -95,6 +119,16 @@
   showFilterDialog.value = show
 }
 
+// 多选确定
+const submitEquipmentSelected = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('至少选中一条数据')
+    return false
+  }
+  emit('recordSelected', checkoutList.value)
+  showOrHideFilterDialog(false)
+}
+
 defineExpose({
   showOrHideFilterDialog,
 })
@@ -102,7 +136,7 @@
 
 <template>
   <el-dialog v-model="showFilterDialog" title="选择用户" :append-to-body="true" :close-on-click-modal="false" top="10vh">
-    <search-area :need-clear="false" @search="getSysUserList">
+    <search-area :need-clear="true" @search="getSysUserList" @clear="reset">
       <search-item>
         <el-input v-model="searchQuery.keywords" placeholder="姓名" clearable />
       </search-item>
@@ -119,7 +153,11 @@
         v-loading="tableLoading" :data="sysUserList" :total="total"
         :columns="columns"
         :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+        is-showmulti-select
+        :is-multi="isMulti"
+        :height="520"
         @change="changePage"
+        @multi-select="handleSelectionChange"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
@@ -128,7 +166,8 @@
             </template>
           </el-table-column>
         </template>
-        <template #columns>
+        <!-- 单选 -->
+        <template v-if="!props.isMulti" #columns>
           <el-table-column fixed="right" label="操作" align="center" width="130">
             <template #default="{ row }">
               <el-button size="small" type="primary" @click="selectSingleUser(row)">
@@ -139,5 +178,14 @@
         </template>
       </normal-table>
     </table-container>
+    <!-- 多选 -->
+    <template v-if="props.isMulti" #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitEquipmentSelected">
+          确定
+        </el-button>
+        <el-button @click="showOrHideFilterDialog(false)">取消</el-button>
+      </span>
+    </template>
   </el-dialog>
 </template>
diff --git a/src/views/resource/customer/questionnaire/customer-questionnaire.ts b/src/views/resource/customer/questionnaire/customer-questionnaire.ts
index 7391891..a3b40fc 100644
--- a/src/views/resource/customer/questionnaire/customer-questionnaire.ts
+++ b/src/views/resource/customer/questionnaire/customer-questionnaire.ts
@@ -39,6 +39,8 @@
   itemTen: string
   score?: string
   [key: string]: string | undefined
+  sendFlag: string // 是否已发送（1/2）
+  sendFlagName: string // 是否已发送（1/2）
 }
 
 export interface ICustomerRateColumn {

diff --git a/src/api/resource/questionnaire.ts b/src/api/resource/questionnaire.ts
index f40c875..9e55dc7 100644
--- a/src/api/resource/questionnaire.ts
+++ b/src/api/resource/questionnaire.ts
@@ -17,3 +17,22 @@
     data,
   })
 }
+
+// 发送
+export function send(data: { ids: string[] }) {
+  return request({
+    url: `${prefix}/questionnaire/send`,
+    method: 'post',
+    data,
+  })
+}
+
+remindWorker
+// 催办
+export function remindWorker(data: { id: string }) {
+  return request({
+    url: `${prefix}/questionnaire/remindWorker`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/resource/common/filterConsumableCheck.vue b/src/views/resource/common/filterConsumableCheck.vue
new file mode 100644
index 0000000..14f6d0a
--- /dev/null
+++ b/src/views/resource/common/filterConsumableCheck.vue
@@ -0,0 +1,198 @@
+<!-- 选择物资验收记录 -->
+<script lang="ts" setup name="FilterConsumableCheck">
+import { ElMessage } from 'element-plus'
+import type { Ref } from 'vue'
+import { ref } from 'vue'
+import dayjs from 'dayjs'
+import type { DateModelType } from 'element-plus'
+import { getLocationList } from '@/api/business/taskMeasure/measureData'
+import { getGoodsCheckList } from '@/api/resource/supplierConsumable'
+import { getStaffList } from '@/api/resource/register'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { getCustomerInfoList } from '@/api/resource/customer'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  recordNo: '', // 记录单编号
+  createDept: '',
+  createUserName: '', // 创建人
+  acceptTimeStart: '', // 创建时间-起始
+  acceptTimeEnd: '', // 创建时间-结束
+  approvalStatus: '0', // 审批状态
+  formId: SCHEDULE.CHECK_MATERIAL_RECORD_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
+  offset: 1,
+  limit: 20,
+})
+// 多选选中的内容
+const checkoutList = ref([])
+const loadingTable = ref(false)
+const list = ref([]) // 表格数据
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '文件编号', value: 'recordNo', align: 'center', width: '200' },
+  { text: '物资名称', value: 'goodsName', align: 'center' },
+  { text: '规格型号', value: 'goodsModel', align: 'center' },
+  { text: '验收部门', value: 'createDept', align: 'center', width: '160' },
+  { text: '验收人', value: 'createUserName', align: 'center', width: '120' },
+  { text: '验收时间', value: 'createTime', align: 'center', width: '120' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '100' },
+])
+const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
+
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getGoodsCheckList(listQuery.value).then((response) => {
+    if (response.code === 200) {
+      list.value = response.data.rows.map((item: any) => {
+        return {
+          ...item,
+          createTime: item.createTime!.length > 16 ? item.createTime!.substring(0, 10) : '',
+        }
+      })
+      total.value = parseInt(response.data.total)
+    }
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
+}
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    recordNo: '', // 记录单编号
+    createDept: '',
+    createUserName: '', // 创建人
+    acceptTimeStart: '', // 创建时间-起始
+    acceptTimeEnd: '', // 创建时间-结束
+    approvalStatus: '0', // 审批状态
+    formId: SCHEDULE.CHECK_MATERIAL_RECORD_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
+    offset: 1,
+    limit: 20,
+  }
+  dateRange.value = ['', '']
+  fetchData()
+}
+// 搜索
+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
+  }
+  search()
+}
+// 点击确定
+const confirmSelect = (row: any) => {
+  emits('confirm', [row])
+  dialogFormVisible.value = false
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData()
+}
+
+watch(dateRange, (val) => {
+  if (val) {
+    listQuery.value.acceptTimeStart = dayjs(val[0]).format('YYYY-MM-DD') === 'Invalid Date' ? '' : dayjs(val[0]).format('YYYY-MM-DD')
+    listQuery.value.acceptTimeEnd = dayjs(val[1]).format('YYYY-MM-DD') === 'Invalid Date' ? '' : dayjs(val[1]).format('YYYY-MM-DD')
+  }
+  else {
+    listQuery.value.acceptTimeStart = ''
+    listQuery.value.acceptTimeEnd = ''
+  }
+})
+
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择工作间" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input v-model="listQuery.recordNo" placeholder="文件编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.createDept" placeholder="验收部门" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.createUserName" placeholder="验收人" clearable />
+      </search-item>
+      <search-item>
+        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="验收时间（开始）" end-placeholder="验收时间（结束）" />
+      </search-item>
+    </search-area>
+
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        :height="520"
+        :is-show-single-select-button="true"
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column fixed="right" label="操作" align="center" width="130">
+            <template #default="{ row }">
+              <el-button size="small" type="primary" @click="confirmSelect(row)">
+                选定
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <!-- <el-button type="primary" @click="confirmSelect">确认</el-button> -->
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/resource/common/filterCustomerStaff.vue b/src/views/resource/common/filterCustomerStaff.vue
index 610bf51..fd40e61 100644
--- a/src/views/resource/common/filterCustomerStaff.vue
+++ b/src/views/resource/common/filterCustomerStaff.vue
@@ -1,5 +1,6 @@
 <!-- 筛选系统用户弹窗 -->
 <script name="FilterCustomerStaff" lang="ts" setup>
+import { ElMessage } from 'element-plus'
 import type { ICustomerFilter, ICustomerTree } from './common-interface'
 import type { ICustomerInfo } from '@/views/resource/customer/info/customer-info'
 import type { IlistQueryType } from '@/views/system/user/user-interface'
@@ -7,11 +8,15 @@
 import { getCustomerInfoList } from '@/api/resource/customer'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 
-defineProps({
+const props = defineProps({
   title: {
     type: String,
     default: '请选择',
   },
+  isMulti: { // 是否多选
+    type: Boolean,
+    default: false,
+  },
 })
 
 const emit = defineEmits(['recordSelected'])
@@ -20,9 +25,10 @@
   children: 'children',
   label: 'customerName',
 }
-
+const tableLoading = ref(false)
 // 定义变量
 const customerIdSelected = ref<string>('')
+const customerDeptIdSelected = ref<string>('')
 const customerNameSelected = ref<string>('')
 const disabledCustomerName = ref(false) // 委托方筛选是否禁用
 const getCustomerName = ref('') // 委托方
@@ -44,7 +50,9 @@
   endTime: '',
   deptType: '',
 })
+const tableRef = ref()
 const sysUserList = ref([])
+const checkoutList = ref([]) // 多选
 const total = ref<number>(0) // 数据总条数
 const columns = ref <Array<TableColumn>>([
   { text: '账号', value: 'account', align: 'center' },
@@ -53,9 +61,13 @@
 ]) // 表头
 
 const customerTree = ref<Array<ICustomerTree>>([])
-
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
 // 查询用户列表
 const getSysUserList = () => {
+  tableLoading.value = true
   getAllUserList(sysUserQuery.value).then((res) => {
     if (res.code === 200) {
       sysUserList.value = res.data.rows.map((item: any) => {
@@ -63,10 +75,12 @@
           ...item,
           customerId: customerIdSelected.value,
           customerName: customerNameSelected.value,
+          customerDeptId: customerDeptIdSelected,
         }
       })
       total.value = Number(res.data.total)
     }
+    tableLoading.value = false
   })
 }
 
@@ -101,17 +115,25 @@
 
   // 赋值选中的委托方
   customerIdSelected.value = data.id
+  customerDeptIdSelected.value = data.deptId
   customerNameSelected.value = data.customerName
 
   getSysUserList()
 }
 
-// 选中用户
+// 单选选定
 const selectSingleUser = (row: Object) => {
   emit('recordSelected', row)
 }
 
-const showOrHideFilterDialog = (show: boolean, customerName = '', disabledCustomerNameParam = false) => {
+/**
+ * 弹窗显隐
+ * @param show 控制弹窗显隐
+ * @param customerName 委托方名称
+ * @param disabledCustomerNameParam 禁止修改委托方名称
+ * @param writerNames 委托方意见登记表--[]则清空原有的多选
+ */
+const showOrHideFilterDialog = (show: boolean, customerName = '', disabledCustomerNameParam = false, writerNames = []) => {
   if (show === false) {
     customerQuery.value.customerName = ''
     customerQuery.value.approvalStatus = '0'
@@ -136,6 +158,21 @@
   }
 
   showFilterDialog.value = show
+
+  if (!writerNames.length && show && tableRef.value) {
+    console.log('清除多选')
+    tableRef.value.clearMulti()
+  }
+}
+
+// 多选确定
+const submitEquipmentSelected = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('至少选中一条数据')
+    return false
+  }
+  emit('recordSelected', checkoutList.value)
+  showOrHideFilterDialog(false)
 }
 
 defineExpose({
@@ -176,13 +213,18 @@
         </search-area>
 
         <!-- 表格数据展示 -->
-        <table-container :title-show="false">
+        <table-container v-loading="tableLoading" :title-show="false">
           <!-- 表格区域 -->
           <normal-table
             id="sysUserFilter"
+            ref="tableRef"
             :data="sysUserList" :total="total" :columns="columns"
             :query="{ limit: sysUserQuery.limit, offset: sysUserQuery.offset }"
+            is-showmulti-select
+            :is-multi="isMulti"
+            :height="520"
             @change="changePage"
+            @multi-select="handleSelectionChange"
           >
             <template #preColumns>
               <el-table-column label="序号" width="55" align="center">
@@ -191,7 +233,7 @@
                 </template>
               </el-table-column>
             </template>
-            <template #columns>
+            <template v-if="!props.isMulti" #columns>
               <el-table-column fixed="right" label="操作" align="center" width="130">
                 <template #default="{ row }">
                   <el-button size="small" type="primary" @click="selectSingleUser(row)">
@@ -204,6 +246,15 @@
         </table-container>
       </div>
     </div>
+    <!-- 多选 -->
+    <template v-if="props.isMulti" #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitEquipmentSelected">
+          确定
+        </el-button>
+        <el-button @click="showOrHideFilterDialog(false)">取消</el-button>
+      </span>
+    </template>
   </el-dialog>
 </template>
 
diff --git a/src/views/resource/common/filterSysUser.vue b/src/views/resource/common/filterSysUser.vue
index 71ec72d..4efa44f 100644
--- a/src/views/resource/common/filterSysUser.vue
+++ b/src/views/resource/common/filterSysUser.vue
@@ -1,7 +1,8 @@
 <!-- 筛选系统用户弹窗 -->
 <script name="FilterSysUser" lang="ts" setup>
+import { ElMessage } from 'element-plus'
 import type { IlistQueryType, addInfo } from '@/views/system/user/user-interface'
-import { getUserList } from '@/api/system/user'
+import { getAllUserList } from '@/api/system/user'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
 
@@ -11,6 +12,10 @@
     type: Boolean,
     default: true,
   },
+  isMulti: { // 是否多选
+    type: Boolean,
+    default: false,
+  },
 })
 const emit = defineEmits(['recordSelected'])
 const tableLoading = ref(false)
@@ -28,6 +33,7 @@
 })
 const pid = ref<string>('')
 const sysUserList = ref<Array<addInfo>>([])
+const checkoutList = ref<Array<addInfo>>([]) // 多选
 const total = ref<number>(0) // 数据总条数
 const columns = ref <Array<TableColumn>>([
   { text: '账号', value: 'account', align: 'center' },
@@ -35,7 +41,10 @@
   { text: '部门', value: 'deptName', align: 'center' },
   { text: '人员类别', value: 'avatarName', align: 'center' },
 ]) // 表头
-
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
 const staffTypeMap = ref({}) as any// 人员类别
 // 获取字典
 const fetchDict = async () => {
@@ -48,7 +57,7 @@
 
 const getSysUserList = () => {
   tableLoading.value = true
-  getUserList(searchQuery).then((res) => {
+  getAllUserList(searchQuery).then((res) => {
     if (res.code === 200) {
       sysUserList.value = res.data.rows.map((item: { avatar: string }) => {
         return {
@@ -62,6 +71,19 @@
   })
 }
 
+// 重置
+const reset = () => {
+  searchQuery.keywords = ''
+  searchQuery.deptId = ''
+  searchQuery.offset = 1
+  searchQuery.limit = 20
+  searchQuery.sort = ''
+  searchQuery.beginTime = ''
+  searchQuery.endTime = ''
+  searchQuery.deptType = ''
+  getSysUserList()
+}
+
 // 逻辑
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -73,10 +95,12 @@
   getSysUserList()
 }
 
+// 单选确定
 const selectSingleUser = (row: addInfo) => {
   emit('recordSelected', row)
 }
 
+// 取消
 const showOrHideFilterDialog = (show: boolean, deptId = '') => {
   if (show === false) {
     searchQuery.keywords = ''
@@ -95,6 +119,16 @@
   showFilterDialog.value = show
 }
 
+// 多选确定
+const submitEquipmentSelected = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('至少选中一条数据')
+    return false
+  }
+  emit('recordSelected', checkoutList.value)
+  showOrHideFilterDialog(false)
+}
+
 defineExpose({
   showOrHideFilterDialog,
 })
@@ -102,7 +136,7 @@
 
 <template>
   <el-dialog v-model="showFilterDialog" title="选择用户" :append-to-body="true" :close-on-click-modal="false" top="10vh">
-    <search-area :need-clear="false" @search="getSysUserList">
+    <search-area :need-clear="true" @search="getSysUserList" @clear="reset">
       <search-item>
         <el-input v-model="searchQuery.keywords" placeholder="姓名" clearable />
       </search-item>
@@ -119,7 +153,11 @@
         v-loading="tableLoading" :data="sysUserList" :total="total"
         :columns="columns"
         :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+        is-showmulti-select
+        :is-multi="isMulti"
+        :height="520"
         @change="changePage"
+        @multi-select="handleSelectionChange"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
@@ -128,7 +166,8 @@
             </template>
           </el-table-column>
         </template>
-        <template #columns>
+        <!-- 单选 -->
+        <template v-if="!props.isMulti" #columns>
           <el-table-column fixed="right" label="操作" align="center" width="130">
             <template #default="{ row }">
               <el-button size="small" type="primary" @click="selectSingleUser(row)">
@@ -139,5 +178,14 @@
         </template>
       </normal-table>
     </table-container>
+    <!-- 多选 -->
+    <template v-if="props.isMulti" #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitEquipmentSelected">
+          确定
+        </el-button>
+        <el-button @click="showOrHideFilterDialog(false)">取消</el-button>
+      </span>
+    </template>
   </el-dialog>
 </template>
diff --git a/src/views/resource/customer/questionnaire/customer-questionnaire.ts b/src/views/resource/customer/questionnaire/customer-questionnaire.ts
index 7391891..a3b40fc 100644
--- a/src/views/resource/customer/questionnaire/customer-questionnaire.ts
+++ b/src/views/resource/customer/questionnaire/customer-questionnaire.ts
@@ -39,6 +39,8 @@
   itemTen: string
   score?: string
   [key: string]: string | undefined
+  sendFlag: string // 是否已发送（1/2）
+  sendFlagName: string // 是否已发送（1/2）
 }
 
 export interface ICustomerRateColumn {
diff --git a/src/views/resource/customer/questionnaire/detail.vue b/src/views/resource/customer/questionnaire/detail.vue
index 6560afd..553ebb4 100644
--- a/src/views/resource/customer/questionnaire/detail.vue
+++ b/src/views/resource/customer/questionnaire/detail.vue
@@ -1,12 +1,14 @@
 <!-- 委托方满意度调查表详情 -->
 <script name="QuestionnaireDetail" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
-import type{ ICustomerQuestionnaireInfo, ICustomerRateColumn } from './customer-questionnaire'
+import type { ICustomerQuestionnaireInfo, ICustomerRateColumn } from './customer-questionnaire'
 import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
 import useUserStore from '@/store/modules/user'
-import { addQuestionnaire } from '@/api/resource/questionnaire'
+import FilterSysUser from '@/views/resource/common/filterSysUser.vue'
+import { addQuestionnaire, send } from '@/api/resource/questionnaire'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import { getDictByCode } from '@/api/system/dict'
+import { uniqueArray } from '@/utils/Array'
 
 // 从路由中传过来的参数
 const type = ref<string>('')
@@ -18,7 +20,7 @@
 
 const questionnaireFormRef = ref()
 const refFilterCustomer = ref()
-
+const sendIds = ref<string[]>([]) // 发送的参数
 const questionnaireInfo = ref<ICustomerQuestionnaireInfo>({
   id: '',
   customerId: '',
@@ -31,8 +33,8 @@
   senderId: '',
   senderName: '',
   sendTime: '',
-  writerId: '',
-  writerName: '',
+  writerId: '', // 填写人id（单选用-新建不让传）
+  writerName: '', // 填写人名字(多选时候-新建不让传)
   writeTime: '',
   writeStatus: '',
   itemOne: '',
@@ -45,12 +47,15 @@
   itemEight: '',
   itemNine: '',
   itemTen: '',
+
+  sendFlag: '', // 是否已发送（1/2）
+  sendFlagName: '', // 是否已发送（1/2）
 })
 
 const questionnaireFormRules = ref({
-  labCode: [{ required: true, message: '实验室不能为空，请选择', trigger: ['change', 'blur'] }],
-  customerId: [{ required: true, message: '填写单位不能为空，请选择', trigger: 'change' }],
-  writerId: [{ required: true, message: '填写人不能为空，请选择', trigger: 'change' }],
+  labCode: [{ required: true, message: '实验室不能为空', trigger: ['change', 'blur'] }],
+  customerId: [{ required: true, message: '填写单位不能为空', trigger: 'change' }],
+  writerName: [{ required: true, message: '填写人不能为空', trigger: 'change' }],
 }) // 表单验证规则
 
 // 字典值
@@ -71,28 +76,43 @@
   { index: 10, text: '10、对所提供的计量保障是否满意', value: 0, attributeName: 'itemTen' },
 ])
 
-// 逻辑
-
-// 显示筛选填写用户和单位的弹窗
+// ---------------------------------------------多选填写人----------------------------------------------
+const writerNames = ref<{ customerId: string; writerId: string }[]>([]) // 选择的填写人数组
+// 点击选择填写人
 const showFilterCustomerDialog = () => {
-  refFilterCustomer.value.showOrHideFilterDialog(true)
+  refFilterCustomer.value.showOrHideFilterDialog(true, '', false, writerNames.value)
 }
 
-// 返回选定结果
-const recordSelectedHandler = (row: any) => {
+// 选定填写人
+const recordSelectedHandler = (list: any) => {
   refFilterCustomer.value.showOrHideFilterDialog(false)
-
-  if (row.id !== '') {
-    questionnaireInfo.value.customerId = row.customerId
-    questionnaireInfo.value.customerName = row.customerName
-    questionnaireInfo.value.writerId = row.id
-    questionnaireInfo.value.writerName = row.name
+  if (list && list.length) {
+    writerNames.value = list.map((item: { customerDeptId: string; id: string }) => {
+      return {
+        customerId: item.customerDeptId,
+        writerId: item.id,
+      }
+    })
+    questionnaireInfo.value.writerName = list.map((item: { name: string }) => item.name).join(',')
+    // 填写单位
+    questionnaireInfo.value.customerName = uniqueArray(list.map((item: { customerName: string }) => item.customerName)).join(',')
+    questionnaireInfo.value.customerId = uniqueArray(list.map((item: { customerDeptId: string }) => item.customerDeptId)).join(',')
   }
   else {
     ElMessage.error('填写单位和填写人不能为空，请重新选择')
   }
 }
 
+// 清空填写人
+const clean = () => {
+  questionnaireInfo.value.writerName = ''
+  questionnaireInfo.value.customerName = ''
+  questionnaireInfo.value.customerId = ''
+  writerNames.value = []
+}
+
+// ---------------------------------------------------------------------------------------------------
+
 // 保存
 const saveQuestionnaireInfo = () => {
   let satisfactionStr = ''
@@ -109,19 +129,29 @@
     if (satisfactionStr.length === 10) {
       questionnaireInfo.value.writeTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 填写时间为当前时间
     }
-
+    const params = {
+      ...questionnaireInfo.value,
+      writerId: null, // 填写人id（单选用-多选时候新建不让传）
+      writerName: null, // 填写人名字(多选时候-新建不让传)
+      sendFlag: '2', // 是否已发送（1/2）
+      sendFlagName: '未发送', // 是否已发送（1/2）
+      customerName: null,
+      customerId: null,
+      sendDTOs: writerNames.value, // 填写人信息
+    }
     // 提交接口
-    addQuestionnaire(questionnaireInfo.value).then((res) => {
+    addQuestionnaire(params).then((res) => {
       if (res.code === 200) {
       // 提示保存成功
-        ElMessage.success('委托方满意度调查表创建并发送成功')
+        ElMessage.success('委托方满意度调查表创建成功')
 
         // 设置返回的委托方id和委托方编号
-        questionnaireInfo.value.questionnaireNo = res.data.questionnaireNo
-        questionnaireInfo.value.id = res.data.id
-        id.value = res.data.id
+        // questionnaireInfo.value.questionnaireNo = res.data.questionnaireNo
+        // questionnaireInfo.value.id = res.data.id
+        // id.value = res.data.id
 
         type.value = 'detail'
+        sendIds.value = res.data
       }
       else {
       // 提示失败信息
@@ -193,6 +223,18 @@
   router.go(-1)
 }
 
+// 点击发送
+const handleSend = () => {
+  if (sendIds && sendIds.value.length) {
+    send({ ids: sendIds.value }).then((res) => {
+      ElMessage.success('发送成功')
+    })
+  }
+  else {
+    ElMessage.warning('没有发送的单位或个人')
+  }
+}
+
 const initDialog = (params: any) => {
   // 从路由中获取参数
   type.value = params.type
@@ -205,7 +247,8 @@
       questionnaireInfo.value.senderId = userInfo.id
       questionnaireInfo.value.senderName = userInfo.name
       questionnaireInfo.value.sendTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
-
+      questionnaireInfo.value.labCode = userInfo.bizLabCode // 实验室代码
+      questionnaireInfo.value.labCodeName = userInfo.labCodeName // 实验室名称
       break
 
     case 'detail':
@@ -275,6 +318,9 @@
     <el-form ref="questionnaireFormRef" :model="questionnaireInfo" :rules="questionnaireFormRules" label-position="right" label-width="110px" border stripe>
       <detail-page title="委托方满意度调查表">
         <template #btns>
+          <el-button v-if="type === 'detail'" type="primary" @click="handleSend">
+            发送
+          </el-button>
           <el-button v-if="type !== 'detail'" type="primary" @click="saveButtonHandler">
             保存
           </el-button>
@@ -284,7 +330,6 @@
         </template>
 
         <el-row :gutter="24">
-          <!-- 第一行 第一列 -->
           <el-col :span="6">
             <el-form-item label="实验室" prop="labCode">
               <el-select v-model="questionnaireInfo.labCode" placeholder="请选择实验室" :disabled="type === 'detail'" style="width: 100%;">
@@ -292,46 +337,52 @@
               </el-select>
               <el-input v-model="questionnaireInfo.labCodeName" type="hidden" />
             </el-form-item>
-
-            <el-form-item label="填写单位" prop="customerId">
-              <el-input v-model="questionnaireInfo.customerName" :disabled="true" placeholder="选择填写人时自动填充" />
-              <el-input v-model="questionnaireInfo.customerId" type="hidden" />
-            </el-form-item>
           </el-col>
-
           <el-col :span="6">
             <el-form-item label="文件编号">
-              <el-input v-model="questionnaireInfo.questionnaireNo" placeholder="文件编号，保存后自动生成" :disabled="true" />
-            </el-form-item>
-
-            <el-form-item label="填写人" prop="writerId">
-              <el-input v-model="questionnaireInfo.writerName" :readonly="true" :disabled="true">
-                <template #append>
-                  <el-button size="small" :disabled="type === 'detail'" @click="showFilterCustomerDialog">
-                    选择
-                  </el-button>
-                </template>
-              </el-input>
-              <el-input v-model="questionnaireInfo.writerId" type="hidden" />
+              <el-input v-model="questionnaireInfo.questionnaireNo" placeholder="系统自动生成" :disabled="true" />
             </el-form-item>
           </el-col>
-
           <el-col :span="6">
             <el-form-item label="发送人">
               <el-input v-model="questionnaireInfo.senderName" :disabled="true" />
               <el-input v-model="questionnaireInfo.senderId" type="hidden" />
             </el-form-item>
-
-            <el-form-item label="填写时间">
-              <el-input v-model="questionnaireInfo.writeTime" :disabled="true" />
-            </el-form-item>
           </el-col>
-
           <el-col :span="6">
             <el-form-item label="发送时间">
               <el-input v-model="questionnaireInfo.sendTime" placeholder="保存后自动生成" :disabled="true" />
             </el-form-item>
           </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="填写人" prop="writerName" style="display: flex;">
+              <el-button size="small" type="primary" :disabled="type === 'detail'" @click="showFilterCustomerDialog">
+                {{ questionnaireInfo.writerName ? '继续添加' : '添加' }}
+              </el-button>
+              <el-button size="small" type="info" :disabled="type === 'detail'" @click="clean">
+                清空
+              </el-button>
+              <el-input v-model="questionnaireInfo.writerName" placeholder="请添加填写人" style="margin-top: 8px;" :readonly="true" :disabled="true" type="textarea" autosize>
+                <!-- <template #append>
+                  <el-button size="small" :disabled="type === 'detail'" @click="showFilterCustomerDialog">
+                    选择
+                  </el-button>
+                </template> -->
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="填写单位" prop="customerId">
+              <el-input v-model="questionnaireInfo.customerName" type="textarea" :autosize="{ minRows: 3 }" :disabled="true" placeholder="选择填写人时自动填充" />
+              <el-input v-model="questionnaireInfo.customerId" type="hidden" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="填写时间">
+              <el-input v-model="questionnaireInfo.writeTime" :disabled="true" />
+            </el-form-item>
+          </el-col>
         </el-row>
       </detail-page>
 
@@ -350,8 +401,8 @@
         </el-row>
       </table-container>
     </el-form>
-
-    <filter-customer-staff ref="refFilterCustomer" title="请选择填写单位和填写人" @record-selected="recordSelectedHandler" />
+    <!-- 单选填写人--先选委托方，再去选委托方下面的人 -->
+    <filter-customer-staff ref="refFilterCustomer" :is-multi="true" title="请选择填写单位和填写人" @record-selected="recordSelectedHandler" />
   </app-container>
 </template>
 

diff --git a/src/api/resource/questionnaire.ts b/src/api/resource/questionnaire.ts
index f40c875..9e55dc7 100644
--- a/src/api/resource/questionnaire.ts
+++ b/src/api/resource/questionnaire.ts
@@ -17,3 +17,22 @@
     data,
   })
 }
+
+// 发送
+export function send(data: { ids: string[] }) {
+  return request({
+    url: `${prefix}/questionnaire/send`,
+    method: 'post',
+    data,
+  })
+}
+
+remindWorker
+// 催办
+export function remindWorker(data: { id: string }) {
+  return request({
+    url: `${prefix}/questionnaire/remindWorker`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/resource/common/filterConsumableCheck.vue b/src/views/resource/common/filterConsumableCheck.vue
new file mode 100644
index 0000000..14f6d0a
--- /dev/null
+++ b/src/views/resource/common/filterConsumableCheck.vue
@@ -0,0 +1,198 @@
+<!-- 选择物资验收记录 -->
+<script lang="ts" setup name="FilterConsumableCheck">
+import { ElMessage } from 'element-plus'
+import type { Ref } from 'vue'
+import { ref } from 'vue'
+import dayjs from 'dayjs'
+import type { DateModelType } from 'element-plus'
+import { getLocationList } from '@/api/business/taskMeasure/measureData'
+import { getGoodsCheckList } from '@/api/resource/supplierConsumable'
+import { getStaffList } from '@/api/resource/register'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { getCustomerInfoList } from '@/api/resource/customer'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  recordNo: '', // 记录单编号
+  createDept: '',
+  createUserName: '', // 创建人
+  acceptTimeStart: '', // 创建时间-起始
+  acceptTimeEnd: '', // 创建时间-结束
+  approvalStatus: '0', // 审批状态
+  formId: SCHEDULE.CHECK_MATERIAL_RECORD_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
+  offset: 1,
+  limit: 20,
+})
+// 多选选中的内容
+const checkoutList = ref([])
+const loadingTable = ref(false)
+const list = ref([]) // 表格数据
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '文件编号', value: 'recordNo', align: 'center', width: '200' },
+  { text: '物资名称', value: 'goodsName', align: 'center' },
+  { text: '规格型号', value: 'goodsModel', align: 'center' },
+  { text: '验收部门', value: 'createDept', align: 'center', width: '160' },
+  { text: '验收人', value: 'createUserName', align: 'center', width: '120' },
+  { text: '验收时间', value: 'createTime', align: 'center', width: '120' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '100' },
+])
+const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
+
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getGoodsCheckList(listQuery.value).then((response) => {
+    if (response.code === 200) {
+      list.value = response.data.rows.map((item: any) => {
+        return {
+          ...item,
+          createTime: item.createTime!.length > 16 ? item.createTime!.substring(0, 10) : '',
+        }
+      })
+      total.value = parseInt(response.data.total)
+    }
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
+}
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    recordNo: '', // 记录单编号
+    createDept: '',
+    createUserName: '', // 创建人
+    acceptTimeStart: '', // 创建时间-起始
+    acceptTimeEnd: '', // 创建时间-结束
+    approvalStatus: '0', // 审批状态
+    formId: SCHEDULE.CHECK_MATERIAL_RECORD_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
+    offset: 1,
+    limit: 20,
+  }
+  dateRange.value = ['', '']
+  fetchData()
+}
+// 搜索
+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
+  }
+  search()
+}
+// 点击确定
+const confirmSelect = (row: any) => {
+  emits('confirm', [row])
+  dialogFormVisible.value = false
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData()
+}
+
+watch(dateRange, (val) => {
+  if (val) {
+    listQuery.value.acceptTimeStart = dayjs(val[0]).format('YYYY-MM-DD') === 'Invalid Date' ? '' : dayjs(val[0]).format('YYYY-MM-DD')
+    listQuery.value.acceptTimeEnd = dayjs(val[1]).format('YYYY-MM-DD') === 'Invalid Date' ? '' : dayjs(val[1]).format('YYYY-MM-DD')
+  }
+  else {
+    listQuery.value.acceptTimeStart = ''
+    listQuery.value.acceptTimeEnd = ''
+  }
+})
+
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择工作间" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input v-model="listQuery.recordNo" placeholder="文件编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.createDept" placeholder="验收部门" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.createUserName" placeholder="验收人" clearable />
+      </search-item>
+      <search-item>
+        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="验收时间（开始）" end-placeholder="验收时间（结束）" />
+      </search-item>
+    </search-area>
+
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        :height="520"
+        :is-show-single-select-button="true"
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column fixed="right" label="操作" align="center" width="130">
+            <template #default="{ row }">
+              <el-button size="small" type="primary" @click="confirmSelect(row)">
+                选定
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <!-- <el-button type="primary" @click="confirmSelect">确认</el-button> -->
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/resource/common/filterCustomerStaff.vue b/src/views/resource/common/filterCustomerStaff.vue
index 610bf51..fd40e61 100644
--- a/src/views/resource/common/filterCustomerStaff.vue
+++ b/src/views/resource/common/filterCustomerStaff.vue
@@ -1,5 +1,6 @@
 <!-- 筛选系统用户弹窗 -->
 <script name="FilterCustomerStaff" lang="ts" setup>
+import { ElMessage } from 'element-plus'
 import type { ICustomerFilter, ICustomerTree } from './common-interface'
 import type { ICustomerInfo } from '@/views/resource/customer/info/customer-info'
 import type { IlistQueryType } from '@/views/system/user/user-interface'
@@ -7,11 +8,15 @@
 import { getCustomerInfoList } from '@/api/resource/customer'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 
-defineProps({
+const props = defineProps({
   title: {
     type: String,
     default: '请选择',
   },
+  isMulti: { // 是否多选
+    type: Boolean,
+    default: false,
+  },
 })
 
 const emit = defineEmits(['recordSelected'])
@@ -20,9 +25,10 @@
   children: 'children',
   label: 'customerName',
 }
-
+const tableLoading = ref(false)
 // 定义变量
 const customerIdSelected = ref<string>('')
+const customerDeptIdSelected = ref<string>('')
 const customerNameSelected = ref<string>('')
 const disabledCustomerName = ref(false) // 委托方筛选是否禁用
 const getCustomerName = ref('') // 委托方
@@ -44,7 +50,9 @@
   endTime: '',
   deptType: '',
 })
+const tableRef = ref()
 const sysUserList = ref([])
+const checkoutList = ref([]) // 多选
 const total = ref<number>(0) // 数据总条数
 const columns = ref <Array<TableColumn>>([
   { text: '账号', value: 'account', align: 'center' },
@@ -53,9 +61,13 @@
 ]) // 表头
 
 const customerTree = ref<Array<ICustomerTree>>([])
-
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
 // 查询用户列表
 const getSysUserList = () => {
+  tableLoading.value = true
   getAllUserList(sysUserQuery.value).then((res) => {
     if (res.code === 200) {
       sysUserList.value = res.data.rows.map((item: any) => {
@@ -63,10 +75,12 @@
           ...item,
           customerId: customerIdSelected.value,
           customerName: customerNameSelected.value,
+          customerDeptId: customerDeptIdSelected,
         }
       })
       total.value = Number(res.data.total)
     }
+    tableLoading.value = false
   })
 }
 
@@ -101,17 +115,25 @@
 
   // 赋值选中的委托方
   customerIdSelected.value = data.id
+  customerDeptIdSelected.value = data.deptId
   customerNameSelected.value = data.customerName
 
   getSysUserList()
 }
 
-// 选中用户
+// 单选选定
 const selectSingleUser = (row: Object) => {
   emit('recordSelected', row)
 }
 
-const showOrHideFilterDialog = (show: boolean, customerName = '', disabledCustomerNameParam = false) => {
+/**
+ * 弹窗显隐
+ * @param show 控制弹窗显隐
+ * @param customerName 委托方名称
+ * @param disabledCustomerNameParam 禁止修改委托方名称
+ * @param writerNames 委托方意见登记表--[]则清空原有的多选
+ */
+const showOrHideFilterDialog = (show: boolean, customerName = '', disabledCustomerNameParam = false, writerNames = []) => {
   if (show === false) {
     customerQuery.value.customerName = ''
     customerQuery.value.approvalStatus = '0'
@@ -136,6 +158,21 @@
   }
 
   showFilterDialog.value = show
+
+  if (!writerNames.length && show && tableRef.value) {
+    console.log('清除多选')
+    tableRef.value.clearMulti()
+  }
+}
+
+// 多选确定
+const submitEquipmentSelected = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('至少选中一条数据')
+    return false
+  }
+  emit('recordSelected', checkoutList.value)
+  showOrHideFilterDialog(false)
 }
 
 defineExpose({
@@ -176,13 +213,18 @@
         </search-area>
 
         <!-- 表格数据展示 -->
-        <table-container :title-show="false">
+        <table-container v-loading="tableLoading" :title-show="false">
           <!-- 表格区域 -->
           <normal-table
             id="sysUserFilter"
+            ref="tableRef"
             :data="sysUserList" :total="total" :columns="columns"
             :query="{ limit: sysUserQuery.limit, offset: sysUserQuery.offset }"
+            is-showmulti-select
+            :is-multi="isMulti"
+            :height="520"
             @change="changePage"
+            @multi-select="handleSelectionChange"
           >
             <template #preColumns>
               <el-table-column label="序号" width="55" align="center">
@@ -191,7 +233,7 @@
                 </template>
               </el-table-column>
             </template>
-            <template #columns>
+            <template v-if="!props.isMulti" #columns>
               <el-table-column fixed="right" label="操作" align="center" width="130">
                 <template #default="{ row }">
                   <el-button size="small" type="primary" @click="selectSingleUser(row)">
@@ -204,6 +246,15 @@
         </table-container>
       </div>
     </div>
+    <!-- 多选 -->
+    <template v-if="props.isMulti" #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitEquipmentSelected">
+          确定
+        </el-button>
+        <el-button @click="showOrHideFilterDialog(false)">取消</el-button>
+      </span>
+    </template>
   </el-dialog>
 </template>
 
diff --git a/src/views/resource/common/filterSysUser.vue b/src/views/resource/common/filterSysUser.vue
index 71ec72d..4efa44f 100644
--- a/src/views/resource/common/filterSysUser.vue
+++ b/src/views/resource/common/filterSysUser.vue
@@ -1,7 +1,8 @@
 <!-- 筛选系统用户弹窗 -->
 <script name="FilterSysUser" lang="ts" setup>
+import { ElMessage } from 'element-plus'
 import type { IlistQueryType, addInfo } from '@/views/system/user/user-interface'
-import { getUserList } from '@/api/system/user'
+import { getAllUserList } from '@/api/system/user'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
 
@@ -11,6 +12,10 @@
     type: Boolean,
     default: true,
   },
+  isMulti: { // 是否多选
+    type: Boolean,
+    default: false,
+  },
 })
 const emit = defineEmits(['recordSelected'])
 const tableLoading = ref(false)
@@ -28,6 +33,7 @@
 })
 const pid = ref<string>('')
 const sysUserList = ref<Array<addInfo>>([])
+const checkoutList = ref<Array<addInfo>>([]) // 多选
 const total = ref<number>(0) // 数据总条数
 const columns = ref <Array<TableColumn>>([
   { text: '账号', value: 'account', align: 'center' },
@@ -35,7 +41,10 @@
   { text: '部门', value: 'deptName', align: 'center' },
   { text: '人员类别', value: 'avatarName', align: 'center' },
 ]) // 表头
-
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
 const staffTypeMap = ref({}) as any// 人员类别
 // 获取字典
 const fetchDict = async () => {
@@ -48,7 +57,7 @@
 
 const getSysUserList = () => {
   tableLoading.value = true
-  getUserList(searchQuery).then((res) => {
+  getAllUserList(searchQuery).then((res) => {
     if (res.code === 200) {
       sysUserList.value = res.data.rows.map((item: { avatar: string }) => {
         return {
@@ -62,6 +71,19 @@
   })
 }
 
+// 重置
+const reset = () => {
+  searchQuery.keywords = ''
+  searchQuery.deptId = ''
+  searchQuery.offset = 1
+  searchQuery.limit = 20
+  searchQuery.sort = ''
+  searchQuery.beginTime = ''
+  searchQuery.endTime = ''
+  searchQuery.deptType = ''
+  getSysUserList()
+}
+
 // 逻辑
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -73,10 +95,12 @@
   getSysUserList()
 }
 
+// 单选确定
 const selectSingleUser = (row: addInfo) => {
   emit('recordSelected', row)
 }
 
+// 取消
 const showOrHideFilterDialog = (show: boolean, deptId = '') => {
   if (show === false) {
     searchQuery.keywords = ''
@@ -95,6 +119,16 @@
   showFilterDialog.value = show
 }
 
+// 多选确定
+const submitEquipmentSelected = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('至少选中一条数据')
+    return false
+  }
+  emit('recordSelected', checkoutList.value)
+  showOrHideFilterDialog(false)
+}
+
 defineExpose({
   showOrHideFilterDialog,
 })
@@ -102,7 +136,7 @@
 
 <template>
   <el-dialog v-model="showFilterDialog" title="选择用户" :append-to-body="true" :close-on-click-modal="false" top="10vh">
-    <search-area :need-clear="false" @search="getSysUserList">
+    <search-area :need-clear="true" @search="getSysUserList" @clear="reset">
       <search-item>
         <el-input v-model="searchQuery.keywords" placeholder="姓名" clearable />
       </search-item>
@@ -119,7 +153,11 @@
         v-loading="tableLoading" :data="sysUserList" :total="total"
         :columns="columns"
         :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+        is-showmulti-select
+        :is-multi="isMulti"
+        :height="520"
         @change="changePage"
+        @multi-select="handleSelectionChange"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
@@ -128,7 +166,8 @@
             </template>
           </el-table-column>
         </template>
-        <template #columns>
+        <!-- 单选 -->
+        <template v-if="!props.isMulti" #columns>
           <el-table-column fixed="right" label="操作" align="center" width="130">
             <template #default="{ row }">
               <el-button size="small" type="primary" @click="selectSingleUser(row)">
@@ -139,5 +178,14 @@
         </template>
       </normal-table>
     </table-container>
+    <!-- 多选 -->
+    <template v-if="props.isMulti" #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitEquipmentSelected">
+          确定
+        </el-button>
+        <el-button @click="showOrHideFilterDialog(false)">取消</el-button>
+      </span>
+    </template>
   </el-dialog>
 </template>
diff --git a/src/views/resource/customer/questionnaire/customer-questionnaire.ts b/src/views/resource/customer/questionnaire/customer-questionnaire.ts
index 7391891..a3b40fc 100644
--- a/src/views/resource/customer/questionnaire/customer-questionnaire.ts
+++ b/src/views/resource/customer/questionnaire/customer-questionnaire.ts
@@ -39,6 +39,8 @@
   itemTen: string
   score?: string
   [key: string]: string | undefined
+  sendFlag: string // 是否已发送（1/2）
+  sendFlagName: string // 是否已发送（1/2）
 }
 
 export interface ICustomerRateColumn {
diff --git a/src/views/resource/customer/questionnaire/detail.vue b/src/views/resource/customer/questionnaire/detail.vue
index 6560afd..553ebb4 100644
--- a/src/views/resource/customer/questionnaire/detail.vue
+++ b/src/views/resource/customer/questionnaire/detail.vue
@@ -1,12 +1,14 @@
 <!-- 委托方满意度调查表详情 -->
 <script name="QuestionnaireDetail" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
-import type{ ICustomerQuestionnaireInfo, ICustomerRateColumn } from './customer-questionnaire'
+import type { ICustomerQuestionnaireInfo, ICustomerRateColumn } from './customer-questionnaire'
 import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
 import useUserStore from '@/store/modules/user'
-import { addQuestionnaire } from '@/api/resource/questionnaire'
+import FilterSysUser from '@/views/resource/common/filterSysUser.vue'
+import { addQuestionnaire, send } from '@/api/resource/questionnaire'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import { getDictByCode } from '@/api/system/dict'
+import { uniqueArray } from '@/utils/Array'
 
 // 从路由中传过来的参数
 const type = ref<string>('')
@@ -18,7 +20,7 @@
 
 const questionnaireFormRef = ref()
 const refFilterCustomer = ref()
-
+const sendIds = ref<string[]>([]) // 发送的参数
 const questionnaireInfo = ref<ICustomerQuestionnaireInfo>({
   id: '',
   customerId: '',
@@ -31,8 +33,8 @@
   senderId: '',
   senderName: '',
   sendTime: '',
-  writerId: '',
-  writerName: '',
+  writerId: '', // 填写人id（单选用-新建不让传）
+  writerName: '', // 填写人名字(多选时候-新建不让传)
   writeTime: '',
   writeStatus: '',
   itemOne: '',
@@ -45,12 +47,15 @@
   itemEight: '',
   itemNine: '',
   itemTen: '',
+
+  sendFlag: '', // 是否已发送（1/2）
+  sendFlagName: '', // 是否已发送（1/2）
 })
 
 const questionnaireFormRules = ref({
-  labCode: [{ required: true, message: '实验室不能为空，请选择', trigger: ['change', 'blur'] }],
-  customerId: [{ required: true, message: '填写单位不能为空，请选择', trigger: 'change' }],
-  writerId: [{ required: true, message: '填写人不能为空，请选择', trigger: 'change' }],
+  labCode: [{ required: true, message: '实验室不能为空', trigger: ['change', 'blur'] }],
+  customerId: [{ required: true, message: '填写单位不能为空', trigger: 'change' }],
+  writerName: [{ required: true, message: '填写人不能为空', trigger: 'change' }],
 }) // 表单验证规则
 
 // 字典值
@@ -71,28 +76,43 @@
   { index: 10, text: '10、对所提供的计量保障是否满意', value: 0, attributeName: 'itemTen' },
 ])
 
-// 逻辑
-
-// 显示筛选填写用户和单位的弹窗
+// ---------------------------------------------多选填写人----------------------------------------------
+const writerNames = ref<{ customerId: string; writerId: string }[]>([]) // 选择的填写人数组
+// 点击选择填写人
 const showFilterCustomerDialog = () => {
-  refFilterCustomer.value.showOrHideFilterDialog(true)
+  refFilterCustomer.value.showOrHideFilterDialog(true, '', false, writerNames.value)
 }
 
-// 返回选定结果
-const recordSelectedHandler = (row: any) => {
+// 选定填写人
+const recordSelectedHandler = (list: any) => {
   refFilterCustomer.value.showOrHideFilterDialog(false)
-
-  if (row.id !== '') {
-    questionnaireInfo.value.customerId = row.customerId
-    questionnaireInfo.value.customerName = row.customerName
-    questionnaireInfo.value.writerId = row.id
-    questionnaireInfo.value.writerName = row.name
+  if (list && list.length) {
+    writerNames.value = list.map((item: { customerDeptId: string; id: string }) => {
+      return {
+        customerId: item.customerDeptId,
+        writerId: item.id,
+      }
+    })
+    questionnaireInfo.value.writerName = list.map((item: { name: string }) => item.name).join(',')
+    // 填写单位
+    questionnaireInfo.value.customerName = uniqueArray(list.map((item: { customerName: string }) => item.customerName)).join(',')
+    questionnaireInfo.value.customerId = uniqueArray(list.map((item: { customerDeptId: string }) => item.customerDeptId)).join(',')
   }
   else {
     ElMessage.error('填写单位和填写人不能为空，请重新选择')
   }
 }
 
+// 清空填写人
+const clean = () => {
+  questionnaireInfo.value.writerName = ''
+  questionnaireInfo.value.customerName = ''
+  questionnaireInfo.value.customerId = ''
+  writerNames.value = []
+}
+
+// ---------------------------------------------------------------------------------------------------
+
 // 保存
 const saveQuestionnaireInfo = () => {
   let satisfactionStr = ''
@@ -109,19 +129,29 @@
     if (satisfactionStr.length === 10) {
       questionnaireInfo.value.writeTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 填写时间为当前时间
     }
-
+    const params = {
+      ...questionnaireInfo.value,
+      writerId: null, // 填写人id（单选用-多选时候新建不让传）
+      writerName: null, // 填写人名字(多选时候-新建不让传)
+      sendFlag: '2', // 是否已发送（1/2）
+      sendFlagName: '未发送', // 是否已发送（1/2）
+      customerName: null,
+      customerId: null,
+      sendDTOs: writerNames.value, // 填写人信息
+    }
     // 提交接口
-    addQuestionnaire(questionnaireInfo.value).then((res) => {
+    addQuestionnaire(params).then((res) => {
       if (res.code === 200) {
       // 提示保存成功
-        ElMessage.success('委托方满意度调查表创建并发送成功')
+        ElMessage.success('委托方满意度调查表创建成功')
 
         // 设置返回的委托方id和委托方编号
-        questionnaireInfo.value.questionnaireNo = res.data.questionnaireNo
-        questionnaireInfo.value.id = res.data.id
-        id.value = res.data.id
+        // questionnaireInfo.value.questionnaireNo = res.data.questionnaireNo
+        // questionnaireInfo.value.id = res.data.id
+        // id.value = res.data.id
 
         type.value = 'detail'
+        sendIds.value = res.data
       }
       else {
       // 提示失败信息
@@ -193,6 +223,18 @@
   router.go(-1)
 }
 
+// 点击发送
+const handleSend = () => {
+  if (sendIds && sendIds.value.length) {
+    send({ ids: sendIds.value }).then((res) => {
+      ElMessage.success('发送成功')
+    })
+  }
+  else {
+    ElMessage.warning('没有发送的单位或个人')
+  }
+}
+
 const initDialog = (params: any) => {
   // 从路由中获取参数
   type.value = params.type
@@ -205,7 +247,8 @@
       questionnaireInfo.value.senderId = userInfo.id
       questionnaireInfo.value.senderName = userInfo.name
       questionnaireInfo.value.sendTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
-
+      questionnaireInfo.value.labCode = userInfo.bizLabCode // 实验室代码
+      questionnaireInfo.value.labCodeName = userInfo.labCodeName // 实验室名称
       break
 
     case 'detail':
@@ -275,6 +318,9 @@
     <el-form ref="questionnaireFormRef" :model="questionnaireInfo" :rules="questionnaireFormRules" label-position="right" label-width="110px" border stripe>
       <detail-page title="委托方满意度调查表">
         <template #btns>
+          <el-button v-if="type === 'detail'" type="primary" @click="handleSend">
+            发送
+          </el-button>
           <el-button v-if="type !== 'detail'" type="primary" @click="saveButtonHandler">
             保存
           </el-button>
@@ -284,7 +330,6 @@
         </template>
 
         <el-row :gutter="24">
-          <!-- 第一行 第一列 -->
           <el-col :span="6">
             <el-form-item label="实验室" prop="labCode">
               <el-select v-model="questionnaireInfo.labCode" placeholder="请选择实验室" :disabled="type === 'detail'" style="width: 100%;">
@@ -292,46 +337,52 @@
               </el-select>
               <el-input v-model="questionnaireInfo.labCodeName" type="hidden" />
             </el-form-item>
-
-            <el-form-item label="填写单位" prop="customerId">
-              <el-input v-model="questionnaireInfo.customerName" :disabled="true" placeholder="选择填写人时自动填充" />
-              <el-input v-model="questionnaireInfo.customerId" type="hidden" />
-            </el-form-item>
           </el-col>
-
           <el-col :span="6">
             <el-form-item label="文件编号">
-              <el-input v-model="questionnaireInfo.questionnaireNo" placeholder="文件编号，保存后自动生成" :disabled="true" />
-            </el-form-item>
-
-            <el-form-item label="填写人" prop="writerId">
-              <el-input v-model="questionnaireInfo.writerName" :readonly="true" :disabled="true">
-                <template #append>
-                  <el-button size="small" :disabled="type === 'detail'" @click="showFilterCustomerDialog">
-                    选择
-                  </el-button>
-                </template>
-              </el-input>
-              <el-input v-model="questionnaireInfo.writerId" type="hidden" />
+              <el-input v-model="questionnaireInfo.questionnaireNo" placeholder="系统自动生成" :disabled="true" />
             </el-form-item>
           </el-col>
-
           <el-col :span="6">
             <el-form-item label="发送人">
               <el-input v-model="questionnaireInfo.senderName" :disabled="true" />
               <el-input v-model="questionnaireInfo.senderId" type="hidden" />
             </el-form-item>
-
-            <el-form-item label="填写时间">
-              <el-input v-model="questionnaireInfo.writeTime" :disabled="true" />
-            </el-form-item>
           </el-col>
-
           <el-col :span="6">
             <el-form-item label="发送时间">
               <el-input v-model="questionnaireInfo.sendTime" placeholder="保存后自动生成" :disabled="true" />
             </el-form-item>
           </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="填写人" prop="writerName" style="display: flex;">
+              <el-button size="small" type="primary" :disabled="type === 'detail'" @click="showFilterCustomerDialog">
+                {{ questionnaireInfo.writerName ? '继续添加' : '添加' }}
+              </el-button>
+              <el-button size="small" type="info" :disabled="type === 'detail'" @click="clean">
+                清空
+              </el-button>
+              <el-input v-model="questionnaireInfo.writerName" placeholder="请添加填写人" style="margin-top: 8px;" :readonly="true" :disabled="true" type="textarea" autosize>
+                <!-- <template #append>
+                  <el-button size="small" :disabled="type === 'detail'" @click="showFilterCustomerDialog">
+                    选择
+                  </el-button>
+                </template> -->
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="填写单位" prop="customerId">
+              <el-input v-model="questionnaireInfo.customerName" type="textarea" :autosize="{ minRows: 3 }" :disabled="true" placeholder="选择填写人时自动填充" />
+              <el-input v-model="questionnaireInfo.customerId" type="hidden" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="填写时间">
+              <el-input v-model="questionnaireInfo.writeTime" :disabled="true" />
+            </el-form-item>
+          </el-col>
         </el-row>
       </detail-page>
 
@@ -350,8 +401,8 @@
         </el-row>
       </table-container>
     </el-form>
-
-    <filter-customer-staff ref="refFilterCustomer" title="请选择填写单位和填写人" @record-selected="recordSelectedHandler" />
+    <!-- 单选填写人--先选委托方，再去选委托方下面的人 -->
+    <filter-customer-staff ref="refFilterCustomer" :is-multi="true" title="请选择填写单位和填写人" @record-selected="recordSelectedHandler" />
   </app-container>
 </template>
 
diff --git a/src/views/resource/customer/questionnaire/list.vue b/src/views/resource/customer/questionnaire/list.vue
index a2306ff..553e5f3 100644
--- a/src/views/resource/customer/questionnaire/list.vue
+++ b/src/views/resource/customer/questionnaire/list.vue
@@ -2,9 +2,9 @@
 <script name="QuestionnaireList" lang="ts" setup>
 import { ElMessage, dayjs } from 'element-plus'
 import type { DateModelType } from 'element-plus'
-import type{ ICustomerQuestionnaireInfo, IListQuery } from './customer-questionnaire'
+import type { ICustomerQuestionnaireInfo, IListQuery } from './customer-questionnaire'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getQuestionnaireList } from '@/api/resource/questionnaire'
+import { getQuestionnaireList, remindWorker } from '@/api/resource/questionnaire'
 
 const { proxy } = getCurrentInstance() as any
 const router = useRouter()
@@ -118,7 +118,9 @@
 }
 
 const urging = (row: ICustomerQuestionnaireInfo) => {
-  ElMessage.success(`满意度调查表 ${row.questionnaireNo} 填写消息已发送`)
+  remindWorker({ id: row.id }).then((res) => {
+    ElMessage.success(`满意度调查表 ${row.questionnaireNo} 填写消息已催办`)
+  })
 }
 
 watch(dateRangeSend, (val) => {
@@ -194,7 +196,8 @@
               <el-button size="small" type="primary" link @click="detail(row)">
                 详情
               </el-button>
-              <el-button v-if="row.writeStatus !== '已提交'" size="small" type="primary" link @click="urging(row)">
+              <!-- <el-button v-if="row.writeStatus !== '已提交'" size="small" type="primary" link @click="urging(row)"> -->
+              <el-button size="small" type="primary" link @click="urging(row)">
                 催办
               </el-button>
             </template>

diff --git a/src/api/resource/questionnaire.ts b/src/api/resource/questionnaire.ts
index f40c875..9e55dc7 100644
--- a/src/api/resource/questionnaire.ts
+++ b/src/api/resource/questionnaire.ts
@@ -17,3 +17,22 @@
     data,
   })
 }
+
+// 发送
+export function send(data: { ids: string[] }) {
+  return request({
+    url: `${prefix}/questionnaire/send`,
+    method: 'post',
+    data,
+  })
+}
+
+remindWorker
+// 催办
+export function remindWorker(data: { id: string }) {
+  return request({
+    url: `${prefix}/questionnaire/remindWorker`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/resource/common/filterConsumableCheck.vue b/src/views/resource/common/filterConsumableCheck.vue
new file mode 100644
index 0000000..14f6d0a
--- /dev/null
+++ b/src/views/resource/common/filterConsumableCheck.vue
@@ -0,0 +1,198 @@
+<!-- 选择物资验收记录 -->
+<script lang="ts" setup name="FilterConsumableCheck">
+import { ElMessage } from 'element-plus'
+import type { Ref } from 'vue'
+import { ref } from 'vue'
+import dayjs from 'dayjs'
+import type { DateModelType } from 'element-plus'
+import { getLocationList } from '@/api/business/taskMeasure/measureData'
+import { getGoodsCheckList } from '@/api/resource/supplierConsumable'
+import { getStaffList } from '@/api/resource/register'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { getCustomerInfoList } from '@/api/resource/customer'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  recordNo: '', // 记录单编号
+  createDept: '',
+  createUserName: '', // 创建人
+  acceptTimeStart: '', // 创建时间-起始
+  acceptTimeEnd: '', // 创建时间-结束
+  approvalStatus: '0', // 审批状态
+  formId: SCHEDULE.CHECK_MATERIAL_RECORD_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
+  offset: 1,
+  limit: 20,
+})
+// 多选选中的内容
+const checkoutList = ref([])
+const loadingTable = ref(false)
+const list = ref([]) // 表格数据
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '文件编号', value: 'recordNo', align: 'center', width: '200' },
+  { text: '物资名称', value: 'goodsName', align: 'center' },
+  { text: '规格型号', value: 'goodsModel', align: 'center' },
+  { text: '验收部门', value: 'createDept', align: 'center', width: '160' },
+  { text: '验收人', value: 'createUserName', align: 'center', width: '120' },
+  { text: '验收时间', value: 'createTime', align: 'center', width: '120' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '100' },
+])
+const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
+
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getGoodsCheckList(listQuery.value).then((response) => {
+    if (response.code === 200) {
+      list.value = response.data.rows.map((item: any) => {
+        return {
+          ...item,
+          createTime: item.createTime!.length > 16 ? item.createTime!.substring(0, 10) : '',
+        }
+      })
+      total.value = parseInt(response.data.total)
+    }
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
+}
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    recordNo: '', // 记录单编号
+    createDept: '',
+    createUserName: '', // 创建人
+    acceptTimeStart: '', // 创建时间-起始
+    acceptTimeEnd: '', // 创建时间-结束
+    approvalStatus: '0', // 审批状态
+    formId: SCHEDULE.CHECK_MATERIAL_RECORD_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
+    offset: 1,
+    limit: 20,
+  }
+  dateRange.value = ['', '']
+  fetchData()
+}
+// 搜索
+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
+  }
+  search()
+}
+// 点击确定
+const confirmSelect = (row: any) => {
+  emits('confirm', [row])
+  dialogFormVisible.value = false
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData()
+}
+
+watch(dateRange, (val) => {
+  if (val) {
+    listQuery.value.acceptTimeStart = dayjs(val[0]).format('YYYY-MM-DD') === 'Invalid Date' ? '' : dayjs(val[0]).format('YYYY-MM-DD')
+    listQuery.value.acceptTimeEnd = dayjs(val[1]).format('YYYY-MM-DD') === 'Invalid Date' ? '' : dayjs(val[1]).format('YYYY-MM-DD')
+  }
+  else {
+    listQuery.value.acceptTimeStart = ''
+    listQuery.value.acceptTimeEnd = ''
+  }
+})
+
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择工作间" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input v-model="listQuery.recordNo" placeholder="文件编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.createDept" placeholder="验收部门" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.createUserName" placeholder="验收人" clearable />
+      </search-item>
+      <search-item>
+        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="验收时间（开始）" end-placeholder="验收时间（结束）" />
+      </search-item>
+    </search-area>
+
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        :height="520"
+        :is-show-single-select-button="true"
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column fixed="right" label="操作" align="center" width="130">
+            <template #default="{ row }">
+              <el-button size="small" type="primary" @click="confirmSelect(row)">
+                选定
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <!-- <el-button type="primary" @click="confirmSelect">确认</el-button> -->
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/resource/common/filterCustomerStaff.vue b/src/views/resource/common/filterCustomerStaff.vue
index 610bf51..fd40e61 100644
--- a/src/views/resource/common/filterCustomerStaff.vue
+++ b/src/views/resource/common/filterCustomerStaff.vue
@@ -1,5 +1,6 @@
 <!-- 筛选系统用户弹窗 -->
 <script name="FilterCustomerStaff" lang="ts" setup>
+import { ElMessage } from 'element-plus'
 import type { ICustomerFilter, ICustomerTree } from './common-interface'
 import type { ICustomerInfo } from '@/views/resource/customer/info/customer-info'
 import type { IlistQueryType } from '@/views/system/user/user-interface'
@@ -7,11 +8,15 @@
 import { getCustomerInfoList } from '@/api/resource/customer'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 
-defineProps({
+const props = defineProps({
   title: {
     type: String,
     default: '请选择',
   },
+  isMulti: { // 是否多选
+    type: Boolean,
+    default: false,
+  },
 })
 
 const emit = defineEmits(['recordSelected'])
@@ -20,9 +25,10 @@
   children: 'children',
   label: 'customerName',
 }
-
+const tableLoading = ref(false)
 // 定义变量
 const customerIdSelected = ref<string>('')
+const customerDeptIdSelected = ref<string>('')
 const customerNameSelected = ref<string>('')
 const disabledCustomerName = ref(false) // 委托方筛选是否禁用
 const getCustomerName = ref('') // 委托方
@@ -44,7 +50,9 @@
   endTime: '',
   deptType: '',
 })
+const tableRef = ref()
 const sysUserList = ref([])
+const checkoutList = ref([]) // 多选
 const total = ref<number>(0) // 数据总条数
 const columns = ref <Array<TableColumn>>([
   { text: '账号', value: 'account', align: 'center' },
@@ -53,9 +61,13 @@
 ]) // 表头
 
 const customerTree = ref<Array<ICustomerTree>>([])
-
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
 // 查询用户列表
 const getSysUserList = () => {
+  tableLoading.value = true
   getAllUserList(sysUserQuery.value).then((res) => {
     if (res.code === 200) {
       sysUserList.value = res.data.rows.map((item: any) => {
@@ -63,10 +75,12 @@
           ...item,
           customerId: customerIdSelected.value,
           customerName: customerNameSelected.value,
+          customerDeptId: customerDeptIdSelected,
         }
       })
       total.value = Number(res.data.total)
     }
+    tableLoading.value = false
   })
 }
 
@@ -101,17 +115,25 @@
 
   // 赋值选中的委托方
   customerIdSelected.value = data.id
+  customerDeptIdSelected.value = data.deptId
   customerNameSelected.value = data.customerName
 
   getSysUserList()
 }
 
-// 选中用户
+// 单选选定
 const selectSingleUser = (row: Object) => {
   emit('recordSelected', row)
 }
 
-const showOrHideFilterDialog = (show: boolean, customerName = '', disabledCustomerNameParam = false) => {
+/**
+ * 弹窗显隐
+ * @param show 控制弹窗显隐
+ * @param customerName 委托方名称
+ * @param disabledCustomerNameParam 禁止修改委托方名称
+ * @param writerNames 委托方意见登记表--[]则清空原有的多选
+ */
+const showOrHideFilterDialog = (show: boolean, customerName = '', disabledCustomerNameParam = false, writerNames = []) => {
   if (show === false) {
     customerQuery.value.customerName = ''
     customerQuery.value.approvalStatus = '0'
@@ -136,6 +158,21 @@
   }
 
   showFilterDialog.value = show
+
+  if (!writerNames.length && show && tableRef.value) {
+    console.log('清除多选')
+    tableRef.value.clearMulti()
+  }
+}
+
+// 多选确定
+const submitEquipmentSelected = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('至少选中一条数据')
+    return false
+  }
+  emit('recordSelected', checkoutList.value)
+  showOrHideFilterDialog(false)
 }
 
 defineExpose({
@@ -176,13 +213,18 @@
         </search-area>
 
         <!-- 表格数据展示 -->
-        <table-container :title-show="false">
+        <table-container v-loading="tableLoading" :title-show="false">
           <!-- 表格区域 -->
           <normal-table
             id="sysUserFilter"
+            ref="tableRef"
             :data="sysUserList" :total="total" :columns="columns"
             :query="{ limit: sysUserQuery.limit, offset: sysUserQuery.offset }"
+            is-showmulti-select
+            :is-multi="isMulti"
+            :height="520"
             @change="changePage"
+            @multi-select="handleSelectionChange"
           >
             <template #preColumns>
               <el-table-column label="序号" width="55" align="center">
@@ -191,7 +233,7 @@
                 </template>
               </el-table-column>
             </template>
-            <template #columns>
+            <template v-if="!props.isMulti" #columns>
               <el-table-column fixed="right" label="操作" align="center" width="130">
                 <template #default="{ row }">
                   <el-button size="small" type="primary" @click="selectSingleUser(row)">
@@ -204,6 +246,15 @@
         </table-container>
       </div>
     </div>
+    <!-- 多选 -->
+    <template v-if="props.isMulti" #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitEquipmentSelected">
+          确定
+        </el-button>
+        <el-button @click="showOrHideFilterDialog(false)">取消</el-button>
+      </span>
+    </template>
   </el-dialog>
 </template>
 
diff --git a/src/views/resource/common/filterSysUser.vue b/src/views/resource/common/filterSysUser.vue
index 71ec72d..4efa44f 100644
--- a/src/views/resource/common/filterSysUser.vue
+++ b/src/views/resource/common/filterSysUser.vue
@@ -1,7 +1,8 @@
 <!-- 筛选系统用户弹窗 -->
 <script name="FilterSysUser" lang="ts" setup>
+import { ElMessage } from 'element-plus'
 import type { IlistQueryType, addInfo } from '@/views/system/user/user-interface'
-import { getUserList } from '@/api/system/user'
+import { getAllUserList } from '@/api/system/user'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
 
@@ -11,6 +12,10 @@
     type: Boolean,
     default: true,
   },
+  isMulti: { // 是否多选
+    type: Boolean,
+    default: false,
+  },
 })
 const emit = defineEmits(['recordSelected'])
 const tableLoading = ref(false)
@@ -28,6 +33,7 @@
 })
 const pid = ref<string>('')
 const sysUserList = ref<Array<addInfo>>([])
+const checkoutList = ref<Array<addInfo>>([]) // 多选
 const total = ref<number>(0) // 数据总条数
 const columns = ref <Array<TableColumn>>([
   { text: '账号', value: 'account', align: 'center' },
@@ -35,7 +41,10 @@
   { text: '部门', value: 'deptName', align: 'center' },
   { text: '人员类别', value: 'avatarName', align: 'center' },
 ]) // 表头
-
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
 const staffTypeMap = ref({}) as any// 人员类别
 // 获取字典
 const fetchDict = async () => {
@@ -48,7 +57,7 @@
 
 const getSysUserList = () => {
   tableLoading.value = true
-  getUserList(searchQuery).then((res) => {
+  getAllUserList(searchQuery).then((res) => {
     if (res.code === 200) {
       sysUserList.value = res.data.rows.map((item: { avatar: string }) => {
         return {
@@ -62,6 +71,19 @@
   })
 }
 
+// 重置
+const reset = () => {
+  searchQuery.keywords = ''
+  searchQuery.deptId = ''
+  searchQuery.offset = 1
+  searchQuery.limit = 20
+  searchQuery.sort = ''
+  searchQuery.beginTime = ''
+  searchQuery.endTime = ''
+  searchQuery.deptType = ''
+  getSysUserList()
+}
+
 // 逻辑
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -73,10 +95,12 @@
   getSysUserList()
 }
 
+// 单选确定
 const selectSingleUser = (row: addInfo) => {
   emit('recordSelected', row)
 }
 
+// 取消
 const showOrHideFilterDialog = (show: boolean, deptId = '') => {
   if (show === false) {
     searchQuery.keywords = ''
@@ -95,6 +119,16 @@
   showFilterDialog.value = show
 }
 
+// 多选确定
+const submitEquipmentSelected = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('至少选中一条数据')
+    return false
+  }
+  emit('recordSelected', checkoutList.value)
+  showOrHideFilterDialog(false)
+}
+
 defineExpose({
   showOrHideFilterDialog,
 })
@@ -102,7 +136,7 @@
 
 <template>
   <el-dialog v-model="showFilterDialog" title="选择用户" :append-to-body="true" :close-on-click-modal="false" top="10vh">
-    <search-area :need-clear="false" @search="getSysUserList">
+    <search-area :need-clear="true" @search="getSysUserList" @clear="reset">
       <search-item>
         <el-input v-model="searchQuery.keywords" placeholder="姓名" clearable />
       </search-item>
@@ -119,7 +153,11 @@
         v-loading="tableLoading" :data="sysUserList" :total="total"
         :columns="columns"
         :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+        is-showmulti-select
+        :is-multi="isMulti"
+        :height="520"
         @change="changePage"
+        @multi-select="handleSelectionChange"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
@@ -128,7 +166,8 @@
             </template>
           </el-table-column>
         </template>
-        <template #columns>
+        <!-- 单选 -->
+        <template v-if="!props.isMulti" #columns>
           <el-table-column fixed="right" label="操作" align="center" width="130">
             <template #default="{ row }">
               <el-button size="small" type="primary" @click="selectSingleUser(row)">
@@ -139,5 +178,14 @@
         </template>
       </normal-table>
     </table-container>
+    <!-- 多选 -->
+    <template v-if="props.isMulti" #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitEquipmentSelected">
+          确定
+        </el-button>
+        <el-button @click="showOrHideFilterDialog(false)">取消</el-button>
+      </span>
+    </template>
   </el-dialog>
 </template>
diff --git a/src/views/resource/customer/questionnaire/customer-questionnaire.ts b/src/views/resource/customer/questionnaire/customer-questionnaire.ts
index 7391891..a3b40fc 100644
--- a/src/views/resource/customer/questionnaire/customer-questionnaire.ts
+++ b/src/views/resource/customer/questionnaire/customer-questionnaire.ts
@@ -39,6 +39,8 @@
   itemTen: string
   score?: string
   [key: string]: string | undefined
+  sendFlag: string // 是否已发送（1/2）
+  sendFlagName: string // 是否已发送（1/2）
 }
 
 export interface ICustomerRateColumn {
diff --git a/src/views/resource/customer/questionnaire/detail.vue b/src/views/resource/customer/questionnaire/detail.vue
index 6560afd..553ebb4 100644
--- a/src/views/resource/customer/questionnaire/detail.vue
+++ b/src/views/resource/customer/questionnaire/detail.vue
@@ -1,12 +1,14 @@
 <!-- 委托方满意度调查表详情 -->
 <script name="QuestionnaireDetail" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
-import type{ ICustomerQuestionnaireInfo, ICustomerRateColumn } from './customer-questionnaire'
+import type { ICustomerQuestionnaireInfo, ICustomerRateColumn } from './customer-questionnaire'
 import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
 import useUserStore from '@/store/modules/user'
-import { addQuestionnaire } from '@/api/resource/questionnaire'
+import FilterSysUser from '@/views/resource/common/filterSysUser.vue'
+import { addQuestionnaire, send } from '@/api/resource/questionnaire'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import { getDictByCode } from '@/api/system/dict'
+import { uniqueArray } from '@/utils/Array'
 
 // 从路由中传过来的参数
 const type = ref<string>('')
@@ -18,7 +20,7 @@
 
 const questionnaireFormRef = ref()
 const refFilterCustomer = ref()
-
+const sendIds = ref<string[]>([]) // 发送的参数
 const questionnaireInfo = ref<ICustomerQuestionnaireInfo>({
   id: '',
   customerId: '',
@@ -31,8 +33,8 @@
   senderId: '',
   senderName: '',
   sendTime: '',
-  writerId: '',
-  writerName: '',
+  writerId: '', // 填写人id（单选用-新建不让传）
+  writerName: '', // 填写人名字(多选时候-新建不让传)
   writeTime: '',
   writeStatus: '',
   itemOne: '',
@@ -45,12 +47,15 @@
   itemEight: '',
   itemNine: '',
   itemTen: '',
+
+  sendFlag: '', // 是否已发送（1/2）
+  sendFlagName: '', // 是否已发送（1/2）
 })
 
 const questionnaireFormRules = ref({
-  labCode: [{ required: true, message: '实验室不能为空，请选择', trigger: ['change', 'blur'] }],
-  customerId: [{ required: true, message: '填写单位不能为空，请选择', trigger: 'change' }],
-  writerId: [{ required: true, message: '填写人不能为空，请选择', trigger: 'change' }],
+  labCode: [{ required: true, message: '实验室不能为空', trigger: ['change', 'blur'] }],
+  customerId: [{ required: true, message: '填写单位不能为空', trigger: 'change' }],
+  writerName: [{ required: true, message: '填写人不能为空', trigger: 'change' }],
 }) // 表单验证规则
 
 // 字典值
@@ -71,28 +76,43 @@
   { index: 10, text: '10、对所提供的计量保障是否满意', value: 0, attributeName: 'itemTen' },
 ])
 
-// 逻辑
-
-// 显示筛选填写用户和单位的弹窗
+// ---------------------------------------------多选填写人----------------------------------------------
+const writerNames = ref<{ customerId: string; writerId: string }[]>([]) // 选择的填写人数组
+// 点击选择填写人
 const showFilterCustomerDialog = () => {
-  refFilterCustomer.value.showOrHideFilterDialog(true)
+  refFilterCustomer.value.showOrHideFilterDialog(true, '', false, writerNames.value)
 }
 
-// 返回选定结果
-const recordSelectedHandler = (row: any) => {
+// 选定填写人
+const recordSelectedHandler = (list: any) => {
   refFilterCustomer.value.showOrHideFilterDialog(false)
-
-  if (row.id !== '') {
-    questionnaireInfo.value.customerId = row.customerId
-    questionnaireInfo.value.customerName = row.customerName
-    questionnaireInfo.value.writerId = row.id
-    questionnaireInfo.value.writerName = row.name
+  if (list && list.length) {
+    writerNames.value = list.map((item: { customerDeptId: string; id: string }) => {
+      return {
+        customerId: item.customerDeptId,
+        writerId: item.id,
+      }
+    })
+    questionnaireInfo.value.writerName = list.map((item: { name: string }) => item.name).join(',')
+    // 填写单位
+    questionnaireInfo.value.customerName = uniqueArray(list.map((item: { customerName: string }) => item.customerName)).join(',')
+    questionnaireInfo.value.customerId = uniqueArray(list.map((item: { customerDeptId: string }) => item.customerDeptId)).join(',')
   }
   else {
     ElMessage.error('填写单位和填写人不能为空，请重新选择')
   }
 }
 
+// 清空填写人
+const clean = () => {
+  questionnaireInfo.value.writerName = ''
+  questionnaireInfo.value.customerName = ''
+  questionnaireInfo.value.customerId = ''
+  writerNames.value = []
+}
+
+// ---------------------------------------------------------------------------------------------------
+
 // 保存
 const saveQuestionnaireInfo = () => {
   let satisfactionStr = ''
@@ -109,19 +129,29 @@
     if (satisfactionStr.length === 10) {
       questionnaireInfo.value.writeTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 填写时间为当前时间
     }
-
+    const params = {
+      ...questionnaireInfo.value,
+      writerId: null, // 填写人id（单选用-多选时候新建不让传）
+      writerName: null, // 填写人名字(多选时候-新建不让传)
+      sendFlag: '2', // 是否已发送（1/2）
+      sendFlagName: '未发送', // 是否已发送（1/2）
+      customerName: null,
+      customerId: null,
+      sendDTOs: writerNames.value, // 填写人信息
+    }
     // 提交接口
-    addQuestionnaire(questionnaireInfo.value).then((res) => {
+    addQuestionnaire(params).then((res) => {
       if (res.code === 200) {
       // 提示保存成功
-        ElMessage.success('委托方满意度调查表创建并发送成功')
+        ElMessage.success('委托方满意度调查表创建成功')
 
         // 设置返回的委托方id和委托方编号
-        questionnaireInfo.value.questionnaireNo = res.data.questionnaireNo
-        questionnaireInfo.value.id = res.data.id
-        id.value = res.data.id
+        // questionnaireInfo.value.questionnaireNo = res.data.questionnaireNo
+        // questionnaireInfo.value.id = res.data.id
+        // id.value = res.data.id
 
         type.value = 'detail'
+        sendIds.value = res.data
       }
       else {
       // 提示失败信息
@@ -193,6 +223,18 @@
   router.go(-1)
 }
 
+// 点击发送
+const handleSend = () => {
+  if (sendIds && sendIds.value.length) {
+    send({ ids: sendIds.value }).then((res) => {
+      ElMessage.success('发送成功')
+    })
+  }
+  else {
+    ElMessage.warning('没有发送的单位或个人')
+  }
+}
+
 const initDialog = (params: any) => {
   // 从路由中获取参数
   type.value = params.type
@@ -205,7 +247,8 @@
       questionnaireInfo.value.senderId = userInfo.id
       questionnaireInfo.value.senderName = userInfo.name
       questionnaireInfo.value.sendTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
-
+      questionnaireInfo.value.labCode = userInfo.bizLabCode // 实验室代码
+      questionnaireInfo.value.labCodeName = userInfo.labCodeName // 实验室名称
       break
 
     case 'detail':
@@ -275,6 +318,9 @@
     <el-form ref="questionnaireFormRef" :model="questionnaireInfo" :rules="questionnaireFormRules" label-position="right" label-width="110px" border stripe>
       <detail-page title="委托方满意度调查表">
         <template #btns>
+          <el-button v-if="type === 'detail'" type="primary" @click="handleSend">
+            发送
+          </el-button>
           <el-button v-if="type !== 'detail'" type="primary" @click="saveButtonHandler">
             保存
           </el-button>
@@ -284,7 +330,6 @@
         </template>
 
         <el-row :gutter="24">
-          <!-- 第一行 第一列 -->
           <el-col :span="6">
             <el-form-item label="实验室" prop="labCode">
               <el-select v-model="questionnaireInfo.labCode" placeholder="请选择实验室" :disabled="type === 'detail'" style="width: 100%;">
@@ -292,46 +337,52 @@
               </el-select>
               <el-input v-model="questionnaireInfo.labCodeName" type="hidden" />
             </el-form-item>
-
-            <el-form-item label="填写单位" prop="customerId">
-              <el-input v-model="questionnaireInfo.customerName" :disabled="true" placeholder="选择填写人时自动填充" />
-              <el-input v-model="questionnaireInfo.customerId" type="hidden" />
-            </el-form-item>
           </el-col>
-
           <el-col :span="6">
             <el-form-item label="文件编号">
-              <el-input v-model="questionnaireInfo.questionnaireNo" placeholder="文件编号，保存后自动生成" :disabled="true" />
-            </el-form-item>
-
-            <el-form-item label="填写人" prop="writerId">
-              <el-input v-model="questionnaireInfo.writerName" :readonly="true" :disabled="true">
-                <template #append>
-                  <el-button size="small" :disabled="type === 'detail'" @click="showFilterCustomerDialog">
-                    选择
-                  </el-button>
-                </template>
-              </el-input>
-              <el-input v-model="questionnaireInfo.writerId" type="hidden" />
+              <el-input v-model="questionnaireInfo.questionnaireNo" placeholder="系统自动生成" :disabled="true" />
             </el-form-item>
           </el-col>
-
           <el-col :span="6">
             <el-form-item label="发送人">
               <el-input v-model="questionnaireInfo.senderName" :disabled="true" />
               <el-input v-model="questionnaireInfo.senderId" type="hidden" />
             </el-form-item>
-
-            <el-form-item label="填写时间">
-              <el-input v-model="questionnaireInfo.writeTime" :disabled="true" />
-            </el-form-item>
           </el-col>
-
           <el-col :span="6">
             <el-form-item label="发送时间">
               <el-input v-model="questionnaireInfo.sendTime" placeholder="保存后自动生成" :disabled="true" />
             </el-form-item>
           </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="填写人" prop="writerName" style="display: flex;">
+              <el-button size="small" type="primary" :disabled="type === 'detail'" @click="showFilterCustomerDialog">
+                {{ questionnaireInfo.writerName ? '继续添加' : '添加' }}
+              </el-button>
+              <el-button size="small" type="info" :disabled="type === 'detail'" @click="clean">
+                清空
+              </el-button>
+              <el-input v-model="questionnaireInfo.writerName" placeholder="请添加填写人" style="margin-top: 8px;" :readonly="true" :disabled="true" type="textarea" autosize>
+                <!-- <template #append>
+                  <el-button size="small" :disabled="type === 'detail'" @click="showFilterCustomerDialog">
+                    选择
+                  </el-button>
+                </template> -->
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="填写单位" prop="customerId">
+              <el-input v-model="questionnaireInfo.customerName" type="textarea" :autosize="{ minRows: 3 }" :disabled="true" placeholder="选择填写人时自动填充" />
+              <el-input v-model="questionnaireInfo.customerId" type="hidden" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="填写时间">
+              <el-input v-model="questionnaireInfo.writeTime" :disabled="true" />
+            </el-form-item>
+          </el-col>
         </el-row>
       </detail-page>
 
@@ -350,8 +401,8 @@
         </el-row>
       </table-container>
     </el-form>
-
-    <filter-customer-staff ref="refFilterCustomer" title="请选择填写单位和填写人" @record-selected="recordSelectedHandler" />
+    <!-- 单选填写人--先选委托方，再去选委托方下面的人 -->
+    <filter-customer-staff ref="refFilterCustomer" :is-multi="true" title="请选择填写单位和填写人" @record-selected="recordSelectedHandler" />
   </app-container>
 </template>
 
diff --git a/src/views/resource/customer/questionnaire/list.vue b/src/views/resource/customer/questionnaire/list.vue
index a2306ff..553e5f3 100644
--- a/src/views/resource/customer/questionnaire/list.vue
+++ b/src/views/resource/customer/questionnaire/list.vue
@@ -2,9 +2,9 @@
 <script name="QuestionnaireList" lang="ts" setup>
 import { ElMessage, dayjs } from 'element-plus'
 import type { DateModelType } from 'element-plus'
-import type{ ICustomerQuestionnaireInfo, IListQuery } from './customer-questionnaire'
+import type { ICustomerQuestionnaireInfo, IListQuery } from './customer-questionnaire'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getQuestionnaireList } from '@/api/resource/questionnaire'
+import { getQuestionnaireList, remindWorker } from '@/api/resource/questionnaire'
 
 const { proxy } = getCurrentInstance() as any
 const router = useRouter()
@@ -118,7 +118,9 @@
 }
 
 const urging = (row: ICustomerQuestionnaireInfo) => {
-  ElMessage.success(`满意度调查表 ${row.questionnaireNo} 填写消息已发送`)
+  remindWorker({ id: row.id }).then((res) => {
+    ElMessage.success(`满意度调查表 ${row.questionnaireNo} 填写消息已催办`)
+  })
 }
 
 watch(dateRangeSend, (val) => {
@@ -194,7 +196,8 @@
               <el-button size="small" type="primary" link @click="detail(row)">
                 详情
               </el-button>
-              <el-button v-if="row.writeStatus !== '已提交'" size="small" type="primary" link @click="urging(row)">
+              <!-- <el-button v-if="row.writeStatus !== '已提交'" size="small" type="primary" link @click="urging(row)"> -->
+              <el-button size="small" type="primary" link @click="urging(row)">
                 催办
               </el-button>
             </template>
diff --git a/src/views/resource/customer/situationReport/dialog/selectSuggestFormDialog.vue b/src/views/resource/customer/situationReport/dialog/selectSuggestFormDialog.vue
index 8fa636b..a491499 100644
--- a/src/views/resource/customer/situationReport/dialog/selectSuggestFormDialog.vue
+++ b/src/views/resource/customer/situationReport/dialog/selectSuggestFormDialog.vue
@@ -130,7 +130,7 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择委托方" width="65%">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择委托方意见登记表" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="clearList">
       <search-item width="162px">

diff --git a/src/api/resource/questionnaire.ts b/src/api/resource/questionnaire.ts
index f40c875..9e55dc7 100644
--- a/src/api/resource/questionnaire.ts
+++ b/src/api/resource/questionnaire.ts
@@ -17,3 +17,22 @@
     data,
   })
 }
+
+// 发送
+export function send(data: { ids: string[] }) {
+  return request({
+    url: `${prefix}/questionnaire/send`,
+    method: 'post',
+    data,
+  })
+}
+
+remindWorker
+// 催办
+export function remindWorker(data: { id: string }) {
+  return request({
+    url: `${prefix}/questionnaire/remindWorker`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/resource/common/filterConsumableCheck.vue b/src/views/resource/common/filterConsumableCheck.vue
new file mode 100644
index 0000000..14f6d0a
--- /dev/null
+++ b/src/views/resource/common/filterConsumableCheck.vue
@@ -0,0 +1,198 @@
+<!-- 选择物资验收记录 -->
+<script lang="ts" setup name="FilterConsumableCheck">
+import { ElMessage } from 'element-plus'
+import type { Ref } from 'vue'
+import { ref } from 'vue'
+import dayjs from 'dayjs'
+import type { DateModelType } from 'element-plus'
+import { getLocationList } from '@/api/business/taskMeasure/measureData'
+import { getGoodsCheckList } from '@/api/resource/supplierConsumable'
+import { getStaffList } from '@/api/resource/register'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { getCustomerInfoList } from '@/api/resource/customer'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  recordNo: '', // 记录单编号
+  createDept: '',
+  createUserName: '', // 创建人
+  acceptTimeStart: '', // 创建时间-起始
+  acceptTimeEnd: '', // 创建时间-结束
+  approvalStatus: '0', // 审批状态
+  formId: SCHEDULE.CHECK_MATERIAL_RECORD_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
+  offset: 1,
+  limit: 20,
+})
+// 多选选中的内容
+const checkoutList = ref([])
+const loadingTable = ref(false)
+const list = ref([]) // 表格数据
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '文件编号', value: 'recordNo', align: 'center', width: '200' },
+  { text: '物资名称', value: 'goodsName', align: 'center' },
+  { text: '规格型号', value: 'goodsModel', align: 'center' },
+  { text: '验收部门', value: 'createDept', align: 'center', width: '160' },
+  { text: '验收人', value: 'createUserName', align: 'center', width: '120' },
+  { text: '验收时间', value: 'createTime', align: 'center', width: '120' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '100' },
+])
+const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
+
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getGoodsCheckList(listQuery.value).then((response) => {
+    if (response.code === 200) {
+      list.value = response.data.rows.map((item: any) => {
+        return {
+          ...item,
+          createTime: item.createTime!.length > 16 ? item.createTime!.substring(0, 10) : '',
+        }
+      })
+      total.value = parseInt(response.data.total)
+    }
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
+}
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    recordNo: '', // 记录单编号
+    createDept: '',
+    createUserName: '', // 创建人
+    acceptTimeStart: '', // 创建时间-起始
+    acceptTimeEnd: '', // 创建时间-结束
+    approvalStatus: '0', // 审批状态
+    formId: SCHEDULE.CHECK_MATERIAL_RECORD_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
+    offset: 1,
+    limit: 20,
+  }
+  dateRange.value = ['', '']
+  fetchData()
+}
+// 搜索
+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
+  }
+  search()
+}
+// 点击确定
+const confirmSelect = (row: any) => {
+  emits('confirm', [row])
+  dialogFormVisible.value = false
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData()
+}
+
+watch(dateRange, (val) => {
+  if (val) {
+    listQuery.value.acceptTimeStart = dayjs(val[0]).format('YYYY-MM-DD') === 'Invalid Date' ? '' : dayjs(val[0]).format('YYYY-MM-DD')
+    listQuery.value.acceptTimeEnd = dayjs(val[1]).format('YYYY-MM-DD') === 'Invalid Date' ? '' : dayjs(val[1]).format('YYYY-MM-DD')
+  }
+  else {
+    listQuery.value.acceptTimeStart = ''
+    listQuery.value.acceptTimeEnd = ''
+  }
+})
+
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择工作间" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input v-model="listQuery.recordNo" placeholder="文件编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.createDept" placeholder="验收部门" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.createUserName" placeholder="验收人" clearable />
+      </search-item>
+      <search-item>
+        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="验收时间（开始）" end-placeholder="验收时间（结束）" />
+      </search-item>
+    </search-area>
+
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        :height="520"
+        :is-show-single-select-button="true"
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column fixed="right" label="操作" align="center" width="130">
+            <template #default="{ row }">
+              <el-button size="small" type="primary" @click="confirmSelect(row)">
+                选定
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <!-- <el-button type="primary" @click="confirmSelect">确认</el-button> -->
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/resource/common/filterCustomerStaff.vue b/src/views/resource/common/filterCustomerStaff.vue
index 610bf51..fd40e61 100644
--- a/src/views/resource/common/filterCustomerStaff.vue
+++ b/src/views/resource/common/filterCustomerStaff.vue
@@ -1,5 +1,6 @@
 <!-- 筛选系统用户弹窗 -->
 <script name="FilterCustomerStaff" lang="ts" setup>
+import { ElMessage } from 'element-plus'
 import type { ICustomerFilter, ICustomerTree } from './common-interface'
 import type { ICustomerInfo } from '@/views/resource/customer/info/customer-info'
 import type { IlistQueryType } from '@/views/system/user/user-interface'
@@ -7,11 +8,15 @@
 import { getCustomerInfoList } from '@/api/resource/customer'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 
-defineProps({
+const props = defineProps({
   title: {
     type: String,
     default: '请选择',
   },
+  isMulti: { // 是否多选
+    type: Boolean,
+    default: false,
+  },
 })
 
 const emit = defineEmits(['recordSelected'])
@@ -20,9 +25,10 @@
   children: 'children',
   label: 'customerName',
 }
-
+const tableLoading = ref(false)
 // 定义变量
 const customerIdSelected = ref<string>('')
+const customerDeptIdSelected = ref<string>('')
 const customerNameSelected = ref<string>('')
 const disabledCustomerName = ref(false) // 委托方筛选是否禁用
 const getCustomerName = ref('') // 委托方
@@ -44,7 +50,9 @@
   endTime: '',
   deptType: '',
 })
+const tableRef = ref()
 const sysUserList = ref([])
+const checkoutList = ref([]) // 多选
 const total = ref<number>(0) // 数据总条数
 const columns = ref <Array<TableColumn>>([
   { text: '账号', value: 'account', align: 'center' },
@@ -53,9 +61,13 @@
 ]) // 表头
 
 const customerTree = ref<Array<ICustomerTree>>([])
-
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
 // 查询用户列表
 const getSysUserList = () => {
+  tableLoading.value = true
   getAllUserList(sysUserQuery.value).then((res) => {
     if (res.code === 200) {
       sysUserList.value = res.data.rows.map((item: any) => {
@@ -63,10 +75,12 @@
           ...item,
           customerId: customerIdSelected.value,
           customerName: customerNameSelected.value,
+          customerDeptId: customerDeptIdSelected,
         }
       })
       total.value = Number(res.data.total)
     }
+    tableLoading.value = false
   })
 }
 
@@ -101,17 +115,25 @@
 
   // 赋值选中的委托方
   customerIdSelected.value = data.id
+  customerDeptIdSelected.value = data.deptId
   customerNameSelected.value = data.customerName
 
   getSysUserList()
 }
 
-// 选中用户
+// 单选选定
 const selectSingleUser = (row: Object) => {
   emit('recordSelected', row)
 }
 
-const showOrHideFilterDialog = (show: boolean, customerName = '', disabledCustomerNameParam = false) => {
+/**
+ * 弹窗显隐
+ * @param show 控制弹窗显隐
+ * @param customerName 委托方名称
+ * @param disabledCustomerNameParam 禁止修改委托方名称
+ * @param writerNames 委托方意见登记表--[]则清空原有的多选
+ */
+const showOrHideFilterDialog = (show: boolean, customerName = '', disabledCustomerNameParam = false, writerNames = []) => {
   if (show === false) {
     customerQuery.value.customerName = ''
     customerQuery.value.approvalStatus = '0'
@@ -136,6 +158,21 @@
   }
 
   showFilterDialog.value = show
+
+  if (!writerNames.length && show && tableRef.value) {
+    console.log('清除多选')
+    tableRef.value.clearMulti()
+  }
+}
+
+// 多选确定
+const submitEquipmentSelected = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('至少选中一条数据')
+    return false
+  }
+  emit('recordSelected', checkoutList.value)
+  showOrHideFilterDialog(false)
 }
 
 defineExpose({
@@ -176,13 +213,18 @@
         </search-area>
 
         <!-- 表格数据展示 -->
-        <table-container :title-show="false">
+        <table-container v-loading="tableLoading" :title-show="false">
           <!-- 表格区域 -->
           <normal-table
             id="sysUserFilter"
+            ref="tableRef"
             :data="sysUserList" :total="total" :columns="columns"
             :query="{ limit: sysUserQuery.limit, offset: sysUserQuery.offset }"
+            is-showmulti-select
+            :is-multi="isMulti"
+            :height="520"
             @change="changePage"
+            @multi-select="handleSelectionChange"
           >
             <template #preColumns>
               <el-table-column label="序号" width="55" align="center">
@@ -191,7 +233,7 @@
                 </template>
               </el-table-column>
             </template>
-            <template #columns>
+            <template v-if="!props.isMulti" #columns>
               <el-table-column fixed="right" label="操作" align="center" width="130">
                 <template #default="{ row }">
                   <el-button size="small" type="primary" @click="selectSingleUser(row)">
@@ -204,6 +246,15 @@
         </table-container>
       </div>
     </div>
+    <!-- 多选 -->
+    <template v-if="props.isMulti" #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitEquipmentSelected">
+          确定
+        </el-button>
+        <el-button @click="showOrHideFilterDialog(false)">取消</el-button>
+      </span>
+    </template>
   </el-dialog>
 </template>
 
diff --git a/src/views/resource/common/filterSysUser.vue b/src/views/resource/common/filterSysUser.vue
index 71ec72d..4efa44f 100644
--- a/src/views/resource/common/filterSysUser.vue
+++ b/src/views/resource/common/filterSysUser.vue
@@ -1,7 +1,8 @@
 <!-- 筛选系统用户弹窗 -->
 <script name="FilterSysUser" lang="ts" setup>
+import { ElMessage } from 'element-plus'
 import type { IlistQueryType, addInfo } from '@/views/system/user/user-interface'
-import { getUserList } from '@/api/system/user'
+import { getAllUserList } from '@/api/system/user'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
 
@@ -11,6 +12,10 @@
     type: Boolean,
     default: true,
   },
+  isMulti: { // 是否多选
+    type: Boolean,
+    default: false,
+  },
 })
 const emit = defineEmits(['recordSelected'])
 const tableLoading = ref(false)
@@ -28,6 +33,7 @@
 })
 const pid = ref<string>('')
 const sysUserList = ref<Array<addInfo>>([])
+const checkoutList = ref<Array<addInfo>>([]) // 多选
 const total = ref<number>(0) // 数据总条数
 const columns = ref <Array<TableColumn>>([
   { text: '账号', value: 'account', align: 'center' },
@@ -35,7 +41,10 @@
   { text: '部门', value: 'deptName', align: 'center' },
   { text: '人员类别', value: 'avatarName', align: 'center' },
 ]) // 表头
-
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
 const staffTypeMap = ref({}) as any// 人员类别
 // 获取字典
 const fetchDict = async () => {
@@ -48,7 +57,7 @@
 
 const getSysUserList = () => {
   tableLoading.value = true
-  getUserList(searchQuery).then((res) => {
+  getAllUserList(searchQuery).then((res) => {
     if (res.code === 200) {
       sysUserList.value = res.data.rows.map((item: { avatar: string }) => {
         return {
@@ -62,6 +71,19 @@
   })
 }
 
+// 重置
+const reset = () => {
+  searchQuery.keywords = ''
+  searchQuery.deptId = ''
+  searchQuery.offset = 1
+  searchQuery.limit = 20
+  searchQuery.sort = ''
+  searchQuery.beginTime = ''
+  searchQuery.endTime = ''
+  searchQuery.deptType = ''
+  getSysUserList()
+}
+
 // 逻辑
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -73,10 +95,12 @@
   getSysUserList()
 }
 
+// 单选确定
 const selectSingleUser = (row: addInfo) => {
   emit('recordSelected', row)
 }
 
+// 取消
 const showOrHideFilterDialog = (show: boolean, deptId = '') => {
   if (show === false) {
     searchQuery.keywords = ''
@@ -95,6 +119,16 @@
   showFilterDialog.value = show
 }
 
+// 多选确定
+const submitEquipmentSelected = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('至少选中一条数据')
+    return false
+  }
+  emit('recordSelected', checkoutList.value)
+  showOrHideFilterDialog(false)
+}
+
 defineExpose({
   showOrHideFilterDialog,
 })
@@ -102,7 +136,7 @@
 
 <template>
   <el-dialog v-model="showFilterDialog" title="选择用户" :append-to-body="true" :close-on-click-modal="false" top="10vh">
-    <search-area :need-clear="false" @search="getSysUserList">
+    <search-area :need-clear="true" @search="getSysUserList" @clear="reset">
       <search-item>
         <el-input v-model="searchQuery.keywords" placeholder="姓名" clearable />
       </search-item>
@@ -119,7 +153,11 @@
         v-loading="tableLoading" :data="sysUserList" :total="total"
         :columns="columns"
         :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+        is-showmulti-select
+        :is-multi="isMulti"
+        :height="520"
         @change="changePage"
+        @multi-select="handleSelectionChange"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
@@ -128,7 +166,8 @@
             </template>
           </el-table-column>
         </template>
-        <template #columns>
+        <!-- 单选 -->
+        <template v-if="!props.isMulti" #columns>
           <el-table-column fixed="right" label="操作" align="center" width="130">
             <template #default="{ row }">
               <el-button size="small" type="primary" @click="selectSingleUser(row)">
@@ -139,5 +178,14 @@
         </template>
       </normal-table>
     </table-container>
+    <!-- 多选 -->
+    <template v-if="props.isMulti" #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitEquipmentSelected">
+          确定
+        </el-button>
+        <el-button @click="showOrHideFilterDialog(false)">取消</el-button>
+      </span>
+    </template>
   </el-dialog>
 </template>
diff --git a/src/views/resource/customer/questionnaire/customer-questionnaire.ts b/src/views/resource/customer/questionnaire/customer-questionnaire.ts
index 7391891..a3b40fc 100644
--- a/src/views/resource/customer/questionnaire/customer-questionnaire.ts
+++ b/src/views/resource/customer/questionnaire/customer-questionnaire.ts
@@ -39,6 +39,8 @@
   itemTen: string
   score?: string
   [key: string]: string | undefined
+  sendFlag: string // 是否已发送（1/2）
+  sendFlagName: string // 是否已发送（1/2）
 }
 
 export interface ICustomerRateColumn {
diff --git a/src/views/resource/customer/questionnaire/detail.vue b/src/views/resource/customer/questionnaire/detail.vue
index 6560afd..553ebb4 100644
--- a/src/views/resource/customer/questionnaire/detail.vue
+++ b/src/views/resource/customer/questionnaire/detail.vue
@@ -1,12 +1,14 @@
 <!-- 委托方满意度调查表详情 -->
 <script name="QuestionnaireDetail" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
-import type{ ICustomerQuestionnaireInfo, ICustomerRateColumn } from './customer-questionnaire'
+import type { ICustomerQuestionnaireInfo, ICustomerRateColumn } from './customer-questionnaire'
 import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
 import useUserStore from '@/store/modules/user'
-import { addQuestionnaire } from '@/api/resource/questionnaire'
+import FilterSysUser from '@/views/resource/common/filterSysUser.vue'
+import { addQuestionnaire, send } from '@/api/resource/questionnaire'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import { getDictByCode } from '@/api/system/dict'
+import { uniqueArray } from '@/utils/Array'
 
 // 从路由中传过来的参数
 const type = ref<string>('')
@@ -18,7 +20,7 @@
 
 const questionnaireFormRef = ref()
 const refFilterCustomer = ref()
-
+const sendIds = ref<string[]>([]) // 发送的参数
 const questionnaireInfo = ref<ICustomerQuestionnaireInfo>({
   id: '',
   customerId: '',
@@ -31,8 +33,8 @@
   senderId: '',
   senderName: '',
   sendTime: '',
-  writerId: '',
-  writerName: '',
+  writerId: '', // 填写人id（单选用-新建不让传）
+  writerName: '', // 填写人名字(多选时候-新建不让传)
   writeTime: '',
   writeStatus: '',
   itemOne: '',
@@ -45,12 +47,15 @@
   itemEight: '',
   itemNine: '',
   itemTen: '',
+
+  sendFlag: '', // 是否已发送（1/2）
+  sendFlagName: '', // 是否已发送（1/2）
 })
 
 const questionnaireFormRules = ref({
-  labCode: [{ required: true, message: '实验室不能为空，请选择', trigger: ['change', 'blur'] }],
-  customerId: [{ required: true, message: '填写单位不能为空，请选择', trigger: 'change' }],
-  writerId: [{ required: true, message: '填写人不能为空，请选择', trigger: 'change' }],
+  labCode: [{ required: true, message: '实验室不能为空', trigger: ['change', 'blur'] }],
+  customerId: [{ required: true, message: '填写单位不能为空', trigger: 'change' }],
+  writerName: [{ required: true, message: '填写人不能为空', trigger: 'change' }],
 }) // 表单验证规则
 
 // 字典值
@@ -71,28 +76,43 @@
   { index: 10, text: '10、对所提供的计量保障是否满意', value: 0, attributeName: 'itemTen' },
 ])
 
-// 逻辑
-
-// 显示筛选填写用户和单位的弹窗
+// ---------------------------------------------多选填写人----------------------------------------------
+const writerNames = ref<{ customerId: string; writerId: string }[]>([]) // 选择的填写人数组
+// 点击选择填写人
 const showFilterCustomerDialog = () => {
-  refFilterCustomer.value.showOrHideFilterDialog(true)
+  refFilterCustomer.value.showOrHideFilterDialog(true, '', false, writerNames.value)
 }
 
-// 返回选定结果
-const recordSelectedHandler = (row: any) => {
+// 选定填写人
+const recordSelectedHandler = (list: any) => {
   refFilterCustomer.value.showOrHideFilterDialog(false)
-
-  if (row.id !== '') {
-    questionnaireInfo.value.customerId = row.customerId
-    questionnaireInfo.value.customerName = row.customerName
-    questionnaireInfo.value.writerId = row.id
-    questionnaireInfo.value.writerName = row.name
+  if (list && list.length) {
+    writerNames.value = list.map((item: { customerDeptId: string; id: string }) => {
+      return {
+        customerId: item.customerDeptId,
+        writerId: item.id,
+      }
+    })
+    questionnaireInfo.value.writerName = list.map((item: { name: string }) => item.name).join(',')
+    // 填写单位
+    questionnaireInfo.value.customerName = uniqueArray(list.map((item: { customerName: string }) => item.customerName)).join(',')
+    questionnaireInfo.value.customerId = uniqueArray(list.map((item: { customerDeptId: string }) => item.customerDeptId)).join(',')
   }
   else {
     ElMessage.error('填写单位和填写人不能为空，请重新选择')
   }
 }
 
+// 清空填写人
+const clean = () => {
+  questionnaireInfo.value.writerName = ''
+  questionnaireInfo.value.customerName = ''
+  questionnaireInfo.value.customerId = ''
+  writerNames.value = []
+}
+
+// ---------------------------------------------------------------------------------------------------
+
 // 保存
 const saveQuestionnaireInfo = () => {
   let satisfactionStr = ''
@@ -109,19 +129,29 @@
     if (satisfactionStr.length === 10) {
       questionnaireInfo.value.writeTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 填写时间为当前时间
     }
-
+    const params = {
+      ...questionnaireInfo.value,
+      writerId: null, // 填写人id（单选用-多选时候新建不让传）
+      writerName: null, // 填写人名字(多选时候-新建不让传)
+      sendFlag: '2', // 是否已发送（1/2）
+      sendFlagName: '未发送', // 是否已发送（1/2）
+      customerName: null,
+      customerId: null,
+      sendDTOs: writerNames.value, // 填写人信息
+    }
     // 提交接口
-    addQuestionnaire(questionnaireInfo.value).then((res) => {
+    addQuestionnaire(params).then((res) => {
       if (res.code === 200) {
       // 提示保存成功
-        ElMessage.success('委托方满意度调查表创建并发送成功')
+        ElMessage.success('委托方满意度调查表创建成功')
 
         // 设置返回的委托方id和委托方编号
-        questionnaireInfo.value.questionnaireNo = res.data.questionnaireNo
-        questionnaireInfo.value.id = res.data.id
-        id.value = res.data.id
+        // questionnaireInfo.value.questionnaireNo = res.data.questionnaireNo
+        // questionnaireInfo.value.id = res.data.id
+        // id.value = res.data.id
 
         type.value = 'detail'
+        sendIds.value = res.data
       }
       else {
       // 提示失败信息
@@ -193,6 +223,18 @@
   router.go(-1)
 }
 
+// 点击发送
+const handleSend = () => {
+  if (sendIds && sendIds.value.length) {
+    send({ ids: sendIds.value }).then((res) => {
+      ElMessage.success('发送成功')
+    })
+  }
+  else {
+    ElMessage.warning('没有发送的单位或个人')
+  }
+}
+
 const initDialog = (params: any) => {
   // 从路由中获取参数
   type.value = params.type
@@ -205,7 +247,8 @@
       questionnaireInfo.value.senderId = userInfo.id
       questionnaireInfo.value.senderName = userInfo.name
       questionnaireInfo.value.sendTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
-
+      questionnaireInfo.value.labCode = userInfo.bizLabCode // 实验室代码
+      questionnaireInfo.value.labCodeName = userInfo.labCodeName // 实验室名称
       break
 
     case 'detail':
@@ -275,6 +318,9 @@
     <el-form ref="questionnaireFormRef" :model="questionnaireInfo" :rules="questionnaireFormRules" label-position="right" label-width="110px" border stripe>
       <detail-page title="委托方满意度调查表">
         <template #btns>
+          <el-button v-if="type === 'detail'" type="primary" @click="handleSend">
+            发送
+          </el-button>
           <el-button v-if="type !== 'detail'" type="primary" @click="saveButtonHandler">
             保存
           </el-button>
@@ -284,7 +330,6 @@
         </template>
 
         <el-row :gutter="24">
-          <!-- 第一行 第一列 -->
           <el-col :span="6">
             <el-form-item label="实验室" prop="labCode">
               <el-select v-model="questionnaireInfo.labCode" placeholder="请选择实验室" :disabled="type === 'detail'" style="width: 100%;">
@@ -292,46 +337,52 @@
               </el-select>
               <el-input v-model="questionnaireInfo.labCodeName" type="hidden" />
             </el-form-item>
-
-            <el-form-item label="填写单位" prop="customerId">
-              <el-input v-model="questionnaireInfo.customerName" :disabled="true" placeholder="选择填写人时自动填充" />
-              <el-input v-model="questionnaireInfo.customerId" type="hidden" />
-            </el-form-item>
           </el-col>
-
           <el-col :span="6">
             <el-form-item label="文件编号">
-              <el-input v-model="questionnaireInfo.questionnaireNo" placeholder="文件编号，保存后自动生成" :disabled="true" />
-            </el-form-item>
-
-            <el-form-item label="填写人" prop="writerId">
-              <el-input v-model="questionnaireInfo.writerName" :readonly="true" :disabled="true">
-                <template #append>
-                  <el-button size="small" :disabled="type === 'detail'" @click="showFilterCustomerDialog">
-                    选择
-                  </el-button>
-                </template>
-              </el-input>
-              <el-input v-model="questionnaireInfo.writerId" type="hidden" />
+              <el-input v-model="questionnaireInfo.questionnaireNo" placeholder="系统自动生成" :disabled="true" />
             </el-form-item>
           </el-col>
-
           <el-col :span="6">
             <el-form-item label="发送人">
               <el-input v-model="questionnaireInfo.senderName" :disabled="true" />
               <el-input v-model="questionnaireInfo.senderId" type="hidden" />
             </el-form-item>
-
-            <el-form-item label="填写时间">
-              <el-input v-model="questionnaireInfo.writeTime" :disabled="true" />
-            </el-form-item>
           </el-col>
-
           <el-col :span="6">
             <el-form-item label="发送时间">
               <el-input v-model="questionnaireInfo.sendTime" placeholder="保存后自动生成" :disabled="true" />
             </el-form-item>
           </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="填写人" prop="writerName" style="display: flex;">
+              <el-button size="small" type="primary" :disabled="type === 'detail'" @click="showFilterCustomerDialog">
+                {{ questionnaireInfo.writerName ? '继续添加' : '添加' }}
+              </el-button>
+              <el-button size="small" type="info" :disabled="type === 'detail'" @click="clean">
+                清空
+              </el-button>
+              <el-input v-model="questionnaireInfo.writerName" placeholder="请添加填写人" style="margin-top: 8px;" :readonly="true" :disabled="true" type="textarea" autosize>
+                <!-- <template #append>
+                  <el-button size="small" :disabled="type === 'detail'" @click="showFilterCustomerDialog">
+                    选择
+                  </el-button>
+                </template> -->
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="填写单位" prop="customerId">
+              <el-input v-model="questionnaireInfo.customerName" type="textarea" :autosize="{ minRows: 3 }" :disabled="true" placeholder="选择填写人时自动填充" />
+              <el-input v-model="questionnaireInfo.customerId" type="hidden" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="填写时间">
+              <el-input v-model="questionnaireInfo.writeTime" :disabled="true" />
+            </el-form-item>
+          </el-col>
         </el-row>
       </detail-page>
 
@@ -350,8 +401,8 @@
         </el-row>
       </table-container>
     </el-form>
-
-    <filter-customer-staff ref="refFilterCustomer" title="请选择填写单位和填写人" @record-selected="recordSelectedHandler" />
+    <!-- 单选填写人--先选委托方，再去选委托方下面的人 -->
+    <filter-customer-staff ref="refFilterCustomer" :is-multi="true" title="请选择填写单位和填写人" @record-selected="recordSelectedHandler" />
   </app-container>
 </template>
 
diff --git a/src/views/resource/customer/questionnaire/list.vue b/src/views/resource/customer/questionnaire/list.vue
index a2306ff..553e5f3 100644
--- a/src/views/resource/customer/questionnaire/list.vue
+++ b/src/views/resource/customer/questionnaire/list.vue
@@ -2,9 +2,9 @@
 <script name="QuestionnaireList" lang="ts" setup>
 import { ElMessage, dayjs } from 'element-plus'
 import type { DateModelType } from 'element-plus'
-import type{ ICustomerQuestionnaireInfo, IListQuery } from './customer-questionnaire'
+import type { ICustomerQuestionnaireInfo, IListQuery } from './customer-questionnaire'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getQuestionnaireList } from '@/api/resource/questionnaire'
+import { getQuestionnaireList, remindWorker } from '@/api/resource/questionnaire'
 
 const { proxy } = getCurrentInstance() as any
 const router = useRouter()
@@ -118,7 +118,9 @@
 }
 
 const urging = (row: ICustomerQuestionnaireInfo) => {
-  ElMessage.success(`满意度调查表 ${row.questionnaireNo} 填写消息已发送`)
+  remindWorker({ id: row.id }).then((res) => {
+    ElMessage.success(`满意度调查表 ${row.questionnaireNo} 填写消息已催办`)
+  })
 }
 
 watch(dateRangeSend, (val) => {
@@ -194,7 +196,8 @@
               <el-button size="small" type="primary" link @click="detail(row)">
                 详情
               </el-button>
-              <el-button v-if="row.writeStatus !== '已提交'" size="small" type="primary" link @click="urging(row)">
+              <!-- <el-button v-if="row.writeStatus !== '已提交'" size="small" type="primary" link @click="urging(row)"> -->
+              <el-button size="small" type="primary" link @click="urging(row)">
                 催办
               </el-button>
             </template>
diff --git a/src/views/resource/customer/situationReport/dialog/selectSuggestFormDialog.vue b/src/views/resource/customer/situationReport/dialog/selectSuggestFormDialog.vue
index 8fa636b..a491499 100644
--- a/src/views/resource/customer/situationReport/dialog/selectSuggestFormDialog.vue
+++ b/src/views/resource/customer/situationReport/dialog/selectSuggestFormDialog.vue
@@ -130,7 +130,7 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择委托方" width="65%">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择委托方意见登记表" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="clearList">
       <search-item width="162px">
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index a5508b4..9066757 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -456,7 +456,7 @@
     locationName: '', // 地点名称
     locationNo: '', // 地点编号
     labName: lab, // 所属实验室
-    limit: 20,
+    limit: 999999,
     offset: 1,
   }
   getLocationList(params).then((response) => {

diff --git a/src/api/resource/questionnaire.ts b/src/api/resource/questionnaire.ts
index f40c875..9e55dc7 100644
--- a/src/api/resource/questionnaire.ts
+++ b/src/api/resource/questionnaire.ts
@@ -17,3 +17,22 @@
     data,
   })
 }
+
+// 发送
+export function send(data: { ids: string[] }) {
+  return request({
+    url: `${prefix}/questionnaire/send`,
+    method: 'post',
+    data,
+  })
+}
+
+remindWorker
+// 催办
+export function remindWorker(data: { id: string }) {
+  return request({
+    url: `${prefix}/questionnaire/remindWorker`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/resource/common/filterConsumableCheck.vue b/src/views/resource/common/filterConsumableCheck.vue
new file mode 100644
index 0000000..14f6d0a
--- /dev/null
+++ b/src/views/resource/common/filterConsumableCheck.vue
@@ -0,0 +1,198 @@
+<!-- 选择物资验收记录 -->
+<script lang="ts" setup name="FilterConsumableCheck">
+import { ElMessage } from 'element-plus'
+import type { Ref } from 'vue'
+import { ref } from 'vue'
+import dayjs from 'dayjs'
+import type { DateModelType } from 'element-plus'
+import { getLocationList } from '@/api/business/taskMeasure/measureData'
+import { getGoodsCheckList } from '@/api/resource/supplierConsumable'
+import { getStaffList } from '@/api/resource/register'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { getCustomerInfoList } from '@/api/resource/customer'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  recordNo: '', // 记录单编号
+  createDept: '',
+  createUserName: '', // 创建人
+  acceptTimeStart: '', // 创建时间-起始
+  acceptTimeEnd: '', // 创建时间-结束
+  approvalStatus: '0', // 审批状态
+  formId: SCHEDULE.CHECK_MATERIAL_RECORD_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
+  offset: 1,
+  limit: 20,
+})
+// 多选选中的内容
+const checkoutList = ref([])
+const loadingTable = ref(false)
+const list = ref([]) // 表格数据
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '文件编号', value: 'recordNo', align: 'center', width: '200' },
+  { text: '物资名称', value: 'goodsName', align: 'center' },
+  { text: '规格型号', value: 'goodsModel', align: 'center' },
+  { text: '验收部门', value: 'createDept', align: 'center', width: '160' },
+  { text: '验收人', value: 'createUserName', align: 'center', width: '120' },
+  { text: '验收时间', value: 'createTime', align: 'center', width: '120' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '100' },
+])
+const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
+
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getGoodsCheckList(listQuery.value).then((response) => {
+    if (response.code === 200) {
+      list.value = response.data.rows.map((item: any) => {
+        return {
+          ...item,
+          createTime: item.createTime!.length > 16 ? item.createTime!.substring(0, 10) : '',
+        }
+      })
+      total.value = parseInt(response.data.total)
+    }
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
+}
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    recordNo: '', // 记录单编号
+    createDept: '',
+    createUserName: '', // 创建人
+    acceptTimeStart: '', // 创建时间-起始
+    acceptTimeEnd: '', // 创建时间-结束
+    approvalStatus: '0', // 审批状态
+    formId: SCHEDULE.CHECK_MATERIAL_RECORD_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
+    offset: 1,
+    limit: 20,
+  }
+  dateRange.value = ['', '']
+  fetchData()
+}
+// 搜索
+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
+  }
+  search()
+}
+// 点击确定
+const confirmSelect = (row: any) => {
+  emits('confirm', [row])
+  dialogFormVisible.value = false
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData()
+}
+
+watch(dateRange, (val) => {
+  if (val) {
+    listQuery.value.acceptTimeStart = dayjs(val[0]).format('YYYY-MM-DD') === 'Invalid Date' ? '' : dayjs(val[0]).format('YYYY-MM-DD')
+    listQuery.value.acceptTimeEnd = dayjs(val[1]).format('YYYY-MM-DD') === 'Invalid Date' ? '' : dayjs(val[1]).format('YYYY-MM-DD')
+  }
+  else {
+    listQuery.value.acceptTimeStart = ''
+    listQuery.value.acceptTimeEnd = ''
+  }
+})
+
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择工作间" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input v-model="listQuery.recordNo" placeholder="文件编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.createDept" placeholder="验收部门" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.createUserName" placeholder="验收人" clearable />
+      </search-item>
+      <search-item>
+        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="验收时间（开始）" end-placeholder="验收时间（结束）" />
+      </search-item>
+    </search-area>
+
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        :height="520"
+        :is-show-single-select-button="true"
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column fixed="right" label="操作" align="center" width="130">
+            <template #default="{ row }">
+              <el-button size="small" type="primary" @click="confirmSelect(row)">
+                选定
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <!-- <el-button type="primary" @click="confirmSelect">确认</el-button> -->
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/resource/common/filterCustomerStaff.vue b/src/views/resource/common/filterCustomerStaff.vue
index 610bf51..fd40e61 100644
--- a/src/views/resource/common/filterCustomerStaff.vue
+++ b/src/views/resource/common/filterCustomerStaff.vue
@@ -1,5 +1,6 @@
 <!-- 筛选系统用户弹窗 -->
 <script name="FilterCustomerStaff" lang="ts" setup>
+import { ElMessage } from 'element-plus'
 import type { ICustomerFilter, ICustomerTree } from './common-interface'
 import type { ICustomerInfo } from '@/views/resource/customer/info/customer-info'
 import type { IlistQueryType } from '@/views/system/user/user-interface'
@@ -7,11 +8,15 @@
 import { getCustomerInfoList } from '@/api/resource/customer'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 
-defineProps({
+const props = defineProps({
   title: {
     type: String,
     default: '请选择',
   },
+  isMulti: { // 是否多选
+    type: Boolean,
+    default: false,
+  },
 })
 
 const emit = defineEmits(['recordSelected'])
@@ -20,9 +25,10 @@
   children: 'children',
   label: 'customerName',
 }
-
+const tableLoading = ref(false)
 // 定义变量
 const customerIdSelected = ref<string>('')
+const customerDeptIdSelected = ref<string>('')
 const customerNameSelected = ref<string>('')
 const disabledCustomerName = ref(false) // 委托方筛选是否禁用
 const getCustomerName = ref('') // 委托方
@@ -44,7 +50,9 @@
   endTime: '',
   deptType: '',
 })
+const tableRef = ref()
 const sysUserList = ref([])
+const checkoutList = ref([]) // 多选
 const total = ref<number>(0) // 数据总条数
 const columns = ref <Array<TableColumn>>([
   { text: '账号', value: 'account', align: 'center' },
@@ -53,9 +61,13 @@
 ]) // 表头
 
 const customerTree = ref<Array<ICustomerTree>>([])
-
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
 // 查询用户列表
 const getSysUserList = () => {
+  tableLoading.value = true
   getAllUserList(sysUserQuery.value).then((res) => {
     if (res.code === 200) {
       sysUserList.value = res.data.rows.map((item: any) => {
@@ -63,10 +75,12 @@
           ...item,
           customerId: customerIdSelected.value,
           customerName: customerNameSelected.value,
+          customerDeptId: customerDeptIdSelected,
         }
       })
       total.value = Number(res.data.total)
     }
+    tableLoading.value = false
   })
 }
 
@@ -101,17 +115,25 @@
 
   // 赋值选中的委托方
   customerIdSelected.value = data.id
+  customerDeptIdSelected.value = data.deptId
   customerNameSelected.value = data.customerName
 
   getSysUserList()
 }
 
-// 选中用户
+// 单选选定
 const selectSingleUser = (row: Object) => {
   emit('recordSelected', row)
 }
 
-const showOrHideFilterDialog = (show: boolean, customerName = '', disabledCustomerNameParam = false) => {
+/**
+ * 弹窗显隐
+ * @param show 控制弹窗显隐
+ * @param customerName 委托方名称
+ * @param disabledCustomerNameParam 禁止修改委托方名称
+ * @param writerNames 委托方意见登记表--[]则清空原有的多选
+ */
+const showOrHideFilterDialog = (show: boolean, customerName = '', disabledCustomerNameParam = false, writerNames = []) => {
   if (show === false) {
     customerQuery.value.customerName = ''
     customerQuery.value.approvalStatus = '0'
@@ -136,6 +158,21 @@
   }
 
   showFilterDialog.value = show
+
+  if (!writerNames.length && show && tableRef.value) {
+    console.log('清除多选')
+    tableRef.value.clearMulti()
+  }
+}
+
+// 多选确定
+const submitEquipmentSelected = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('至少选中一条数据')
+    return false
+  }
+  emit('recordSelected', checkoutList.value)
+  showOrHideFilterDialog(false)
 }
 
 defineExpose({
@@ -176,13 +213,18 @@
         </search-area>
 
         <!-- 表格数据展示 -->
-        <table-container :title-show="false">
+        <table-container v-loading="tableLoading" :title-show="false">
           <!-- 表格区域 -->
           <normal-table
             id="sysUserFilter"
+            ref="tableRef"
             :data="sysUserList" :total="total" :columns="columns"
             :query="{ limit: sysUserQuery.limit, offset: sysUserQuery.offset }"
+            is-showmulti-select
+            :is-multi="isMulti"
+            :height="520"
             @change="changePage"
+            @multi-select="handleSelectionChange"
           >
             <template #preColumns>
               <el-table-column label="序号" width="55" align="center">
@@ -191,7 +233,7 @@
                 </template>
               </el-table-column>
             </template>
-            <template #columns>
+            <template v-if="!props.isMulti" #columns>
               <el-table-column fixed="right" label="操作" align="center" width="130">
                 <template #default="{ row }">
                   <el-button size="small" type="primary" @click="selectSingleUser(row)">
@@ -204,6 +246,15 @@
         </table-container>
       </div>
     </div>
+    <!-- 多选 -->
+    <template v-if="props.isMulti" #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitEquipmentSelected">
+          确定
+        </el-button>
+        <el-button @click="showOrHideFilterDialog(false)">取消</el-button>
+      </span>
+    </template>
   </el-dialog>
 </template>
 
diff --git a/src/views/resource/common/filterSysUser.vue b/src/views/resource/common/filterSysUser.vue
index 71ec72d..4efa44f 100644
--- a/src/views/resource/common/filterSysUser.vue
+++ b/src/views/resource/common/filterSysUser.vue
@@ -1,7 +1,8 @@
 <!-- 筛选系统用户弹窗 -->
 <script name="FilterSysUser" lang="ts" setup>
+import { ElMessage } from 'element-plus'
 import type { IlistQueryType, addInfo } from '@/views/system/user/user-interface'
-import { getUserList } from '@/api/system/user'
+import { getAllUserList } from '@/api/system/user'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
 
@@ -11,6 +12,10 @@
     type: Boolean,
     default: true,
   },
+  isMulti: { // 是否多选
+    type: Boolean,
+    default: false,
+  },
 })
 const emit = defineEmits(['recordSelected'])
 const tableLoading = ref(false)
@@ -28,6 +33,7 @@
 })
 const pid = ref<string>('')
 const sysUserList = ref<Array<addInfo>>([])
+const checkoutList = ref<Array<addInfo>>([]) // 多选
 const total = ref<number>(0) // 数据总条数
 const columns = ref <Array<TableColumn>>([
   { text: '账号', value: 'account', align: 'center' },
@@ -35,7 +41,10 @@
   { text: '部门', value: 'deptName', align: 'center' },
   { text: '人员类别', value: 'avatarName', align: 'center' },
 ]) // 表头
-
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
 const staffTypeMap = ref({}) as any// 人员类别
 // 获取字典
 const fetchDict = async () => {
@@ -48,7 +57,7 @@
 
 const getSysUserList = () => {
   tableLoading.value = true
-  getUserList(searchQuery).then((res) => {
+  getAllUserList(searchQuery).then((res) => {
     if (res.code === 200) {
       sysUserList.value = res.data.rows.map((item: { avatar: string }) => {
         return {
@@ -62,6 +71,19 @@
   })
 }
 
+// 重置
+const reset = () => {
+  searchQuery.keywords = ''
+  searchQuery.deptId = ''
+  searchQuery.offset = 1
+  searchQuery.limit = 20
+  searchQuery.sort = ''
+  searchQuery.beginTime = ''
+  searchQuery.endTime = ''
+  searchQuery.deptType = ''
+  getSysUserList()
+}
+
 // 逻辑
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -73,10 +95,12 @@
   getSysUserList()
 }
 
+// 单选确定
 const selectSingleUser = (row: addInfo) => {
   emit('recordSelected', row)
 }
 
+// 取消
 const showOrHideFilterDialog = (show: boolean, deptId = '') => {
   if (show === false) {
     searchQuery.keywords = ''
@@ -95,6 +119,16 @@
   showFilterDialog.value = show
 }
 
+// 多选确定
+const submitEquipmentSelected = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('至少选中一条数据')
+    return false
+  }
+  emit('recordSelected', checkoutList.value)
+  showOrHideFilterDialog(false)
+}
+
 defineExpose({
   showOrHideFilterDialog,
 })
@@ -102,7 +136,7 @@
 
 <template>
   <el-dialog v-model="showFilterDialog" title="选择用户" :append-to-body="true" :close-on-click-modal="false" top="10vh">
-    <search-area :need-clear="false" @search="getSysUserList">
+    <search-area :need-clear="true" @search="getSysUserList" @clear="reset">
       <search-item>
         <el-input v-model="searchQuery.keywords" placeholder="姓名" clearable />
       </search-item>
@@ -119,7 +153,11 @@
         v-loading="tableLoading" :data="sysUserList" :total="total"
         :columns="columns"
         :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+        is-showmulti-select
+        :is-multi="isMulti"
+        :height="520"
         @change="changePage"
+        @multi-select="handleSelectionChange"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
@@ -128,7 +166,8 @@
             </template>
           </el-table-column>
         </template>
-        <template #columns>
+        <!-- 单选 -->
+        <template v-if="!props.isMulti" #columns>
           <el-table-column fixed="right" label="操作" align="center" width="130">
             <template #default="{ row }">
               <el-button size="small" type="primary" @click="selectSingleUser(row)">
@@ -139,5 +178,14 @@
         </template>
       </normal-table>
     </table-container>
+    <!-- 多选 -->
+    <template v-if="props.isMulti" #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitEquipmentSelected">
+          确定
+        </el-button>
+        <el-button @click="showOrHideFilterDialog(false)">取消</el-button>
+      </span>
+    </template>
   </el-dialog>
 </template>
diff --git a/src/views/resource/customer/questionnaire/customer-questionnaire.ts b/src/views/resource/customer/questionnaire/customer-questionnaire.ts
index 7391891..a3b40fc 100644
--- a/src/views/resource/customer/questionnaire/customer-questionnaire.ts
+++ b/src/views/resource/customer/questionnaire/customer-questionnaire.ts
@@ -39,6 +39,8 @@
   itemTen: string
   score?: string
   [key: string]: string | undefined
+  sendFlag: string // 是否已发送（1/2）
+  sendFlagName: string // 是否已发送（1/2）
 }
 
 export interface ICustomerRateColumn {
diff --git a/src/views/resource/customer/questionnaire/detail.vue b/src/views/resource/customer/questionnaire/detail.vue
index 6560afd..553ebb4 100644
--- a/src/views/resource/customer/questionnaire/detail.vue
+++ b/src/views/resource/customer/questionnaire/detail.vue
@@ -1,12 +1,14 @@
 <!-- 委托方满意度调查表详情 -->
 <script name="QuestionnaireDetail" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
-import type{ ICustomerQuestionnaireInfo, ICustomerRateColumn } from './customer-questionnaire'
+import type { ICustomerQuestionnaireInfo, ICustomerRateColumn } from './customer-questionnaire'
 import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
 import useUserStore from '@/store/modules/user'
-import { addQuestionnaire } from '@/api/resource/questionnaire'
+import FilterSysUser from '@/views/resource/common/filterSysUser.vue'
+import { addQuestionnaire, send } from '@/api/resource/questionnaire'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import { getDictByCode } from '@/api/system/dict'
+import { uniqueArray } from '@/utils/Array'
 
 // 从路由中传过来的参数
 const type = ref<string>('')
@@ -18,7 +20,7 @@
 
 const questionnaireFormRef = ref()
 const refFilterCustomer = ref()
-
+const sendIds = ref<string[]>([]) // 发送的参数
 const questionnaireInfo = ref<ICustomerQuestionnaireInfo>({
   id: '',
   customerId: '',
@@ -31,8 +33,8 @@
   senderId: '',
   senderName: '',
   sendTime: '',
-  writerId: '',
-  writerName: '',
+  writerId: '', // 填写人id（单选用-新建不让传）
+  writerName: '', // 填写人名字(多选时候-新建不让传)
   writeTime: '',
   writeStatus: '',
   itemOne: '',
@@ -45,12 +47,15 @@
   itemEight: '',
   itemNine: '',
   itemTen: '',
+
+  sendFlag: '', // 是否已发送（1/2）
+  sendFlagName: '', // 是否已发送（1/2）
 })
 
 const questionnaireFormRules = ref({
-  labCode: [{ required: true, message: '实验室不能为空，请选择', trigger: ['change', 'blur'] }],
-  customerId: [{ required: true, message: '填写单位不能为空，请选择', trigger: 'change' }],
-  writerId: [{ required: true, message: '填写人不能为空，请选择', trigger: 'change' }],
+  labCode: [{ required: true, message: '实验室不能为空', trigger: ['change', 'blur'] }],
+  customerId: [{ required: true, message: '填写单位不能为空', trigger: 'change' }],
+  writerName: [{ required: true, message: '填写人不能为空', trigger: 'change' }],
 }) // 表单验证规则
 
 // 字典值
@@ -71,28 +76,43 @@
   { index: 10, text: '10、对所提供的计量保障是否满意', value: 0, attributeName: 'itemTen' },
 ])
 
-// 逻辑
-
-// 显示筛选填写用户和单位的弹窗
+// ---------------------------------------------多选填写人----------------------------------------------
+const writerNames = ref<{ customerId: string; writerId: string }[]>([]) // 选择的填写人数组
+// 点击选择填写人
 const showFilterCustomerDialog = () => {
-  refFilterCustomer.value.showOrHideFilterDialog(true)
+  refFilterCustomer.value.showOrHideFilterDialog(true, '', false, writerNames.value)
 }
 
-// 返回选定结果
-const recordSelectedHandler = (row: any) => {
+// 选定填写人
+const recordSelectedHandler = (list: any) => {
   refFilterCustomer.value.showOrHideFilterDialog(false)
-
-  if (row.id !== '') {
-    questionnaireInfo.value.customerId = row.customerId
-    questionnaireInfo.value.customerName = row.customerName
-    questionnaireInfo.value.writerId = row.id
-    questionnaireInfo.value.writerName = row.name
+  if (list && list.length) {
+    writerNames.value = list.map((item: { customerDeptId: string; id: string }) => {
+      return {
+        customerId: item.customerDeptId,
+        writerId: item.id,
+      }
+    })
+    questionnaireInfo.value.writerName = list.map((item: { name: string }) => item.name).join(',')
+    // 填写单位
+    questionnaireInfo.value.customerName = uniqueArray(list.map((item: { customerName: string }) => item.customerName)).join(',')
+    questionnaireInfo.value.customerId = uniqueArray(list.map((item: { customerDeptId: string }) => item.customerDeptId)).join(',')
   }
   else {
     ElMessage.error('填写单位和填写人不能为空，请重新选择')
   }
 }
 
+// 清空填写人
+const clean = () => {
+  questionnaireInfo.value.writerName = ''
+  questionnaireInfo.value.customerName = ''
+  questionnaireInfo.value.customerId = ''
+  writerNames.value = []
+}
+
+// ---------------------------------------------------------------------------------------------------
+
 // 保存
 const saveQuestionnaireInfo = () => {
   let satisfactionStr = ''
@@ -109,19 +129,29 @@
     if (satisfactionStr.length === 10) {
       questionnaireInfo.value.writeTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 填写时间为当前时间
     }
-
+    const params = {
+      ...questionnaireInfo.value,
+      writerId: null, // 填写人id（单选用-多选时候新建不让传）
+      writerName: null, // 填写人名字(多选时候-新建不让传)
+      sendFlag: '2', // 是否已发送（1/2）
+      sendFlagName: '未发送', // 是否已发送（1/2）
+      customerName: null,
+      customerId: null,
+      sendDTOs: writerNames.value, // 填写人信息
+    }
     // 提交接口
-    addQuestionnaire(questionnaireInfo.value).then((res) => {
+    addQuestionnaire(params).then((res) => {
       if (res.code === 200) {
       // 提示保存成功
-        ElMessage.success('委托方满意度调查表创建并发送成功')
+        ElMessage.success('委托方满意度调查表创建成功')
 
         // 设置返回的委托方id和委托方编号
-        questionnaireInfo.value.questionnaireNo = res.data.questionnaireNo
-        questionnaireInfo.value.id = res.data.id
-        id.value = res.data.id
+        // questionnaireInfo.value.questionnaireNo = res.data.questionnaireNo
+        // questionnaireInfo.value.id = res.data.id
+        // id.value = res.data.id
 
         type.value = 'detail'
+        sendIds.value = res.data
       }
       else {
       // 提示失败信息
@@ -193,6 +223,18 @@
   router.go(-1)
 }
 
+// 点击发送
+const handleSend = () => {
+  if (sendIds && sendIds.value.length) {
+    send({ ids: sendIds.value }).then((res) => {
+      ElMessage.success('发送成功')
+    })
+  }
+  else {
+    ElMessage.warning('没有发送的单位或个人')
+  }
+}
+
 const initDialog = (params: any) => {
   // 从路由中获取参数
   type.value = params.type
@@ -205,7 +247,8 @@
       questionnaireInfo.value.senderId = userInfo.id
       questionnaireInfo.value.senderName = userInfo.name
       questionnaireInfo.value.sendTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
-
+      questionnaireInfo.value.labCode = userInfo.bizLabCode // 实验室代码
+      questionnaireInfo.value.labCodeName = userInfo.labCodeName // 实验室名称
       break
 
     case 'detail':
@@ -275,6 +318,9 @@
     <el-form ref="questionnaireFormRef" :model="questionnaireInfo" :rules="questionnaireFormRules" label-position="right" label-width="110px" border stripe>
       <detail-page title="委托方满意度调查表">
         <template #btns>
+          <el-button v-if="type === 'detail'" type="primary" @click="handleSend">
+            发送
+          </el-button>
           <el-button v-if="type !== 'detail'" type="primary" @click="saveButtonHandler">
             保存
           </el-button>
@@ -284,7 +330,6 @@
         </template>
 
         <el-row :gutter="24">
-          <!-- 第一行 第一列 -->
           <el-col :span="6">
             <el-form-item label="实验室" prop="labCode">
               <el-select v-model="questionnaireInfo.labCode" placeholder="请选择实验室" :disabled="type === 'detail'" style="width: 100%;">
@@ -292,46 +337,52 @@
               </el-select>
               <el-input v-model="questionnaireInfo.labCodeName" type="hidden" />
             </el-form-item>
-
-            <el-form-item label="填写单位" prop="customerId">
-              <el-input v-model="questionnaireInfo.customerName" :disabled="true" placeholder="选择填写人时自动填充" />
-              <el-input v-model="questionnaireInfo.customerId" type="hidden" />
-            </el-form-item>
           </el-col>
-
           <el-col :span="6">
             <el-form-item label="文件编号">
-              <el-input v-model="questionnaireInfo.questionnaireNo" placeholder="文件编号，保存后自动生成" :disabled="true" />
-            </el-form-item>
-
-            <el-form-item label="填写人" prop="writerId">
-              <el-input v-model="questionnaireInfo.writerName" :readonly="true" :disabled="true">
-                <template #append>
-                  <el-button size="small" :disabled="type === 'detail'" @click="showFilterCustomerDialog">
-                    选择
-                  </el-button>
-                </template>
-              </el-input>
-              <el-input v-model="questionnaireInfo.writerId" type="hidden" />
+              <el-input v-model="questionnaireInfo.questionnaireNo" placeholder="系统自动生成" :disabled="true" />
             </el-form-item>
           </el-col>
-
           <el-col :span="6">
             <el-form-item label="发送人">
               <el-input v-model="questionnaireInfo.senderName" :disabled="true" />
               <el-input v-model="questionnaireInfo.senderId" type="hidden" />
             </el-form-item>
-
-            <el-form-item label="填写时间">
-              <el-input v-model="questionnaireInfo.writeTime" :disabled="true" />
-            </el-form-item>
           </el-col>
-
           <el-col :span="6">
             <el-form-item label="发送时间">
               <el-input v-model="questionnaireInfo.sendTime" placeholder="保存后自动生成" :disabled="true" />
             </el-form-item>
           </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="填写人" prop="writerName" style="display: flex;">
+              <el-button size="small" type="primary" :disabled="type === 'detail'" @click="showFilterCustomerDialog">
+                {{ questionnaireInfo.writerName ? '继续添加' : '添加' }}
+              </el-button>
+              <el-button size="small" type="info" :disabled="type === 'detail'" @click="clean">
+                清空
+              </el-button>
+              <el-input v-model="questionnaireInfo.writerName" placeholder="请添加填写人" style="margin-top: 8px;" :readonly="true" :disabled="true" type="textarea" autosize>
+                <!-- <template #append>
+                  <el-button size="small" :disabled="type === 'detail'" @click="showFilterCustomerDialog">
+                    选择
+                  </el-button>
+                </template> -->
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="填写单位" prop="customerId">
+              <el-input v-model="questionnaireInfo.customerName" type="textarea" :autosize="{ minRows: 3 }" :disabled="true" placeholder="选择填写人时自动填充" />
+              <el-input v-model="questionnaireInfo.customerId" type="hidden" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="填写时间">
+              <el-input v-model="questionnaireInfo.writeTime" :disabled="true" />
+            </el-form-item>
+          </el-col>
         </el-row>
       </detail-page>
 
@@ -350,8 +401,8 @@
         </el-row>
       </table-container>
     </el-form>
-
-    <filter-customer-staff ref="refFilterCustomer" title="请选择填写单位和填写人" @record-selected="recordSelectedHandler" />
+    <!-- 单选填写人--先选委托方，再去选委托方下面的人 -->
+    <filter-customer-staff ref="refFilterCustomer" :is-multi="true" title="请选择填写单位和填写人" @record-selected="recordSelectedHandler" />
   </app-container>
 </template>
 
diff --git a/src/views/resource/customer/questionnaire/list.vue b/src/views/resource/customer/questionnaire/list.vue
index a2306ff..553e5f3 100644
--- a/src/views/resource/customer/questionnaire/list.vue
+++ b/src/views/resource/customer/questionnaire/list.vue
@@ -2,9 +2,9 @@
 <script name="QuestionnaireList" lang="ts" setup>
 import { ElMessage, dayjs } from 'element-plus'
 import type { DateModelType } from 'element-plus'
-import type{ ICustomerQuestionnaireInfo, IListQuery } from './customer-questionnaire'
+import type { ICustomerQuestionnaireInfo, IListQuery } from './customer-questionnaire'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getQuestionnaireList } from '@/api/resource/questionnaire'
+import { getQuestionnaireList, remindWorker } from '@/api/resource/questionnaire'
 
 const { proxy } = getCurrentInstance() as any
 const router = useRouter()
@@ -118,7 +118,9 @@
 }
 
 const urging = (row: ICustomerQuestionnaireInfo) => {
-  ElMessage.success(`满意度调查表 ${row.questionnaireNo} 填写消息已发送`)
+  remindWorker({ id: row.id }).then((res) => {
+    ElMessage.success(`满意度调查表 ${row.questionnaireNo} 填写消息已催办`)
+  })
 }
 
 watch(dateRangeSend, (val) => {
@@ -194,7 +196,8 @@
               <el-button size="small" type="primary" link @click="detail(row)">
                 详情
               </el-button>
-              <el-button v-if="row.writeStatus !== '已提交'" size="small" type="primary" link @click="urging(row)">
+              <!-- <el-button v-if="row.writeStatus !== '已提交'" size="small" type="primary" link @click="urging(row)"> -->
+              <el-button size="small" type="primary" link @click="urging(row)">
                 催办
               </el-button>
             </template>
diff --git a/src/views/resource/customer/situationReport/dialog/selectSuggestFormDialog.vue b/src/views/resource/customer/situationReport/dialog/selectSuggestFormDialog.vue
index 8fa636b..a491499 100644
--- a/src/views/resource/customer/situationReport/dialog/selectSuggestFormDialog.vue
+++ b/src/views/resource/customer/situationReport/dialog/selectSuggestFormDialog.vue
@@ -130,7 +130,7 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择委托方" width="65%">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择委托方意见登记表" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="clearList">
       <search-item width="162px">
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index a5508b4..9066757 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -456,7 +456,7 @@
     locationName: '', // 地点名称
     locationNo: '', // 地点编号
     labName: lab, // 所属实验室
-    limit: 20,
+    limit: 999999,
     offset: 1,
   }
   getLocationList(params).then((response) => {
diff --git a/src/views/resource/environment/voltage/edit.vue b/src/views/resource/environment/voltage/edit.vue
index b8a9290..ad03b80 100644
--- a/src/views/resource/environment/voltage/edit.vue
+++ b/src/views/resource/environment/voltage/edit.vue
@@ -58,6 +58,8 @@
 
   testUseEquipment: '', //	测试所用设备
   testUseEquipmentId: '', //		测试所用设备id
+  model: '', // 型号
+  manufactureNo: '', // 出厂编号
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
   groupCode: '', // 部门
@@ -417,6 +419,8 @@
   if (list && list.length) {
     recordForm.value.testUseEquipment = list[0].equipmentName //	测试所用设备
     recordForm.value.testUseEquipmentId = list[0].id //		测试所用设备id
+    recordForm.value.model = list[0].model //		型号
+    recordForm.value.manufactureNo = list[0].manufactureNo //		出厂编号
   }
 }
 
@@ -463,8 +467,7 @@
   // 从路由中获取参数
   type.value = params.type
   id.value = params.id !== undefined ? params.id : ''
-  status.value = params.status !== undefined ? params.status : ''
-
+  status.value = params.status
   // 默认显示第一个tab内容
   current.value = radioItems.value[0].value
   currentLabel.value = radioItems.value[0].name
@@ -517,7 +520,6 @@
     if (radioItems.value[radioItems.value.length - 1].value === 'voltage-approval') {
       radioItems.value.pop()
     }
-    console.log(radioItems.value)
   }
   else { // 非全部和草稿箱把审批详情加上
     if (radioItems.value[radioItems.value.length - 1].value !== 'voltage-approval') {
@@ -541,7 +543,7 @@
     locationName: '', // 地点名称
     locationNo: '', // 地点编号
     labName: lab, // 所属实验室
-    limit: 20,
+    limit: 999999,
     offset: 1,
   }
   getLocationList(params).then((response) => {
@@ -618,6 +620,20 @@
       <detail-block v-if="current === 'voltage-basic'">
         <el-row :gutter="24">
           <el-col :span="6">
+            <el-form-item label="实验室" prop="labCode">
+              <el-select v-model="recordForm.labCode" placeholder="请选择实验室" :disabled="type === 'detail'" style="width: 100%;" @change="changeLab">
+                <el-option v-for="dict in labCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="recordForm.groupCode" placeholder="请选择部门" :disabled="type === 'detail'" style="width: 100%;">
+                <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="记录编号">
               <el-input v-model="recordForm.recordNo" placeholder="系统自动生成" :disabled="true" />
             </el-form-item>
@@ -651,7 +667,7 @@
             <el-form-item label="测试地点" prop="testLocation">
               <!-- <el-input v-model="recordForm.testLocation" :placeholder="type === 'detail' ? ' ' : '请输入测试地点'" :disabled="type === 'detail'" /> -->
               <el-autocomplete
-                v-model="detailRequire.testLocation"
+                v-model="recordForm.testLocation"
                 :fetch-suggestions="querySearchTestLocation"
                 placeholder="工作间名称"
                 clearable
@@ -669,27 +685,22 @@
               </el-input>
             </el-form-item>
           </el-col>
-
           <el-col :span="6">
+            <el-form-item label="型号" prop="model">
+              <el-input v-model="recordForm.model" :placeholder="type === 'detail' ? ' ' : '型号'" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号" prop="manufactureNo">
+              <el-input v-model="recordForm.manufactureNo" :placeholder="type === 'detail' ? ' ' : '出厂编号'" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
             <el-form-item label="测试依据" prop="testBasis">
               <el-input v-model="recordForm.testBasis" :placeholder="type === 'detail' ? ' ' : '请输入测试依据'" :disabled="type === 'detail'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="实验室" prop="labCode">
-              <el-select v-model="recordForm.labCode" placeholder="请选择实验室" :disabled="type === 'detail'" style="width: 100%;" @change="changeLab">
-                <el-option v-for="dict in labCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="recordForm.groupCode" placeholder="请选择部门" :disabled="type === 'detail'" style="width: 100%;">
-                <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="电源电压空载(V)" prop="powerVoltageNoLoad">
               <el-input v-model="recordForm.powerVoltageNoLoad" :placeholder="type === 'detail' ? ' ' : '请输入电源电压空载'" :disabled="type === 'detail'" />
             </el-form-item>

diff --git a/src/api/resource/questionnaire.ts b/src/api/resource/questionnaire.ts
index f40c875..9e55dc7 100644
--- a/src/api/resource/questionnaire.ts
+++ b/src/api/resource/questionnaire.ts
@@ -17,3 +17,22 @@
     data,
   })
 }
+
+// 发送
+export function send(data: { ids: string[] }) {
+  return request({
+    url: `${prefix}/questionnaire/send`,
+    method: 'post',
+    data,
+  })
+}
+
+remindWorker
+// 催办
+export function remindWorker(data: { id: string }) {
+  return request({
+    url: `${prefix}/questionnaire/remindWorker`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/resource/common/filterConsumableCheck.vue b/src/views/resource/common/filterConsumableCheck.vue
new file mode 100644
index 0000000..14f6d0a
--- /dev/null
+++ b/src/views/resource/common/filterConsumableCheck.vue
@@ -0,0 +1,198 @@
+<!-- 选择物资验收记录 -->
+<script lang="ts" setup name="FilterConsumableCheck">
+import { ElMessage } from 'element-plus'
+import type { Ref } from 'vue'
+import { ref } from 'vue'
+import dayjs from 'dayjs'
+import type { DateModelType } from 'element-plus'
+import { getLocationList } from '@/api/business/taskMeasure/measureData'
+import { getGoodsCheckList } from '@/api/resource/supplierConsumable'
+import { getStaffList } from '@/api/resource/register'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { getCustomerInfoList } from '@/api/resource/customer'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  recordNo: '', // 记录单编号
+  createDept: '',
+  createUserName: '', // 创建人
+  acceptTimeStart: '', // 创建时间-起始
+  acceptTimeEnd: '', // 创建时间-结束
+  approvalStatus: '0', // 审批状态
+  formId: SCHEDULE.CHECK_MATERIAL_RECORD_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
+  offset: 1,
+  limit: 20,
+})
+// 多选选中的内容
+const checkoutList = ref([])
+const loadingTable = ref(false)
+const list = ref([]) // 表格数据
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '文件编号', value: 'recordNo', align: 'center', width: '200' },
+  { text: '物资名称', value: 'goodsName', align: 'center' },
+  { text: '规格型号', value: 'goodsModel', align: 'center' },
+  { text: '验收部门', value: 'createDept', align: 'center', width: '160' },
+  { text: '验收人', value: 'createUserName', align: 'center', width: '120' },
+  { text: '验收时间', value: 'createTime', align: 'center', width: '120' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '100' },
+])
+const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
+
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getGoodsCheckList(listQuery.value).then((response) => {
+    if (response.code === 200) {
+      list.value = response.data.rows.map((item: any) => {
+        return {
+          ...item,
+          createTime: item.createTime!.length > 16 ? item.createTime!.substring(0, 10) : '',
+        }
+      })
+      total.value = parseInt(response.data.total)
+    }
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
+}
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    recordNo: '', // 记录单编号
+    createDept: '',
+    createUserName: '', // 创建人
+    acceptTimeStart: '', // 创建时间-起始
+    acceptTimeEnd: '', // 创建时间-结束
+    approvalStatus: '0', // 审批状态
+    formId: SCHEDULE.CHECK_MATERIAL_RECORD_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
+    offset: 1,
+    limit: 20,
+  }
+  dateRange.value = ['', '']
+  fetchData()
+}
+// 搜索
+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
+  }
+  search()
+}
+// 点击确定
+const confirmSelect = (row: any) => {
+  emits('confirm', [row])
+  dialogFormVisible.value = false
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData()
+}
+
+watch(dateRange, (val) => {
+  if (val) {
+    listQuery.value.acceptTimeStart = dayjs(val[0]).format('YYYY-MM-DD') === 'Invalid Date' ? '' : dayjs(val[0]).format('YYYY-MM-DD')
+    listQuery.value.acceptTimeEnd = dayjs(val[1]).format('YYYY-MM-DD') === 'Invalid Date' ? '' : dayjs(val[1]).format('YYYY-MM-DD')
+  }
+  else {
+    listQuery.value.acceptTimeStart = ''
+    listQuery.value.acceptTimeEnd = ''
+  }
+})
+
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择工作间" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input v-model="listQuery.recordNo" placeholder="文件编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.createDept" placeholder="验收部门" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.createUserName" placeholder="验收人" clearable />
+      </search-item>
+      <search-item>
+        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="验收时间（开始）" end-placeholder="验收时间（结束）" />
+      </search-item>
+    </search-area>
+
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        :height="520"
+        :is-show-single-select-button="true"
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column fixed="right" label="操作" align="center" width="130">
+            <template #default="{ row }">
+              <el-button size="small" type="primary" @click="confirmSelect(row)">
+                选定
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <!-- <el-button type="primary" @click="confirmSelect">确认</el-button> -->
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/resource/common/filterCustomerStaff.vue b/src/views/resource/common/filterCustomerStaff.vue
index 610bf51..fd40e61 100644
--- a/src/views/resource/common/filterCustomerStaff.vue
+++ b/src/views/resource/common/filterCustomerStaff.vue
@@ -1,5 +1,6 @@
 <!-- 筛选系统用户弹窗 -->
 <script name="FilterCustomerStaff" lang="ts" setup>
+import { ElMessage } from 'element-plus'
 import type { ICustomerFilter, ICustomerTree } from './common-interface'
 import type { ICustomerInfo } from '@/views/resource/customer/info/customer-info'
 import type { IlistQueryType } from '@/views/system/user/user-interface'
@@ -7,11 +8,15 @@
 import { getCustomerInfoList } from '@/api/resource/customer'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 
-defineProps({
+const props = defineProps({
   title: {
     type: String,
     default: '请选择',
   },
+  isMulti: { // 是否多选
+    type: Boolean,
+    default: false,
+  },
 })
 
 const emit = defineEmits(['recordSelected'])
@@ -20,9 +25,10 @@
   children: 'children',
   label: 'customerName',
 }
-
+const tableLoading = ref(false)
 // 定义变量
 const customerIdSelected = ref<string>('')
+const customerDeptIdSelected = ref<string>('')
 const customerNameSelected = ref<string>('')
 const disabledCustomerName = ref(false) // 委托方筛选是否禁用
 const getCustomerName = ref('') // 委托方
@@ -44,7 +50,9 @@
   endTime: '',
   deptType: '',
 })
+const tableRef = ref()
 const sysUserList = ref([])
+const checkoutList = ref([]) // 多选
 const total = ref<number>(0) // 数据总条数
 const columns = ref <Array<TableColumn>>([
   { text: '账号', value: 'account', align: 'center' },
@@ -53,9 +61,13 @@
 ]) // 表头
 
 const customerTree = ref<Array<ICustomerTree>>([])
-
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
 // 查询用户列表
 const getSysUserList = () => {
+  tableLoading.value = true
   getAllUserList(sysUserQuery.value).then((res) => {
     if (res.code === 200) {
       sysUserList.value = res.data.rows.map((item: any) => {
@@ -63,10 +75,12 @@
           ...item,
           customerId: customerIdSelected.value,
           customerName: customerNameSelected.value,
+          customerDeptId: customerDeptIdSelected,
         }
       })
       total.value = Number(res.data.total)
     }
+    tableLoading.value = false
   })
 }
 
@@ -101,17 +115,25 @@
 
   // 赋值选中的委托方
   customerIdSelected.value = data.id
+  customerDeptIdSelected.value = data.deptId
   customerNameSelected.value = data.customerName
 
   getSysUserList()
 }
 
-// 选中用户
+// 单选选定
 const selectSingleUser = (row: Object) => {
   emit('recordSelected', row)
 }
 
-const showOrHideFilterDialog = (show: boolean, customerName = '', disabledCustomerNameParam = false) => {
+/**
+ * 弹窗显隐
+ * @param show 控制弹窗显隐
+ * @param customerName 委托方名称
+ * @param disabledCustomerNameParam 禁止修改委托方名称
+ * @param writerNames 委托方意见登记表--[]则清空原有的多选
+ */
+const showOrHideFilterDialog = (show: boolean, customerName = '', disabledCustomerNameParam = false, writerNames = []) => {
   if (show === false) {
     customerQuery.value.customerName = ''
     customerQuery.value.approvalStatus = '0'
@@ -136,6 +158,21 @@
   }
 
   showFilterDialog.value = show
+
+  if (!writerNames.length && show && tableRef.value) {
+    console.log('清除多选')
+    tableRef.value.clearMulti()
+  }
+}
+
+// 多选确定
+const submitEquipmentSelected = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('至少选中一条数据')
+    return false
+  }
+  emit('recordSelected', checkoutList.value)
+  showOrHideFilterDialog(false)
 }
 
 defineExpose({
@@ -176,13 +213,18 @@
         </search-area>
 
         <!-- 表格数据展示 -->
-        <table-container :title-show="false">
+        <table-container v-loading="tableLoading" :title-show="false">
           <!-- 表格区域 -->
           <normal-table
             id="sysUserFilter"
+            ref="tableRef"
             :data="sysUserList" :total="total" :columns="columns"
             :query="{ limit: sysUserQuery.limit, offset: sysUserQuery.offset }"
+            is-showmulti-select
+            :is-multi="isMulti"
+            :height="520"
             @change="changePage"
+            @multi-select="handleSelectionChange"
           >
             <template #preColumns>
               <el-table-column label="序号" width="55" align="center">
@@ -191,7 +233,7 @@
                 </template>
               </el-table-column>
             </template>
-            <template #columns>
+            <template v-if="!props.isMulti" #columns>
               <el-table-column fixed="right" label="操作" align="center" width="130">
                 <template #default="{ row }">
                   <el-button size="small" type="primary" @click="selectSingleUser(row)">
@@ -204,6 +246,15 @@
         </table-container>
       </div>
     </div>
+    <!-- 多选 -->
+    <template v-if="props.isMulti" #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitEquipmentSelected">
+          确定
+        </el-button>
+        <el-button @click="showOrHideFilterDialog(false)">取消</el-button>
+      </span>
+    </template>
   </el-dialog>
 </template>
 
diff --git a/src/views/resource/common/filterSysUser.vue b/src/views/resource/common/filterSysUser.vue
index 71ec72d..4efa44f 100644
--- a/src/views/resource/common/filterSysUser.vue
+++ b/src/views/resource/common/filterSysUser.vue
@@ -1,7 +1,8 @@
 <!-- 筛选系统用户弹窗 -->
 <script name="FilterSysUser" lang="ts" setup>
+import { ElMessage } from 'element-plus'
 import type { IlistQueryType, addInfo } from '@/views/system/user/user-interface'
-import { getUserList } from '@/api/system/user'
+import { getAllUserList } from '@/api/system/user'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
 
@@ -11,6 +12,10 @@
     type: Boolean,
     default: true,
   },
+  isMulti: { // 是否多选
+    type: Boolean,
+    default: false,
+  },
 })
 const emit = defineEmits(['recordSelected'])
 const tableLoading = ref(false)
@@ -28,6 +33,7 @@
 })
 const pid = ref<string>('')
 const sysUserList = ref<Array<addInfo>>([])
+const checkoutList = ref<Array<addInfo>>([]) // 多选
 const total = ref<number>(0) // 数据总条数
 const columns = ref <Array<TableColumn>>([
   { text: '账号', value: 'account', align: 'center' },
@@ -35,7 +41,10 @@
   { text: '部门', value: 'deptName', align: 'center' },
   { text: '人员类别', value: 'avatarName', align: 'center' },
 ]) // 表头
-
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
 const staffTypeMap = ref({}) as any// 人员类别
 // 获取字典
 const fetchDict = async () => {
@@ -48,7 +57,7 @@
 
 const getSysUserList = () => {
   tableLoading.value = true
-  getUserList(searchQuery).then((res) => {
+  getAllUserList(searchQuery).then((res) => {
     if (res.code === 200) {
       sysUserList.value = res.data.rows.map((item: { avatar: string }) => {
         return {
@@ -62,6 +71,19 @@
   })
 }
 
+// 重置
+const reset = () => {
+  searchQuery.keywords = ''
+  searchQuery.deptId = ''
+  searchQuery.offset = 1
+  searchQuery.limit = 20
+  searchQuery.sort = ''
+  searchQuery.beginTime = ''
+  searchQuery.endTime = ''
+  searchQuery.deptType = ''
+  getSysUserList()
+}
+
 // 逻辑
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -73,10 +95,12 @@
   getSysUserList()
 }
 
+// 单选确定
 const selectSingleUser = (row: addInfo) => {
   emit('recordSelected', row)
 }
 
+// 取消
 const showOrHideFilterDialog = (show: boolean, deptId = '') => {
   if (show === false) {
     searchQuery.keywords = ''
@@ -95,6 +119,16 @@
   showFilterDialog.value = show
 }
 
+// 多选确定
+const submitEquipmentSelected = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('至少选中一条数据')
+    return false
+  }
+  emit('recordSelected', checkoutList.value)
+  showOrHideFilterDialog(false)
+}
+
 defineExpose({
   showOrHideFilterDialog,
 })
@@ -102,7 +136,7 @@
 
 <template>
   <el-dialog v-model="showFilterDialog" title="选择用户" :append-to-body="true" :close-on-click-modal="false" top="10vh">
-    <search-area :need-clear="false" @search="getSysUserList">
+    <search-area :need-clear="true" @search="getSysUserList" @clear="reset">
       <search-item>
         <el-input v-model="searchQuery.keywords" placeholder="姓名" clearable />
       </search-item>
@@ -119,7 +153,11 @@
         v-loading="tableLoading" :data="sysUserList" :total="total"
         :columns="columns"
         :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+        is-showmulti-select
+        :is-multi="isMulti"
+        :height="520"
         @change="changePage"
+        @multi-select="handleSelectionChange"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
@@ -128,7 +166,8 @@
             </template>
           </el-table-column>
         </template>
-        <template #columns>
+        <!-- 单选 -->
+        <template v-if="!props.isMulti" #columns>
           <el-table-column fixed="right" label="操作" align="center" width="130">
             <template #default="{ row }">
               <el-button size="small" type="primary" @click="selectSingleUser(row)">
@@ -139,5 +178,14 @@
         </template>
       </normal-table>
     </table-container>
+    <!-- 多选 -->
+    <template v-if="props.isMulti" #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitEquipmentSelected">
+          确定
+        </el-button>
+        <el-button @click="showOrHideFilterDialog(false)">取消</el-button>
+      </span>
+    </template>
   </el-dialog>
 </template>
diff --git a/src/views/resource/customer/questionnaire/customer-questionnaire.ts b/src/views/resource/customer/questionnaire/customer-questionnaire.ts
index 7391891..a3b40fc 100644
--- a/src/views/resource/customer/questionnaire/customer-questionnaire.ts
+++ b/src/views/resource/customer/questionnaire/customer-questionnaire.ts
@@ -39,6 +39,8 @@
   itemTen: string
   score?: string
   [key: string]: string | undefined
+  sendFlag: string // 是否已发送（1/2）
+  sendFlagName: string // 是否已发送（1/2）
 }
 
 export interface ICustomerRateColumn {
diff --git a/src/views/resource/customer/questionnaire/detail.vue b/src/views/resource/customer/questionnaire/detail.vue
index 6560afd..553ebb4 100644
--- a/src/views/resource/customer/questionnaire/detail.vue
+++ b/src/views/resource/customer/questionnaire/detail.vue
@@ -1,12 +1,14 @@
 <!-- 委托方满意度调查表详情 -->
 <script name="QuestionnaireDetail" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
-import type{ ICustomerQuestionnaireInfo, ICustomerRateColumn } from './customer-questionnaire'
+import type { ICustomerQuestionnaireInfo, ICustomerRateColumn } from './customer-questionnaire'
 import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
 import useUserStore from '@/store/modules/user'
-import { addQuestionnaire } from '@/api/resource/questionnaire'
+import FilterSysUser from '@/views/resource/common/filterSysUser.vue'
+import { addQuestionnaire, send } from '@/api/resource/questionnaire'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import { getDictByCode } from '@/api/system/dict'
+import { uniqueArray } from '@/utils/Array'
 
 // 从路由中传过来的参数
 const type = ref<string>('')
@@ -18,7 +20,7 @@
 
 const questionnaireFormRef = ref()
 const refFilterCustomer = ref()
-
+const sendIds = ref<string[]>([]) // 发送的参数
 const questionnaireInfo = ref<ICustomerQuestionnaireInfo>({
   id: '',
   customerId: '',
@@ -31,8 +33,8 @@
   senderId: '',
   senderName: '',
   sendTime: '',
-  writerId: '',
-  writerName: '',
+  writerId: '', // 填写人id（单选用-新建不让传）
+  writerName: '', // 填写人名字(多选时候-新建不让传)
   writeTime: '',
   writeStatus: '',
   itemOne: '',
@@ -45,12 +47,15 @@
   itemEight: '',
   itemNine: '',
   itemTen: '',
+
+  sendFlag: '', // 是否已发送（1/2）
+  sendFlagName: '', // 是否已发送（1/2）
 })
 
 const questionnaireFormRules = ref({
-  labCode: [{ required: true, message: '实验室不能为空，请选择', trigger: ['change', 'blur'] }],
-  customerId: [{ required: true, message: '填写单位不能为空，请选择', trigger: 'change' }],
-  writerId: [{ required: true, message: '填写人不能为空，请选择', trigger: 'change' }],
+  labCode: [{ required: true, message: '实验室不能为空', trigger: ['change', 'blur'] }],
+  customerId: [{ required: true, message: '填写单位不能为空', trigger: 'change' }],
+  writerName: [{ required: true, message: '填写人不能为空', trigger: 'change' }],
 }) // 表单验证规则
 
 // 字典值
@@ -71,28 +76,43 @@
   { index: 10, text: '10、对所提供的计量保障是否满意', value: 0, attributeName: 'itemTen' },
 ])
 
-// 逻辑
-
-// 显示筛选填写用户和单位的弹窗
+// ---------------------------------------------多选填写人----------------------------------------------
+const writerNames = ref<{ customerId: string; writerId: string }[]>([]) // 选择的填写人数组
+// 点击选择填写人
 const showFilterCustomerDialog = () => {
-  refFilterCustomer.value.showOrHideFilterDialog(true)
+  refFilterCustomer.value.showOrHideFilterDialog(true, '', false, writerNames.value)
 }
 
-// 返回选定结果
-const recordSelectedHandler = (row: any) => {
+// 选定填写人
+const recordSelectedHandler = (list: any) => {
   refFilterCustomer.value.showOrHideFilterDialog(false)
-
-  if (row.id !== '') {
-    questionnaireInfo.value.customerId = row.customerId
-    questionnaireInfo.value.customerName = row.customerName
-    questionnaireInfo.value.writerId = row.id
-    questionnaireInfo.value.writerName = row.name
+  if (list && list.length) {
+    writerNames.value = list.map((item: { customerDeptId: string; id: string }) => {
+      return {
+        customerId: item.customerDeptId,
+        writerId: item.id,
+      }
+    })
+    questionnaireInfo.value.writerName = list.map((item: { name: string }) => item.name).join(',')
+    // 填写单位
+    questionnaireInfo.value.customerName = uniqueArray(list.map((item: { customerName: string }) => item.customerName)).join(',')
+    questionnaireInfo.value.customerId = uniqueArray(list.map((item: { customerDeptId: string }) => item.customerDeptId)).join(',')
   }
   else {
     ElMessage.error('填写单位和填写人不能为空，请重新选择')
   }
 }
 
+// 清空填写人
+const clean = () => {
+  questionnaireInfo.value.writerName = ''
+  questionnaireInfo.value.customerName = ''
+  questionnaireInfo.value.customerId = ''
+  writerNames.value = []
+}
+
+// ---------------------------------------------------------------------------------------------------
+
 // 保存
 const saveQuestionnaireInfo = () => {
   let satisfactionStr = ''
@@ -109,19 +129,29 @@
     if (satisfactionStr.length === 10) {
       questionnaireInfo.value.writeTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 填写时间为当前时间
     }
-
+    const params = {
+      ...questionnaireInfo.value,
+      writerId: null, // 填写人id（单选用-多选时候新建不让传）
+      writerName: null, // 填写人名字(多选时候-新建不让传)
+      sendFlag: '2', // 是否已发送（1/2）
+      sendFlagName: '未发送', // 是否已发送（1/2）
+      customerName: null,
+      customerId: null,
+      sendDTOs: writerNames.value, // 填写人信息
+    }
     // 提交接口
-    addQuestionnaire(questionnaireInfo.value).then((res) => {
+    addQuestionnaire(params).then((res) => {
       if (res.code === 200) {
       // 提示保存成功
-        ElMessage.success('委托方满意度调查表创建并发送成功')
+        ElMessage.success('委托方满意度调查表创建成功')
 
         // 设置返回的委托方id和委托方编号
-        questionnaireInfo.value.questionnaireNo = res.data.questionnaireNo
-        questionnaireInfo.value.id = res.data.id
-        id.value = res.data.id
+        // questionnaireInfo.value.questionnaireNo = res.data.questionnaireNo
+        // questionnaireInfo.value.id = res.data.id
+        // id.value = res.data.id
 
         type.value = 'detail'
+        sendIds.value = res.data
       }
       else {
       // 提示失败信息
@@ -193,6 +223,18 @@
   router.go(-1)
 }
 
+// 点击发送
+const handleSend = () => {
+  if (sendIds && sendIds.value.length) {
+    send({ ids: sendIds.value }).then((res) => {
+      ElMessage.success('发送成功')
+    })
+  }
+  else {
+    ElMessage.warning('没有发送的单位或个人')
+  }
+}
+
 const initDialog = (params: any) => {
   // 从路由中获取参数
   type.value = params.type
@@ -205,7 +247,8 @@
       questionnaireInfo.value.senderId = userInfo.id
       questionnaireInfo.value.senderName = userInfo.name
       questionnaireInfo.value.sendTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
-
+      questionnaireInfo.value.labCode = userInfo.bizLabCode // 实验室代码
+      questionnaireInfo.value.labCodeName = userInfo.labCodeName // 实验室名称
       break
 
     case 'detail':
@@ -275,6 +318,9 @@
     <el-form ref="questionnaireFormRef" :model="questionnaireInfo" :rules="questionnaireFormRules" label-position="right" label-width="110px" border stripe>
       <detail-page title="委托方满意度调查表">
         <template #btns>
+          <el-button v-if="type === 'detail'" type="primary" @click="handleSend">
+            发送
+          </el-button>
           <el-button v-if="type !== 'detail'" type="primary" @click="saveButtonHandler">
             保存
           </el-button>
@@ -284,7 +330,6 @@
         </template>
 
         <el-row :gutter="24">
-          <!-- 第一行 第一列 -->
           <el-col :span="6">
             <el-form-item label="实验室" prop="labCode">
               <el-select v-model="questionnaireInfo.labCode" placeholder="请选择实验室" :disabled="type === 'detail'" style="width: 100%;">
@@ -292,46 +337,52 @@
               </el-select>
               <el-input v-model="questionnaireInfo.labCodeName" type="hidden" />
             </el-form-item>
-
-            <el-form-item label="填写单位" prop="customerId">
-              <el-input v-model="questionnaireInfo.customerName" :disabled="true" placeholder="选择填写人时自动填充" />
-              <el-input v-model="questionnaireInfo.customerId" type="hidden" />
-            </el-form-item>
           </el-col>
-
           <el-col :span="6">
             <el-form-item label="文件编号">
-              <el-input v-model="questionnaireInfo.questionnaireNo" placeholder="文件编号，保存后自动生成" :disabled="true" />
-            </el-form-item>
-
-            <el-form-item label="填写人" prop="writerId">
-              <el-input v-model="questionnaireInfo.writerName" :readonly="true" :disabled="true">
-                <template #append>
-                  <el-button size="small" :disabled="type === 'detail'" @click="showFilterCustomerDialog">
-                    选择
-                  </el-button>
-                </template>
-              </el-input>
-              <el-input v-model="questionnaireInfo.writerId" type="hidden" />
+              <el-input v-model="questionnaireInfo.questionnaireNo" placeholder="系统自动生成" :disabled="true" />
             </el-form-item>
           </el-col>
-
           <el-col :span="6">
             <el-form-item label="发送人">
               <el-input v-model="questionnaireInfo.senderName" :disabled="true" />
               <el-input v-model="questionnaireInfo.senderId" type="hidden" />
             </el-form-item>
-
-            <el-form-item label="填写时间">
-              <el-input v-model="questionnaireInfo.writeTime" :disabled="true" />
-            </el-form-item>
           </el-col>
-
           <el-col :span="6">
             <el-form-item label="发送时间">
               <el-input v-model="questionnaireInfo.sendTime" placeholder="保存后自动生成" :disabled="true" />
             </el-form-item>
           </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="填写人" prop="writerName" style="display: flex;">
+              <el-button size="small" type="primary" :disabled="type === 'detail'" @click="showFilterCustomerDialog">
+                {{ questionnaireInfo.writerName ? '继续添加' : '添加' }}
+              </el-button>
+              <el-button size="small" type="info" :disabled="type === 'detail'" @click="clean">
+                清空
+              </el-button>
+              <el-input v-model="questionnaireInfo.writerName" placeholder="请添加填写人" style="margin-top: 8px;" :readonly="true" :disabled="true" type="textarea" autosize>
+                <!-- <template #append>
+                  <el-button size="small" :disabled="type === 'detail'" @click="showFilterCustomerDialog">
+                    选择
+                  </el-button>
+                </template> -->
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="填写单位" prop="customerId">
+              <el-input v-model="questionnaireInfo.customerName" type="textarea" :autosize="{ minRows: 3 }" :disabled="true" placeholder="选择填写人时自动填充" />
+              <el-input v-model="questionnaireInfo.customerId" type="hidden" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="填写时间">
+              <el-input v-model="questionnaireInfo.writeTime" :disabled="true" />
+            </el-form-item>
+          </el-col>
         </el-row>
       </detail-page>
 
@@ -350,8 +401,8 @@
         </el-row>
       </table-container>
     </el-form>
-
-    <filter-customer-staff ref="refFilterCustomer" title="请选择填写单位和填写人" @record-selected="recordSelectedHandler" />
+    <!-- 单选填写人--先选委托方，再去选委托方下面的人 -->
+    <filter-customer-staff ref="refFilterCustomer" :is-multi="true" title="请选择填写单位和填写人" @record-selected="recordSelectedHandler" />
   </app-container>
 </template>
 
diff --git a/src/views/resource/customer/questionnaire/list.vue b/src/views/resource/customer/questionnaire/list.vue
index a2306ff..553e5f3 100644
--- a/src/views/resource/customer/questionnaire/list.vue
+++ b/src/views/resource/customer/questionnaire/list.vue
@@ -2,9 +2,9 @@
 <script name="QuestionnaireList" lang="ts" setup>
 import { ElMessage, dayjs } from 'element-plus'
 import type { DateModelType } from 'element-plus'
-import type{ ICustomerQuestionnaireInfo, IListQuery } from './customer-questionnaire'
+import type { ICustomerQuestionnaireInfo, IListQuery } from './customer-questionnaire'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getQuestionnaireList } from '@/api/resource/questionnaire'
+import { getQuestionnaireList, remindWorker } from '@/api/resource/questionnaire'
 
 const { proxy } = getCurrentInstance() as any
 const router = useRouter()
@@ -118,7 +118,9 @@
 }
 
 const urging = (row: ICustomerQuestionnaireInfo) => {
-  ElMessage.success(`满意度调查表 ${row.questionnaireNo} 填写消息已发送`)
+  remindWorker({ id: row.id }).then((res) => {
+    ElMessage.success(`满意度调查表 ${row.questionnaireNo} 填写消息已催办`)
+  })
 }
 
 watch(dateRangeSend, (val) => {
@@ -194,7 +196,8 @@
               <el-button size="small" type="primary" link @click="detail(row)">
                 详情
               </el-button>
-              <el-button v-if="row.writeStatus !== '已提交'" size="small" type="primary" link @click="urging(row)">
+              <!-- <el-button v-if="row.writeStatus !== '已提交'" size="small" type="primary" link @click="urging(row)"> -->
+              <el-button size="small" type="primary" link @click="urging(row)">
                 催办
               </el-button>
             </template>
diff --git a/src/views/resource/customer/situationReport/dialog/selectSuggestFormDialog.vue b/src/views/resource/customer/situationReport/dialog/selectSuggestFormDialog.vue
index 8fa636b..a491499 100644
--- a/src/views/resource/customer/situationReport/dialog/selectSuggestFormDialog.vue
+++ b/src/views/resource/customer/situationReport/dialog/selectSuggestFormDialog.vue
@@ -130,7 +130,7 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择委托方" width="65%">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择委托方意见登记表" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="clearList">
       <search-item width="162px">
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index a5508b4..9066757 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -456,7 +456,7 @@
     locationName: '', // 地点名称
     locationNo: '', // 地点编号
     labName: lab, // 所属实验室
-    limit: 20,
+    limit: 999999,
     offset: 1,
   }
   getLocationList(params).then((response) => {
diff --git a/src/views/resource/environment/voltage/edit.vue b/src/views/resource/environment/voltage/edit.vue
index b8a9290..ad03b80 100644
--- a/src/views/resource/environment/voltage/edit.vue
+++ b/src/views/resource/environment/voltage/edit.vue
@@ -58,6 +58,8 @@
 
   testUseEquipment: '', //	测试所用设备
   testUseEquipmentId: '', //		测试所用设备id
+  model: '', // 型号
+  manufactureNo: '', // 出厂编号
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
   groupCode: '', // 部门
@@ -417,6 +419,8 @@
   if (list && list.length) {
     recordForm.value.testUseEquipment = list[0].equipmentName //	测试所用设备
     recordForm.value.testUseEquipmentId = list[0].id //		测试所用设备id
+    recordForm.value.model = list[0].model //		型号
+    recordForm.value.manufactureNo = list[0].manufactureNo //		出厂编号
   }
 }
 
@@ -463,8 +467,7 @@
   // 从路由中获取参数
   type.value = params.type
   id.value = params.id !== undefined ? params.id : ''
-  status.value = params.status !== undefined ? params.status : ''
-
+  status.value = params.status
   // 默认显示第一个tab内容
   current.value = radioItems.value[0].value
   currentLabel.value = radioItems.value[0].name
@@ -517,7 +520,6 @@
     if (radioItems.value[radioItems.value.length - 1].value === 'voltage-approval') {
       radioItems.value.pop()
     }
-    console.log(radioItems.value)
   }
   else { // 非全部和草稿箱把审批详情加上
     if (radioItems.value[radioItems.value.length - 1].value !== 'voltage-approval') {
@@ -541,7 +543,7 @@
     locationName: '', // 地点名称
     locationNo: '', // 地点编号
     labName: lab, // 所属实验室
-    limit: 20,
+    limit: 999999,
     offset: 1,
   }
   getLocationList(params).then((response) => {
@@ -618,6 +620,20 @@
       <detail-block v-if="current === 'voltage-basic'">
         <el-row :gutter="24">
           <el-col :span="6">
+            <el-form-item label="实验室" prop="labCode">
+              <el-select v-model="recordForm.labCode" placeholder="请选择实验室" :disabled="type === 'detail'" style="width: 100%;" @change="changeLab">
+                <el-option v-for="dict in labCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="recordForm.groupCode" placeholder="请选择部门" :disabled="type === 'detail'" style="width: 100%;">
+                <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="记录编号">
               <el-input v-model="recordForm.recordNo" placeholder="系统自动生成" :disabled="true" />
             </el-form-item>
@@ -651,7 +667,7 @@
             <el-form-item label="测试地点" prop="testLocation">
               <!-- <el-input v-model="recordForm.testLocation" :placeholder="type === 'detail' ? ' ' : '请输入测试地点'" :disabled="type === 'detail'" /> -->
               <el-autocomplete
-                v-model="detailRequire.testLocation"
+                v-model="recordForm.testLocation"
                 :fetch-suggestions="querySearchTestLocation"
                 placeholder="工作间名称"
                 clearable
@@ -669,27 +685,22 @@
               </el-input>
             </el-form-item>
           </el-col>
-
           <el-col :span="6">
+            <el-form-item label="型号" prop="model">
+              <el-input v-model="recordForm.model" :placeholder="type === 'detail' ? ' ' : '型号'" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号" prop="manufactureNo">
+              <el-input v-model="recordForm.manufactureNo" :placeholder="type === 'detail' ? ' ' : '出厂编号'" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
             <el-form-item label="测试依据" prop="testBasis">
               <el-input v-model="recordForm.testBasis" :placeholder="type === 'detail' ? ' ' : '请输入测试依据'" :disabled="type === 'detail'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="实验室" prop="labCode">
-              <el-select v-model="recordForm.labCode" placeholder="请选择实验室" :disabled="type === 'detail'" style="width: 100%;" @change="changeLab">
-                <el-option v-for="dict in labCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="recordForm.groupCode" placeholder="请选择部门" :disabled="type === 'detail'" style="width: 100%;">
-                <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="电源电压空载(V)" prop="powerVoltageNoLoad">
               <el-input v-model="recordForm.powerVoltageNoLoad" :placeholder="type === 'detail' ? ' ' : '请输入电源电压空载'" :disabled="type === 'detail'" />
             </el-form-item>
diff --git a/src/views/resource/environment/voltage/list.vue b/src/views/resource/environment/voltage/list.vue
index 001a6d6..bce6ec9 100644
--- a/src/views/resource/environment/voltage/list.vue
+++ b/src/views/resource/environment/voltage/list.vue
@@ -52,33 +52,35 @@
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '测试时间', value: 'testTime', align: 'center', width: '120' },
-  { text: '测试地点', value: 'testLocation', align: 'center', width: '200' },
-  { text: '实验室', value: 'labCodeName', align: 'center' },
-  { text: '部门', value: 'groupCodeName', align: 'center' },
-  { text: '测试所用设备', value: 'testUseEquipment', align: 'center', width: '200' },
-  { text: '测试依据', value: 'testBasis', align: 'center' },
+  { text: '测试地点', value: 'testLocation', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '测试所用设备', value: 'testUseEquipment', align: 'center' },
+  { text: '型号', value: 'model', align: 'center' },
+  { text: '出厂编号', value: 'manufactureNo', align: 'center' },
+  { text: '测试依据', value: 'testBasis', align: 'center', width: '220' },
   {
     text: '电源电压(V)',
     value: '',
     align: 'center',
-    width: '120',
+    width: '220',
     children: [
-      { text: '空载', value: 'powerVoltageNoLoad', align: 'center', width: '60' },
-      { text: '加载', value: 'powerVoltageLoad', align: 'center', width: '60' },
+      { text: '空载', value: 'powerVoltageNoLoad', align: 'center', width: '120' },
+      { text: '加载', value: 'powerVoltageLoad', align: 'center', width: '120' },
     ],
   },
   {
     text: '零地电压(V)',
     value: '',
     align: 'center',
-    width: '120',
+    width: '220',
     children: [
-      { text: '空载', value: 'zeroVoltageNoLoad', align: 'center', width: '60' },
-      { text: '加载', value: 'zeroVoltageLoad', align: 'center', width: '60' },
+      { text: '空载', value: 'zeroVoltageNoLoad', align: 'center', width: '120' },
+      { text: '加载', value: 'zeroVoltageLoad', align: 'center', width: '120' },
     ],
   },
-  { text: '结论', value: 'conclusion', align: 'center', width: '160' },
-  { text: '测试人', value: 'createUserName', align: 'center', width: '120' },
+  { text: '结论', value: 'conclusion', align: 'center' },
+  { text: '测试人', value: 'createUserName', align: 'center' },
   { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '100' },
 ])
 const list = ref<Array<IVoltageRecord>>([]) // 表格数据

diff --git a/src/api/resource/questionnaire.ts b/src/api/resource/questionnaire.ts
index f40c875..9e55dc7 100644
--- a/src/api/resource/questionnaire.ts
+++ b/src/api/resource/questionnaire.ts
@@ -17,3 +17,22 @@
     data,
   })
 }
+
+// 发送
+export function send(data: { ids: string[] }) {
+  return request({
+    url: `${prefix}/questionnaire/send`,
+    method: 'post',
+    data,
+  })
+}
+
+remindWorker
+// 催办
+export function remindWorker(data: { id: string }) {
+  return request({
+    url: `${prefix}/questionnaire/remindWorker`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/resource/common/filterConsumableCheck.vue b/src/views/resource/common/filterConsumableCheck.vue
new file mode 100644
index 0000000..14f6d0a
--- /dev/null
+++ b/src/views/resource/common/filterConsumableCheck.vue
@@ -0,0 +1,198 @@
+<!-- 选择物资验收记录 -->
+<script lang="ts" setup name="FilterConsumableCheck">
+import { ElMessage } from 'element-plus'
+import type { Ref } from 'vue'
+import { ref } from 'vue'
+import dayjs from 'dayjs'
+import type { DateModelType } from 'element-plus'
+import { getLocationList } from '@/api/business/taskMeasure/measureData'
+import { getGoodsCheckList } from '@/api/resource/supplierConsumable'
+import { getStaffList } from '@/api/resource/register'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { getCustomerInfoList } from '@/api/resource/customer'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  recordNo: '', // 记录单编号
+  createDept: '',
+  createUserName: '', // 创建人
+  acceptTimeStart: '', // 创建时间-起始
+  acceptTimeEnd: '', // 创建时间-结束
+  approvalStatus: '0', // 审批状态
+  formId: SCHEDULE.CHECK_MATERIAL_RECORD_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
+  offset: 1,
+  limit: 20,
+})
+// 多选选中的内容
+const checkoutList = ref([])
+const loadingTable = ref(false)
+const list = ref([]) // 表格数据
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '文件编号', value: 'recordNo', align: 'center', width: '200' },
+  { text: '物资名称', value: 'goodsName', align: 'center' },
+  { text: '规格型号', value: 'goodsModel', align: 'center' },
+  { text: '验收部门', value: 'createDept', align: 'center', width: '160' },
+  { text: '验收人', value: 'createUserName', align: 'center', width: '120' },
+  { text: '验收时间', value: 'createTime', align: 'center', width: '120' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '100' },
+])
+const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
+
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getGoodsCheckList(listQuery.value).then((response) => {
+    if (response.code === 200) {
+      list.value = response.data.rows.map((item: any) => {
+        return {
+          ...item,
+          createTime: item.createTime!.length > 16 ? item.createTime!.substring(0, 10) : '',
+        }
+      })
+      total.value = parseInt(response.data.total)
+    }
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
+}
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    recordNo: '', // 记录单编号
+    createDept: '',
+    createUserName: '', // 创建人
+    acceptTimeStart: '', // 创建时间-起始
+    acceptTimeEnd: '', // 创建时间-结束
+    approvalStatus: '0', // 审批状态
+    formId: SCHEDULE.CHECK_MATERIAL_RECORD_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
+    offset: 1,
+    limit: 20,
+  }
+  dateRange.value = ['', '']
+  fetchData()
+}
+// 搜索
+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
+  }
+  search()
+}
+// 点击确定
+const confirmSelect = (row: any) => {
+  emits('confirm', [row])
+  dialogFormVisible.value = false
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData()
+}
+
+watch(dateRange, (val) => {
+  if (val) {
+    listQuery.value.acceptTimeStart = dayjs(val[0]).format('YYYY-MM-DD') === 'Invalid Date' ? '' : dayjs(val[0]).format('YYYY-MM-DD')
+    listQuery.value.acceptTimeEnd = dayjs(val[1]).format('YYYY-MM-DD') === 'Invalid Date' ? '' : dayjs(val[1]).format('YYYY-MM-DD')
+  }
+  else {
+    listQuery.value.acceptTimeStart = ''
+    listQuery.value.acceptTimeEnd = ''
+  }
+})
+
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择工作间" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input v-model="listQuery.recordNo" placeholder="文件编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.createDept" placeholder="验收部门" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.createUserName" placeholder="验收人" clearable />
+      </search-item>
+      <search-item>
+        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="验收时间（开始）" end-placeholder="验收时间（结束）" />
+      </search-item>
+    </search-area>
+
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        :height="520"
+        :is-show-single-select-button="true"
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column fixed="right" label="操作" align="center" width="130">
+            <template #default="{ row }">
+              <el-button size="small" type="primary" @click="confirmSelect(row)">
+                选定
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <!-- <el-button type="primary" @click="confirmSelect">确认</el-button> -->
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/resource/common/filterCustomerStaff.vue b/src/views/resource/common/filterCustomerStaff.vue
index 610bf51..fd40e61 100644
--- a/src/views/resource/common/filterCustomerStaff.vue
+++ b/src/views/resource/common/filterCustomerStaff.vue
@@ -1,5 +1,6 @@
 <!-- 筛选系统用户弹窗 -->
 <script name="FilterCustomerStaff" lang="ts" setup>
+import { ElMessage } from 'element-plus'
 import type { ICustomerFilter, ICustomerTree } from './common-interface'
 import type { ICustomerInfo } from '@/views/resource/customer/info/customer-info'
 import type { IlistQueryType } from '@/views/system/user/user-interface'
@@ -7,11 +8,15 @@
 import { getCustomerInfoList } from '@/api/resource/customer'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 
-defineProps({
+const props = defineProps({
   title: {
     type: String,
     default: '请选择',
   },
+  isMulti: { // 是否多选
+    type: Boolean,
+    default: false,
+  },
 })
 
 const emit = defineEmits(['recordSelected'])
@@ -20,9 +25,10 @@
   children: 'children',
   label: 'customerName',
 }
-
+const tableLoading = ref(false)
 // 定义变量
 const customerIdSelected = ref<string>('')
+const customerDeptIdSelected = ref<string>('')
 const customerNameSelected = ref<string>('')
 const disabledCustomerName = ref(false) // 委托方筛选是否禁用
 const getCustomerName = ref('') // 委托方
@@ -44,7 +50,9 @@
   endTime: '',
   deptType: '',
 })
+const tableRef = ref()
 const sysUserList = ref([])
+const checkoutList = ref([]) // 多选
 const total = ref<number>(0) // 数据总条数
 const columns = ref <Array<TableColumn>>([
   { text: '账号', value: 'account', align: 'center' },
@@ -53,9 +61,13 @@
 ]) // 表头
 
 const customerTree = ref<Array<ICustomerTree>>([])
-
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
 // 查询用户列表
 const getSysUserList = () => {
+  tableLoading.value = true
   getAllUserList(sysUserQuery.value).then((res) => {
     if (res.code === 200) {
       sysUserList.value = res.data.rows.map((item: any) => {
@@ -63,10 +75,12 @@
           ...item,
           customerId: customerIdSelected.value,
           customerName: customerNameSelected.value,
+          customerDeptId: customerDeptIdSelected,
         }
       })
       total.value = Number(res.data.total)
     }
+    tableLoading.value = false
   })
 }
 
@@ -101,17 +115,25 @@
 
   // 赋值选中的委托方
   customerIdSelected.value = data.id
+  customerDeptIdSelected.value = data.deptId
   customerNameSelected.value = data.customerName
 
   getSysUserList()
 }
 
-// 选中用户
+// 单选选定
 const selectSingleUser = (row: Object) => {
   emit('recordSelected', row)
 }
 
-const showOrHideFilterDialog = (show: boolean, customerName = '', disabledCustomerNameParam = false) => {
+/**
+ * 弹窗显隐
+ * @param show 控制弹窗显隐
+ * @param customerName 委托方名称
+ * @param disabledCustomerNameParam 禁止修改委托方名称
+ * @param writerNames 委托方意见登记表--[]则清空原有的多选
+ */
+const showOrHideFilterDialog = (show: boolean, customerName = '', disabledCustomerNameParam = false, writerNames = []) => {
   if (show === false) {
     customerQuery.value.customerName = ''
     customerQuery.value.approvalStatus = '0'
@@ -136,6 +158,21 @@
   }
 
   showFilterDialog.value = show
+
+  if (!writerNames.length && show && tableRef.value) {
+    console.log('清除多选')
+    tableRef.value.clearMulti()
+  }
+}
+
+// 多选确定
+const submitEquipmentSelected = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('至少选中一条数据')
+    return false
+  }
+  emit('recordSelected', checkoutList.value)
+  showOrHideFilterDialog(false)
 }
 
 defineExpose({
@@ -176,13 +213,18 @@
         </search-area>
 
         <!-- 表格数据展示 -->
-        <table-container :title-show="false">
+        <table-container v-loading="tableLoading" :title-show="false">
           <!-- 表格区域 -->
           <normal-table
             id="sysUserFilter"
+            ref="tableRef"
             :data="sysUserList" :total="total" :columns="columns"
             :query="{ limit: sysUserQuery.limit, offset: sysUserQuery.offset }"
+            is-showmulti-select
+            :is-multi="isMulti"
+            :height="520"
             @change="changePage"
+            @multi-select="handleSelectionChange"
           >
             <template #preColumns>
               <el-table-column label="序号" width="55" align="center">
@@ -191,7 +233,7 @@
                 </template>
               </el-table-column>
             </template>
-            <template #columns>
+            <template v-if="!props.isMulti" #columns>
               <el-table-column fixed="right" label="操作" align="center" width="130">
                 <template #default="{ row }">
                   <el-button size="small" type="primary" @click="selectSingleUser(row)">
@@ -204,6 +246,15 @@
         </table-container>
       </div>
     </div>
+    <!-- 多选 -->
+    <template v-if="props.isMulti" #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitEquipmentSelected">
+          确定
+        </el-button>
+        <el-button @click="showOrHideFilterDialog(false)">取消</el-button>
+      </span>
+    </template>
   </el-dialog>
 </template>
 
diff --git a/src/views/resource/common/filterSysUser.vue b/src/views/resource/common/filterSysUser.vue
index 71ec72d..4efa44f 100644
--- a/src/views/resource/common/filterSysUser.vue
+++ b/src/views/resource/common/filterSysUser.vue
@@ -1,7 +1,8 @@
 <!-- 筛选系统用户弹窗 -->
 <script name="FilterSysUser" lang="ts" setup>
+import { ElMessage } from 'element-plus'
 import type { IlistQueryType, addInfo } from '@/views/system/user/user-interface'
-import { getUserList } from '@/api/system/user'
+import { getAllUserList } from '@/api/system/user'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
 
@@ -11,6 +12,10 @@
     type: Boolean,
     default: true,
   },
+  isMulti: { // 是否多选
+    type: Boolean,
+    default: false,
+  },
 })
 const emit = defineEmits(['recordSelected'])
 const tableLoading = ref(false)
@@ -28,6 +33,7 @@
 })
 const pid = ref<string>('')
 const sysUserList = ref<Array<addInfo>>([])
+const checkoutList = ref<Array<addInfo>>([]) // 多选
 const total = ref<number>(0) // 数据总条数
 const columns = ref <Array<TableColumn>>([
   { text: '账号', value: 'account', align: 'center' },
@@ -35,7 +41,10 @@
   { text: '部门', value: 'deptName', align: 'center' },
   { text: '人员类别', value: 'avatarName', align: 'center' },
 ]) // 表头
-
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
 const staffTypeMap = ref({}) as any// 人员类别
 // 获取字典
 const fetchDict = async () => {
@@ -48,7 +57,7 @@
 
 const getSysUserList = () => {
   tableLoading.value = true
-  getUserList(searchQuery).then((res) => {
+  getAllUserList(searchQuery).then((res) => {
     if (res.code === 200) {
       sysUserList.value = res.data.rows.map((item: { avatar: string }) => {
         return {
@@ -62,6 +71,19 @@
   })
 }
 
+// 重置
+const reset = () => {
+  searchQuery.keywords = ''
+  searchQuery.deptId = ''
+  searchQuery.offset = 1
+  searchQuery.limit = 20
+  searchQuery.sort = ''
+  searchQuery.beginTime = ''
+  searchQuery.endTime = ''
+  searchQuery.deptType = ''
+  getSysUserList()
+}
+
 // 逻辑
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -73,10 +95,12 @@
   getSysUserList()
 }
 
+// 单选确定
 const selectSingleUser = (row: addInfo) => {
   emit('recordSelected', row)
 }
 
+// 取消
 const showOrHideFilterDialog = (show: boolean, deptId = '') => {
   if (show === false) {
     searchQuery.keywords = ''
@@ -95,6 +119,16 @@
   showFilterDialog.value = show
 }
 
+// 多选确定
+const submitEquipmentSelected = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('至少选中一条数据')
+    return false
+  }
+  emit('recordSelected', checkoutList.value)
+  showOrHideFilterDialog(false)
+}
+
 defineExpose({
   showOrHideFilterDialog,
 })
@@ -102,7 +136,7 @@
 
 <template>
   <el-dialog v-model="showFilterDialog" title="选择用户" :append-to-body="true" :close-on-click-modal="false" top="10vh">
-    <search-area :need-clear="false" @search="getSysUserList">
+    <search-area :need-clear="true" @search="getSysUserList" @clear="reset">
       <search-item>
         <el-input v-model="searchQuery.keywords" placeholder="姓名" clearable />
       </search-item>
@@ -119,7 +153,11 @@
         v-loading="tableLoading" :data="sysUserList" :total="total"
         :columns="columns"
         :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+        is-showmulti-select
+        :is-multi="isMulti"
+        :height="520"
         @change="changePage"
+        @multi-select="handleSelectionChange"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
@@ -128,7 +166,8 @@
             </template>
           </el-table-column>
         </template>
-        <template #columns>
+        <!-- 单选 -->
+        <template v-if="!props.isMulti" #columns>
           <el-table-column fixed="right" label="操作" align="center" width="130">
             <template #default="{ row }">
               <el-button size="small" type="primary" @click="selectSingleUser(row)">
@@ -139,5 +178,14 @@
         </template>
       </normal-table>
     </table-container>
+    <!-- 多选 -->
+    <template v-if="props.isMulti" #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitEquipmentSelected">
+          确定
+        </el-button>
+        <el-button @click="showOrHideFilterDialog(false)">取消</el-button>
+      </span>
+    </template>
   </el-dialog>
 </template>
diff --git a/src/views/resource/customer/questionnaire/customer-questionnaire.ts b/src/views/resource/customer/questionnaire/customer-questionnaire.ts
index 7391891..a3b40fc 100644
--- a/src/views/resource/customer/questionnaire/customer-questionnaire.ts
+++ b/src/views/resource/customer/questionnaire/customer-questionnaire.ts
@@ -39,6 +39,8 @@
   itemTen: string
   score?: string
   [key: string]: string | undefined
+  sendFlag: string // 是否已发送（1/2）
+  sendFlagName: string // 是否已发送（1/2）
 }
 
 export interface ICustomerRateColumn {
diff --git a/src/views/resource/customer/questionnaire/detail.vue b/src/views/resource/customer/questionnaire/detail.vue
index 6560afd..553ebb4 100644
--- a/src/views/resource/customer/questionnaire/detail.vue
+++ b/src/views/resource/customer/questionnaire/detail.vue
@@ -1,12 +1,14 @@
 <!-- 委托方满意度调查表详情 -->
 <script name="QuestionnaireDetail" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
-import type{ ICustomerQuestionnaireInfo, ICustomerRateColumn } from './customer-questionnaire'
+import type { ICustomerQuestionnaireInfo, ICustomerRateColumn } from './customer-questionnaire'
 import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
 import useUserStore from '@/store/modules/user'
-import { addQuestionnaire } from '@/api/resource/questionnaire'
+import FilterSysUser from '@/views/resource/common/filterSysUser.vue'
+import { addQuestionnaire, send } from '@/api/resource/questionnaire'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import { getDictByCode } from '@/api/system/dict'
+import { uniqueArray } from '@/utils/Array'
 
 // 从路由中传过来的参数
 const type = ref<string>('')
@@ -18,7 +20,7 @@
 
 const questionnaireFormRef = ref()
 const refFilterCustomer = ref()
-
+const sendIds = ref<string[]>([]) // 发送的参数
 const questionnaireInfo = ref<ICustomerQuestionnaireInfo>({
   id: '',
   customerId: '',
@@ -31,8 +33,8 @@
   senderId: '',
   senderName: '',
   sendTime: '',
-  writerId: '',
-  writerName: '',
+  writerId: '', // 填写人id（单选用-新建不让传）
+  writerName: '', // 填写人名字(多选时候-新建不让传)
   writeTime: '',
   writeStatus: '',
   itemOne: '',
@@ -45,12 +47,15 @@
   itemEight: '',
   itemNine: '',
   itemTen: '',
+
+  sendFlag: '', // 是否已发送（1/2）
+  sendFlagName: '', // 是否已发送（1/2）
 })
 
 const questionnaireFormRules = ref({
-  labCode: [{ required: true, message: '实验室不能为空，请选择', trigger: ['change', 'blur'] }],
-  customerId: [{ required: true, message: '填写单位不能为空，请选择', trigger: 'change' }],
-  writerId: [{ required: true, message: '填写人不能为空，请选择', trigger: 'change' }],
+  labCode: [{ required: true, message: '实验室不能为空', trigger: ['change', 'blur'] }],
+  customerId: [{ required: true, message: '填写单位不能为空', trigger: 'change' }],
+  writerName: [{ required: true, message: '填写人不能为空', trigger: 'change' }],
 }) // 表单验证规则
 
 // 字典值
@@ -71,28 +76,43 @@
   { index: 10, text: '10、对所提供的计量保障是否满意', value: 0, attributeName: 'itemTen' },
 ])
 
-// 逻辑
-
-// 显示筛选填写用户和单位的弹窗
+// ---------------------------------------------多选填写人----------------------------------------------
+const writerNames = ref<{ customerId: string; writerId: string }[]>([]) // 选择的填写人数组
+// 点击选择填写人
 const showFilterCustomerDialog = () => {
-  refFilterCustomer.value.showOrHideFilterDialog(true)
+  refFilterCustomer.value.showOrHideFilterDialog(true, '', false, writerNames.value)
 }
 
-// 返回选定结果
-const recordSelectedHandler = (row: any) => {
+// 选定填写人
+const recordSelectedHandler = (list: any) => {
   refFilterCustomer.value.showOrHideFilterDialog(false)
-
-  if (row.id !== '') {
-    questionnaireInfo.value.customerId = row.customerId
-    questionnaireInfo.value.customerName = row.customerName
-    questionnaireInfo.value.writerId = row.id
-    questionnaireInfo.value.writerName = row.name
+  if (list && list.length) {
+    writerNames.value = list.map((item: { customerDeptId: string; id: string }) => {
+      return {
+        customerId: item.customerDeptId,
+        writerId: item.id,
+      }
+    })
+    questionnaireInfo.value.writerName = list.map((item: { name: string }) => item.name).join(',')
+    // 填写单位
+    questionnaireInfo.value.customerName = uniqueArray(list.map((item: { customerName: string }) => item.customerName)).join(',')
+    questionnaireInfo.value.customerId = uniqueArray(list.map((item: { customerDeptId: string }) => item.customerDeptId)).join(',')
   }
   else {
     ElMessage.error('填写单位和填写人不能为空，请重新选择')
   }
 }
 
+// 清空填写人
+const clean = () => {
+  questionnaireInfo.value.writerName = ''
+  questionnaireInfo.value.customerName = ''
+  questionnaireInfo.value.customerId = ''
+  writerNames.value = []
+}
+
+// ---------------------------------------------------------------------------------------------------
+
 // 保存
 const saveQuestionnaireInfo = () => {
   let satisfactionStr = ''
@@ -109,19 +129,29 @@
     if (satisfactionStr.length === 10) {
       questionnaireInfo.value.writeTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 填写时间为当前时间
     }
-
+    const params = {
+      ...questionnaireInfo.value,
+      writerId: null, // 填写人id（单选用-多选时候新建不让传）
+      writerName: null, // 填写人名字(多选时候-新建不让传)
+      sendFlag: '2', // 是否已发送（1/2）
+      sendFlagName: '未发送', // 是否已发送（1/2）
+      customerName: null,
+      customerId: null,
+      sendDTOs: writerNames.value, // 填写人信息
+    }
     // 提交接口
-    addQuestionnaire(questionnaireInfo.value).then((res) => {
+    addQuestionnaire(params).then((res) => {
       if (res.code === 200) {
       // 提示保存成功
-        ElMessage.success('委托方满意度调查表创建并发送成功')
+        ElMessage.success('委托方满意度调查表创建成功')
 
         // 设置返回的委托方id和委托方编号
-        questionnaireInfo.value.questionnaireNo = res.data.questionnaireNo
-        questionnaireInfo.value.id = res.data.id
-        id.value = res.data.id
+        // questionnaireInfo.value.questionnaireNo = res.data.questionnaireNo
+        // questionnaireInfo.value.id = res.data.id
+        // id.value = res.data.id
 
         type.value = 'detail'
+        sendIds.value = res.data
       }
       else {
       // 提示失败信息
@@ -193,6 +223,18 @@
   router.go(-1)
 }
 
+// 点击发送
+const handleSend = () => {
+  if (sendIds && sendIds.value.length) {
+    send({ ids: sendIds.value }).then((res) => {
+      ElMessage.success('发送成功')
+    })
+  }
+  else {
+    ElMessage.warning('没有发送的单位或个人')
+  }
+}
+
 const initDialog = (params: any) => {
   // 从路由中获取参数
   type.value = params.type
@@ -205,7 +247,8 @@
       questionnaireInfo.value.senderId = userInfo.id
       questionnaireInfo.value.senderName = userInfo.name
       questionnaireInfo.value.sendTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
-
+      questionnaireInfo.value.labCode = userInfo.bizLabCode // 实验室代码
+      questionnaireInfo.value.labCodeName = userInfo.labCodeName // 实验室名称
       break
 
     case 'detail':
@@ -275,6 +318,9 @@
     <el-form ref="questionnaireFormRef" :model="questionnaireInfo" :rules="questionnaireFormRules" label-position="right" label-width="110px" border stripe>
       <detail-page title="委托方满意度调查表">
         <template #btns>
+          <el-button v-if="type === 'detail'" type="primary" @click="handleSend">
+            发送
+          </el-button>
           <el-button v-if="type !== 'detail'" type="primary" @click="saveButtonHandler">
             保存
           </el-button>
@@ -284,7 +330,6 @@
         </template>
 
         <el-row :gutter="24">
-          <!-- 第一行 第一列 -->
           <el-col :span="6">
             <el-form-item label="实验室" prop="labCode">
               <el-select v-model="questionnaireInfo.labCode" placeholder="请选择实验室" :disabled="type === 'detail'" style="width: 100%;">
@@ -292,46 +337,52 @@
               </el-select>
               <el-input v-model="questionnaireInfo.labCodeName" type="hidden" />
             </el-form-item>
-
-            <el-form-item label="填写单位" prop="customerId">
-              <el-input v-model="questionnaireInfo.customerName" :disabled="true" placeholder="选择填写人时自动填充" />
-              <el-input v-model="questionnaireInfo.customerId" type="hidden" />
-            </el-form-item>
           </el-col>
-
           <el-col :span="6">
             <el-form-item label="文件编号">
-              <el-input v-model="questionnaireInfo.questionnaireNo" placeholder="文件编号，保存后自动生成" :disabled="true" />
-            </el-form-item>
-
-            <el-form-item label="填写人" prop="writerId">
-              <el-input v-model="questionnaireInfo.writerName" :readonly="true" :disabled="true">
-                <template #append>
-                  <el-button size="small" :disabled="type === 'detail'" @click="showFilterCustomerDialog">
-                    选择
-                  </el-button>
-                </template>
-              </el-input>
-              <el-input v-model="questionnaireInfo.writerId" type="hidden" />
+              <el-input v-model="questionnaireInfo.questionnaireNo" placeholder="系统自动生成" :disabled="true" />
             </el-form-item>
           </el-col>
-
           <el-col :span="6">
             <el-form-item label="发送人">
               <el-input v-model="questionnaireInfo.senderName" :disabled="true" />
               <el-input v-model="questionnaireInfo.senderId" type="hidden" />
             </el-form-item>
-
-            <el-form-item label="填写时间">
-              <el-input v-model="questionnaireInfo.writeTime" :disabled="true" />
-            </el-form-item>
           </el-col>
-
           <el-col :span="6">
             <el-form-item label="发送时间">
               <el-input v-model="questionnaireInfo.sendTime" placeholder="保存后自动生成" :disabled="true" />
             </el-form-item>
           </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="填写人" prop="writerName" style="display: flex;">
+              <el-button size="small" type="primary" :disabled="type === 'detail'" @click="showFilterCustomerDialog">
+                {{ questionnaireInfo.writerName ? '继续添加' : '添加' }}
+              </el-button>
+              <el-button size="small" type="info" :disabled="type === 'detail'" @click="clean">
+                清空
+              </el-button>
+              <el-input v-model="questionnaireInfo.writerName" placeholder="请添加填写人" style="margin-top: 8px;" :readonly="true" :disabled="true" type="textarea" autosize>
+                <!-- <template #append>
+                  <el-button size="small" :disabled="type === 'detail'" @click="showFilterCustomerDialog">
+                    选择
+                  </el-button>
+                </template> -->
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="填写单位" prop="customerId">
+              <el-input v-model="questionnaireInfo.customerName" type="textarea" :autosize="{ minRows: 3 }" :disabled="true" placeholder="选择填写人时自动填充" />
+              <el-input v-model="questionnaireInfo.customerId" type="hidden" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="填写时间">
+              <el-input v-model="questionnaireInfo.writeTime" :disabled="true" />
+            </el-form-item>
+          </el-col>
         </el-row>
       </detail-page>
 
@@ -350,8 +401,8 @@
         </el-row>
       </table-container>
     </el-form>
-
-    <filter-customer-staff ref="refFilterCustomer" title="请选择填写单位和填写人" @record-selected="recordSelectedHandler" />
+    <!-- 单选填写人--先选委托方，再去选委托方下面的人 -->
+    <filter-customer-staff ref="refFilterCustomer" :is-multi="true" title="请选择填写单位和填写人" @record-selected="recordSelectedHandler" />
   </app-container>
 </template>
 
diff --git a/src/views/resource/customer/questionnaire/list.vue b/src/views/resource/customer/questionnaire/list.vue
index a2306ff..553e5f3 100644
--- a/src/views/resource/customer/questionnaire/list.vue
+++ b/src/views/resource/customer/questionnaire/list.vue
@@ -2,9 +2,9 @@
 <script name="QuestionnaireList" lang="ts" setup>
 import { ElMessage, dayjs } from 'element-plus'
 import type { DateModelType } from 'element-plus'
-import type{ ICustomerQuestionnaireInfo, IListQuery } from './customer-questionnaire'
+import type { ICustomerQuestionnaireInfo, IListQuery } from './customer-questionnaire'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getQuestionnaireList } from '@/api/resource/questionnaire'
+import { getQuestionnaireList, remindWorker } from '@/api/resource/questionnaire'
 
 const { proxy } = getCurrentInstance() as any
 const router = useRouter()
@@ -118,7 +118,9 @@
 }
 
 const urging = (row: ICustomerQuestionnaireInfo) => {
-  ElMessage.success(`满意度调查表 ${row.questionnaireNo} 填写消息已发送`)
+  remindWorker({ id: row.id }).then((res) => {
+    ElMessage.success(`满意度调查表 ${row.questionnaireNo} 填写消息已催办`)
+  })
 }
 
 watch(dateRangeSend, (val) => {
@@ -194,7 +196,8 @@
               <el-button size="small" type="primary" link @click="detail(row)">
                 详情
               </el-button>
-              <el-button v-if="row.writeStatus !== '已提交'" size="small" type="primary" link @click="urging(row)">
+              <!-- <el-button v-if="row.writeStatus !== '已提交'" size="small" type="primary" link @click="urging(row)"> -->
+              <el-button size="small" type="primary" link @click="urging(row)">
                 催办
               </el-button>
             </template>
diff --git a/src/views/resource/customer/situationReport/dialog/selectSuggestFormDialog.vue b/src/views/resource/customer/situationReport/dialog/selectSuggestFormDialog.vue
index 8fa636b..a491499 100644
--- a/src/views/resource/customer/situationReport/dialog/selectSuggestFormDialog.vue
+++ b/src/views/resource/customer/situationReport/dialog/selectSuggestFormDialog.vue
@@ -130,7 +130,7 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择委托方" width="65%">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择委托方意见登记表" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="clearList">
       <search-item width="162px">
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index a5508b4..9066757 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -456,7 +456,7 @@
     locationName: '', // 地点名称
     locationNo: '', // 地点编号
     labName: lab, // 所属实验室
-    limit: 20,
+    limit: 999999,
     offset: 1,
   }
   getLocationList(params).then((response) => {
diff --git a/src/views/resource/environment/voltage/edit.vue b/src/views/resource/environment/voltage/edit.vue
index b8a9290..ad03b80 100644
--- a/src/views/resource/environment/voltage/edit.vue
+++ b/src/views/resource/environment/voltage/edit.vue
@@ -58,6 +58,8 @@
 
   testUseEquipment: '', //	测试所用设备
   testUseEquipmentId: '', //		测试所用设备id
+  model: '', // 型号
+  manufactureNo: '', // 出厂编号
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
   groupCode: '', // 部门
@@ -417,6 +419,8 @@
   if (list && list.length) {
     recordForm.value.testUseEquipment = list[0].equipmentName //	测试所用设备
     recordForm.value.testUseEquipmentId = list[0].id //		测试所用设备id
+    recordForm.value.model = list[0].model //		型号
+    recordForm.value.manufactureNo = list[0].manufactureNo //		出厂编号
   }
 }
 
@@ -463,8 +467,7 @@
   // 从路由中获取参数
   type.value = params.type
   id.value = params.id !== undefined ? params.id : ''
-  status.value = params.status !== undefined ? params.status : ''
-
+  status.value = params.status
   // 默认显示第一个tab内容
   current.value = radioItems.value[0].value
   currentLabel.value = radioItems.value[0].name
@@ -517,7 +520,6 @@
     if (radioItems.value[radioItems.value.length - 1].value === 'voltage-approval') {
       radioItems.value.pop()
     }
-    console.log(radioItems.value)
   }
   else { // 非全部和草稿箱把审批详情加上
     if (radioItems.value[radioItems.value.length - 1].value !== 'voltage-approval') {
@@ -541,7 +543,7 @@
     locationName: '', // 地点名称
     locationNo: '', // 地点编号
     labName: lab, // 所属实验室
-    limit: 20,
+    limit: 999999,
     offset: 1,
   }
   getLocationList(params).then((response) => {
@@ -618,6 +620,20 @@
       <detail-block v-if="current === 'voltage-basic'">
         <el-row :gutter="24">
           <el-col :span="6">
+            <el-form-item label="实验室" prop="labCode">
+              <el-select v-model="recordForm.labCode" placeholder="请选择实验室" :disabled="type === 'detail'" style="width: 100%;" @change="changeLab">
+                <el-option v-for="dict in labCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="recordForm.groupCode" placeholder="请选择部门" :disabled="type === 'detail'" style="width: 100%;">
+                <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="记录编号">
               <el-input v-model="recordForm.recordNo" placeholder="系统自动生成" :disabled="true" />
             </el-form-item>
@@ -651,7 +667,7 @@
             <el-form-item label="测试地点" prop="testLocation">
               <!-- <el-input v-model="recordForm.testLocation" :placeholder="type === 'detail' ? ' ' : '请输入测试地点'" :disabled="type === 'detail'" /> -->
               <el-autocomplete
-                v-model="detailRequire.testLocation"
+                v-model="recordForm.testLocation"
                 :fetch-suggestions="querySearchTestLocation"
                 placeholder="工作间名称"
                 clearable
@@ -669,27 +685,22 @@
               </el-input>
             </el-form-item>
           </el-col>
-
           <el-col :span="6">
+            <el-form-item label="型号" prop="model">
+              <el-input v-model="recordForm.model" :placeholder="type === 'detail' ? ' ' : '型号'" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号" prop="manufactureNo">
+              <el-input v-model="recordForm.manufactureNo" :placeholder="type === 'detail' ? ' ' : '出厂编号'" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
             <el-form-item label="测试依据" prop="testBasis">
               <el-input v-model="recordForm.testBasis" :placeholder="type === 'detail' ? ' ' : '请输入测试依据'" :disabled="type === 'detail'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="实验室" prop="labCode">
-              <el-select v-model="recordForm.labCode" placeholder="请选择实验室" :disabled="type === 'detail'" style="width: 100%;" @change="changeLab">
-                <el-option v-for="dict in labCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="recordForm.groupCode" placeholder="请选择部门" :disabled="type === 'detail'" style="width: 100%;">
-                <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="电源电压空载(V)" prop="powerVoltageNoLoad">
               <el-input v-model="recordForm.powerVoltageNoLoad" :placeholder="type === 'detail' ? ' ' : '请输入电源电压空载'" :disabled="type === 'detail'" />
             </el-form-item>
diff --git a/src/views/resource/environment/voltage/list.vue b/src/views/resource/environment/voltage/list.vue
index 001a6d6..bce6ec9 100644
--- a/src/views/resource/environment/voltage/list.vue
+++ b/src/views/resource/environment/voltage/list.vue
@@ -52,33 +52,35 @@
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '测试时间', value: 'testTime', align: 'center', width: '120' },
-  { text: '测试地点', value: 'testLocation', align: 'center', width: '200' },
-  { text: '实验室', value: 'labCodeName', align: 'center' },
-  { text: '部门', value: 'groupCodeName', align: 'center' },
-  { text: '测试所用设备', value: 'testUseEquipment', align: 'center', width: '200' },
-  { text: '测试依据', value: 'testBasis', align: 'center' },
+  { text: '测试地点', value: 'testLocation', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '测试所用设备', value: 'testUseEquipment', align: 'center' },
+  { text: '型号', value: 'model', align: 'center' },
+  { text: '出厂编号', value: 'manufactureNo', align: 'center' },
+  { text: '测试依据', value: 'testBasis', align: 'center', width: '220' },
   {
     text: '电源电压(V)',
     value: '',
     align: 'center',
-    width: '120',
+    width: '220',
     children: [
-      { text: '空载', value: 'powerVoltageNoLoad', align: 'center', width: '60' },
-      { text: '加载', value: 'powerVoltageLoad', align: 'center', width: '60' },
+      { text: '空载', value: 'powerVoltageNoLoad', align: 'center', width: '120' },
+      { text: '加载', value: 'powerVoltageLoad', align: 'center', width: '120' },
     ],
   },
   {
     text: '零地电压(V)',
     value: '',
     align: 'center',
-    width: '120',
+    width: '220',
     children: [
-      { text: '空载', value: 'zeroVoltageNoLoad', align: 'center', width: '60' },
-      { text: '加载', value: 'zeroVoltageLoad', align: 'center', width: '60' },
+      { text: '空载', value: 'zeroVoltageNoLoad', align: 'center', width: '120' },
+      { text: '加载', value: 'zeroVoltageLoad', align: 'center', width: '120' },
     ],
   },
-  { text: '结论', value: 'conclusion', align: 'center', width: '160' },
-  { text: '测试人', value: 'createUserName', align: 'center', width: '120' },
+  { text: '结论', value: 'conclusion', align: 'center' },
+  { text: '测试人', value: 'createUserName', align: 'center' },
   { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '100' },
 ])
 const list = ref<Array<IVoltageRecord>>([]) // 表格数据
diff --git a/src/views/resource/environment/voltage/voltage-interface.ts b/src/views/resource/environment/voltage/voltage-interface.ts
index 5afb1fe..cd7c137 100644
--- a/src/views/resource/environment/voltage/voltage-interface.ts
+++ b/src/views/resource/environment/voltage/voltage-interface.ts
@@ -36,6 +36,8 @@
 
   testUseEquipment: string //	测试所用设备
   testUseEquipmentId: string //		测试所用设备id
+  model: string // 型号
+  manufactureNo: string // 出厂编号
   labCode: string // 实验室
   labCodeName: string // 实验室名称
   groupCode: string // 部门

diff --git a/src/api/resource/questionnaire.ts b/src/api/resource/questionnaire.ts
index f40c875..9e55dc7 100644
--- a/src/api/resource/questionnaire.ts
+++ b/src/api/resource/questionnaire.ts
@@ -17,3 +17,22 @@
     data,
   })
 }
+
+// 发送
+export function send(data: { ids: string[] }) {
+  return request({
+    url: `${prefix}/questionnaire/send`,
+    method: 'post',
+    data,
+  })
+}
+
+remindWorker
+// 催办
+export function remindWorker(data: { id: string }) {
+  return request({
+    url: `${prefix}/questionnaire/remindWorker`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/resource/common/filterConsumableCheck.vue b/src/views/resource/common/filterConsumableCheck.vue
new file mode 100644
index 0000000..14f6d0a
--- /dev/null
+++ b/src/views/resource/common/filterConsumableCheck.vue
@@ -0,0 +1,198 @@
+<!-- 选择物资验收记录 -->
+<script lang="ts" setup name="FilterConsumableCheck">
+import { ElMessage } from 'element-plus'
+import type { Ref } from 'vue'
+import { ref } from 'vue'
+import dayjs from 'dayjs'
+import type { DateModelType } from 'element-plus'
+import { getLocationList } from '@/api/business/taskMeasure/measureData'
+import { getGoodsCheckList } from '@/api/resource/supplierConsumable'
+import { getStaffList } from '@/api/resource/register'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { getCustomerInfoList } from '@/api/resource/customer'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  recordNo: '', // 记录单编号
+  createDept: '',
+  createUserName: '', // 创建人
+  acceptTimeStart: '', // 创建时间-起始
+  acceptTimeEnd: '', // 创建时间-结束
+  approvalStatus: '0', // 审批状态
+  formId: SCHEDULE.CHECK_MATERIAL_RECORD_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
+  offset: 1,
+  limit: 20,
+})
+// 多选选中的内容
+const checkoutList = ref([])
+const loadingTable = ref(false)
+const list = ref([]) // 表格数据
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '文件编号', value: 'recordNo', align: 'center', width: '200' },
+  { text: '物资名称', value: 'goodsName', align: 'center' },
+  { text: '规格型号', value: 'goodsModel', align: 'center' },
+  { text: '验收部门', value: 'createDept', align: 'center', width: '160' },
+  { text: '验收人', value: 'createUserName', align: 'center', width: '120' },
+  { text: '验收时间', value: 'createTime', align: 'center', width: '120' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '100' },
+])
+const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
+
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getGoodsCheckList(listQuery.value).then((response) => {
+    if (response.code === 200) {
+      list.value = response.data.rows.map((item: any) => {
+        return {
+          ...item,
+          createTime: item.createTime!.length > 16 ? item.createTime!.substring(0, 10) : '',
+        }
+      })
+      total.value = parseInt(response.data.total)
+    }
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
+}
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    recordNo: '', // 记录单编号
+    createDept: '',
+    createUserName: '', // 创建人
+    acceptTimeStart: '', // 创建时间-起始
+    acceptTimeEnd: '', // 创建时间-结束
+    approvalStatus: '0', // 审批状态
+    formId: SCHEDULE.CHECK_MATERIAL_RECORD_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
+    offset: 1,
+    limit: 20,
+  }
+  dateRange.value = ['', '']
+  fetchData()
+}
+// 搜索
+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
+  }
+  search()
+}
+// 点击确定
+const confirmSelect = (row: any) => {
+  emits('confirm', [row])
+  dialogFormVisible.value = false
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData()
+}
+
+watch(dateRange, (val) => {
+  if (val) {
+    listQuery.value.acceptTimeStart = dayjs(val[0]).format('YYYY-MM-DD') === 'Invalid Date' ? '' : dayjs(val[0]).format('YYYY-MM-DD')
+    listQuery.value.acceptTimeEnd = dayjs(val[1]).format('YYYY-MM-DD') === 'Invalid Date' ? '' : dayjs(val[1]).format('YYYY-MM-DD')
+  }
+  else {
+    listQuery.value.acceptTimeStart = ''
+    listQuery.value.acceptTimeEnd = ''
+  }
+})
+
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择工作间" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input v-model="listQuery.recordNo" placeholder="文件编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.createDept" placeholder="验收部门" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.createUserName" placeholder="验收人" clearable />
+      </search-item>
+      <search-item>
+        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="验收时间（开始）" end-placeholder="验收时间（结束）" />
+      </search-item>
+    </search-area>
+
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        :height="520"
+        :is-show-single-select-button="true"
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column fixed="right" label="操作" align="center" width="130">
+            <template #default="{ row }">
+              <el-button size="small" type="primary" @click="confirmSelect(row)">
+                选定
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <!-- <el-button type="primary" @click="confirmSelect">确认</el-button> -->
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/resource/common/filterCustomerStaff.vue b/src/views/resource/common/filterCustomerStaff.vue
index 610bf51..fd40e61 100644
--- a/src/views/resource/common/filterCustomerStaff.vue
+++ b/src/views/resource/common/filterCustomerStaff.vue
@@ -1,5 +1,6 @@
 <!-- 筛选系统用户弹窗 -->
 <script name="FilterCustomerStaff" lang="ts" setup>
+import { ElMessage } from 'element-plus'
 import type { ICustomerFilter, ICustomerTree } from './common-interface'
 import type { ICustomerInfo } from '@/views/resource/customer/info/customer-info'
 import type { IlistQueryType } from '@/views/system/user/user-interface'
@@ -7,11 +8,15 @@
 import { getCustomerInfoList } from '@/api/resource/customer'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 
-defineProps({
+const props = defineProps({
   title: {
     type: String,
     default: '请选择',
   },
+  isMulti: { // 是否多选
+    type: Boolean,
+    default: false,
+  },
 })
 
 const emit = defineEmits(['recordSelected'])
@@ -20,9 +25,10 @@
   children: 'children',
   label: 'customerName',
 }
-
+const tableLoading = ref(false)
 // 定义变量
 const customerIdSelected = ref<string>('')
+const customerDeptIdSelected = ref<string>('')
 const customerNameSelected = ref<string>('')
 const disabledCustomerName = ref(false) // 委托方筛选是否禁用
 const getCustomerName = ref('') // 委托方
@@ -44,7 +50,9 @@
   endTime: '',
   deptType: '',
 })
+const tableRef = ref()
 const sysUserList = ref([])
+const checkoutList = ref([]) // 多选
 const total = ref<number>(0) // 数据总条数
 const columns = ref <Array<TableColumn>>([
   { text: '账号', value: 'account', align: 'center' },
@@ -53,9 +61,13 @@
 ]) // 表头
 
 const customerTree = ref<Array<ICustomerTree>>([])
-
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
 // 查询用户列表
 const getSysUserList = () => {
+  tableLoading.value = true
   getAllUserList(sysUserQuery.value).then((res) => {
     if (res.code === 200) {
       sysUserList.value = res.data.rows.map((item: any) => {
@@ -63,10 +75,12 @@
           ...item,
           customerId: customerIdSelected.value,
           customerName: customerNameSelected.value,
+          customerDeptId: customerDeptIdSelected,
         }
       })
       total.value = Number(res.data.total)
     }
+    tableLoading.value = false
   })
 }
 
@@ -101,17 +115,25 @@
 
   // 赋值选中的委托方
   customerIdSelected.value = data.id
+  customerDeptIdSelected.value = data.deptId
   customerNameSelected.value = data.customerName
 
   getSysUserList()
 }
 
-// 选中用户
+// 单选选定
 const selectSingleUser = (row: Object) => {
   emit('recordSelected', row)
 }
 
-const showOrHideFilterDialog = (show: boolean, customerName = '', disabledCustomerNameParam = false) => {
+/**
+ * 弹窗显隐
+ * @param show 控制弹窗显隐
+ * @param customerName 委托方名称
+ * @param disabledCustomerNameParam 禁止修改委托方名称
+ * @param writerNames 委托方意见登记表--[]则清空原有的多选
+ */
+const showOrHideFilterDialog = (show: boolean, customerName = '', disabledCustomerNameParam = false, writerNames = []) => {
   if (show === false) {
     customerQuery.value.customerName = ''
     customerQuery.value.approvalStatus = '0'
@@ -136,6 +158,21 @@
   }
 
   showFilterDialog.value = show
+
+  if (!writerNames.length && show && tableRef.value) {
+    console.log('清除多选')
+    tableRef.value.clearMulti()
+  }
+}
+
+// 多选确定
+const submitEquipmentSelected = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('至少选中一条数据')
+    return false
+  }
+  emit('recordSelected', checkoutList.value)
+  showOrHideFilterDialog(false)
 }
 
 defineExpose({
@@ -176,13 +213,18 @@
         </search-area>
 
         <!-- 表格数据展示 -->
-        <table-container :title-show="false">
+        <table-container v-loading="tableLoading" :title-show="false">
           <!-- 表格区域 -->
           <normal-table
             id="sysUserFilter"
+            ref="tableRef"
             :data="sysUserList" :total="total" :columns="columns"
             :query="{ limit: sysUserQuery.limit, offset: sysUserQuery.offset }"
+            is-showmulti-select
+            :is-multi="isMulti"
+            :height="520"
             @change="changePage"
+            @multi-select="handleSelectionChange"
           >
             <template #preColumns>
               <el-table-column label="序号" width="55" align="center">
@@ -191,7 +233,7 @@
                 </template>
               </el-table-column>
             </template>
-            <template #columns>
+            <template v-if="!props.isMulti" #columns>
               <el-table-column fixed="right" label="操作" align="center" width="130">
                 <template #default="{ row }">
                   <el-button size="small" type="primary" @click="selectSingleUser(row)">
@@ -204,6 +246,15 @@
         </table-container>
       </div>
     </div>
+    <!-- 多选 -->
+    <template v-if="props.isMulti" #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitEquipmentSelected">
+          确定
+        </el-button>
+        <el-button @click="showOrHideFilterDialog(false)">取消</el-button>
+      </span>
+    </template>
   </el-dialog>
 </template>
 
diff --git a/src/views/resource/common/filterSysUser.vue b/src/views/resource/common/filterSysUser.vue
index 71ec72d..4efa44f 100644
--- a/src/views/resource/common/filterSysUser.vue
+++ b/src/views/resource/common/filterSysUser.vue
@@ -1,7 +1,8 @@
 <!-- 筛选系统用户弹窗 -->
 <script name="FilterSysUser" lang="ts" setup>
+import { ElMessage } from 'element-plus'
 import type { IlistQueryType, addInfo } from '@/views/system/user/user-interface'
-import { getUserList } from '@/api/system/user'
+import { getAllUserList } from '@/api/system/user'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
 
@@ -11,6 +12,10 @@
     type: Boolean,
     default: true,
   },
+  isMulti: { // 是否多选
+    type: Boolean,
+    default: false,
+  },
 })
 const emit = defineEmits(['recordSelected'])
 const tableLoading = ref(false)
@@ -28,6 +33,7 @@
 })
 const pid = ref<string>('')
 const sysUserList = ref<Array<addInfo>>([])
+const checkoutList = ref<Array<addInfo>>([]) // 多选
 const total = ref<number>(0) // 数据总条数
 const columns = ref <Array<TableColumn>>([
   { text: '账号', value: 'account', align: 'center' },
@@ -35,7 +41,10 @@
   { text: '部门', value: 'deptName', align: 'center' },
   { text: '人员类别', value: 'avatarName', align: 'center' },
 ]) // 表头
-
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
 const staffTypeMap = ref({}) as any// 人员类别
 // 获取字典
 const fetchDict = async () => {
@@ -48,7 +57,7 @@
 
 const getSysUserList = () => {
   tableLoading.value = true
-  getUserList(searchQuery).then((res) => {
+  getAllUserList(searchQuery).then((res) => {
     if (res.code === 200) {
       sysUserList.value = res.data.rows.map((item: { avatar: string }) => {
         return {
@@ -62,6 +71,19 @@
   })
 }
 
+// 重置
+const reset = () => {
+  searchQuery.keywords = ''
+  searchQuery.deptId = ''
+  searchQuery.offset = 1
+  searchQuery.limit = 20
+  searchQuery.sort = ''
+  searchQuery.beginTime = ''
+  searchQuery.endTime = ''
+  searchQuery.deptType = ''
+  getSysUserList()
+}
+
 // 逻辑
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -73,10 +95,12 @@
   getSysUserList()
 }
 
+// 单选确定
 const selectSingleUser = (row: addInfo) => {
   emit('recordSelected', row)
 }
 
+// 取消
 const showOrHideFilterDialog = (show: boolean, deptId = '') => {
   if (show === false) {
     searchQuery.keywords = ''
@@ -95,6 +119,16 @@
   showFilterDialog.value = show
 }
 
+// 多选确定
+const submitEquipmentSelected = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('至少选中一条数据')
+    return false
+  }
+  emit('recordSelected', checkoutList.value)
+  showOrHideFilterDialog(false)
+}
+
 defineExpose({
   showOrHideFilterDialog,
 })
@@ -102,7 +136,7 @@
 
 <template>
   <el-dialog v-model="showFilterDialog" title="选择用户" :append-to-body="true" :close-on-click-modal="false" top="10vh">
-    <search-area :need-clear="false" @search="getSysUserList">
+    <search-area :need-clear="true" @search="getSysUserList" @clear="reset">
       <search-item>
         <el-input v-model="searchQuery.keywords" placeholder="姓名" clearable />
       </search-item>
@@ -119,7 +153,11 @@
         v-loading="tableLoading" :data="sysUserList" :total="total"
         :columns="columns"
         :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+        is-showmulti-select
+        :is-multi="isMulti"
+        :height="520"
         @change="changePage"
+        @multi-select="handleSelectionChange"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
@@ -128,7 +166,8 @@
             </template>
           </el-table-column>
         </template>
-        <template #columns>
+        <!-- 单选 -->
+        <template v-if="!props.isMulti" #columns>
           <el-table-column fixed="right" label="操作" align="center" width="130">
             <template #default="{ row }">
               <el-button size="small" type="primary" @click="selectSingleUser(row)">
@@ -139,5 +178,14 @@
         </template>
       </normal-table>
     </table-container>
+    <!-- 多选 -->
+    <template v-if="props.isMulti" #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitEquipmentSelected">
+          确定
+        </el-button>
+        <el-button @click="showOrHideFilterDialog(false)">取消</el-button>
+      </span>
+    </template>
   </el-dialog>
 </template>
diff --git a/src/views/resource/customer/questionnaire/customer-questionnaire.ts b/src/views/resource/customer/questionnaire/customer-questionnaire.ts
index 7391891..a3b40fc 100644
--- a/src/views/resource/customer/questionnaire/customer-questionnaire.ts
+++ b/src/views/resource/customer/questionnaire/customer-questionnaire.ts
@@ -39,6 +39,8 @@
   itemTen: string
   score?: string
   [key: string]: string | undefined
+  sendFlag: string // 是否已发送（1/2）
+  sendFlagName: string // 是否已发送（1/2）
 }
 
 export interface ICustomerRateColumn {
diff --git a/src/views/resource/customer/questionnaire/detail.vue b/src/views/resource/customer/questionnaire/detail.vue
index 6560afd..553ebb4 100644
--- a/src/views/resource/customer/questionnaire/detail.vue
+++ b/src/views/resource/customer/questionnaire/detail.vue
@@ -1,12 +1,14 @@
 <!-- 委托方满意度调查表详情 -->
 <script name="QuestionnaireDetail" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
-import type{ ICustomerQuestionnaireInfo, ICustomerRateColumn } from './customer-questionnaire'
+import type { ICustomerQuestionnaireInfo, ICustomerRateColumn } from './customer-questionnaire'
 import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
 import useUserStore from '@/store/modules/user'
-import { addQuestionnaire } from '@/api/resource/questionnaire'
+import FilterSysUser from '@/views/resource/common/filterSysUser.vue'
+import { addQuestionnaire, send } from '@/api/resource/questionnaire'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import { getDictByCode } from '@/api/system/dict'
+import { uniqueArray } from '@/utils/Array'
 
 // 从路由中传过来的参数
 const type = ref<string>('')
@@ -18,7 +20,7 @@
 
 const questionnaireFormRef = ref()
 const refFilterCustomer = ref()
-
+const sendIds = ref<string[]>([]) // 发送的参数
 const questionnaireInfo = ref<ICustomerQuestionnaireInfo>({
   id: '',
   customerId: '',
@@ -31,8 +33,8 @@
   senderId: '',
   senderName: '',
   sendTime: '',
-  writerId: '',
-  writerName: '',
+  writerId: '', // 填写人id（单选用-新建不让传）
+  writerName: '', // 填写人名字(多选时候-新建不让传)
   writeTime: '',
   writeStatus: '',
   itemOne: '',
@@ -45,12 +47,15 @@
   itemEight: '',
   itemNine: '',
   itemTen: '',
+
+  sendFlag: '', // 是否已发送（1/2）
+  sendFlagName: '', // 是否已发送（1/2）
 })
 
 const questionnaireFormRules = ref({
-  labCode: [{ required: true, message: '实验室不能为空，请选择', trigger: ['change', 'blur'] }],
-  customerId: [{ required: true, message: '填写单位不能为空，请选择', trigger: 'change' }],
-  writerId: [{ required: true, message: '填写人不能为空，请选择', trigger: 'change' }],
+  labCode: [{ required: true, message: '实验室不能为空', trigger: ['change', 'blur'] }],
+  customerId: [{ required: true, message: '填写单位不能为空', trigger: 'change' }],
+  writerName: [{ required: true, message: '填写人不能为空', trigger: 'change' }],
 }) // 表单验证规则
 
 // 字典值
@@ -71,28 +76,43 @@
   { index: 10, text: '10、对所提供的计量保障是否满意', value: 0, attributeName: 'itemTen' },
 ])
 
-// 逻辑
-
-// 显示筛选填写用户和单位的弹窗
+// ---------------------------------------------多选填写人----------------------------------------------
+const writerNames = ref<{ customerId: string; writerId: string }[]>([]) // 选择的填写人数组
+// 点击选择填写人
 const showFilterCustomerDialog = () => {
-  refFilterCustomer.value.showOrHideFilterDialog(true)
+  refFilterCustomer.value.showOrHideFilterDialog(true, '', false, writerNames.value)
 }
 
-// 返回选定结果
-const recordSelectedHandler = (row: any) => {
+// 选定填写人
+const recordSelectedHandler = (list: any) => {
   refFilterCustomer.value.showOrHideFilterDialog(false)
-
-  if (row.id !== '') {
-    questionnaireInfo.value.customerId = row.customerId
-    questionnaireInfo.value.customerName = row.customerName
-    questionnaireInfo.value.writerId = row.id
-    questionnaireInfo.value.writerName = row.name
+  if (list && list.length) {
+    writerNames.value = list.map((item: { customerDeptId: string; id: string }) => {
+      return {
+        customerId: item.customerDeptId,
+        writerId: item.id,
+      }
+    })
+    questionnaireInfo.value.writerName = list.map((item: { name: string }) => item.name).join(',')
+    // 填写单位
+    questionnaireInfo.value.customerName = uniqueArray(list.map((item: { customerName: string }) => item.customerName)).join(',')
+    questionnaireInfo.value.customerId = uniqueArray(list.map((item: { customerDeptId: string }) => item.customerDeptId)).join(',')
   }
   else {
     ElMessage.error('填写单位和填写人不能为空，请重新选择')
   }
 }
 
+// 清空填写人
+const clean = () => {
+  questionnaireInfo.value.writerName = ''
+  questionnaireInfo.value.customerName = ''
+  questionnaireInfo.value.customerId = ''
+  writerNames.value = []
+}
+
+// ---------------------------------------------------------------------------------------------------
+
 // 保存
 const saveQuestionnaireInfo = () => {
   let satisfactionStr = ''
@@ -109,19 +129,29 @@
     if (satisfactionStr.length === 10) {
       questionnaireInfo.value.writeTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 填写时间为当前时间
     }
-
+    const params = {
+      ...questionnaireInfo.value,
+      writerId: null, // 填写人id（单选用-多选时候新建不让传）
+      writerName: null, // 填写人名字(多选时候-新建不让传)
+      sendFlag: '2', // 是否已发送（1/2）
+      sendFlagName: '未发送', // 是否已发送（1/2）
+      customerName: null,
+      customerId: null,
+      sendDTOs: writerNames.value, // 填写人信息
+    }
     // 提交接口
-    addQuestionnaire(questionnaireInfo.value).then((res) => {
+    addQuestionnaire(params).then((res) => {
       if (res.code === 200) {
       // 提示保存成功
-        ElMessage.success('委托方满意度调查表创建并发送成功')
+        ElMessage.success('委托方满意度调查表创建成功')
 
         // 设置返回的委托方id和委托方编号
-        questionnaireInfo.value.questionnaireNo = res.data.questionnaireNo
-        questionnaireInfo.value.id = res.data.id
-        id.value = res.data.id
+        // questionnaireInfo.value.questionnaireNo = res.data.questionnaireNo
+        // questionnaireInfo.value.id = res.data.id
+        // id.value = res.data.id
 
         type.value = 'detail'
+        sendIds.value = res.data
       }
       else {
       // 提示失败信息
@@ -193,6 +223,18 @@
   router.go(-1)
 }
 
+// 点击发送
+const handleSend = () => {
+  if (sendIds && sendIds.value.length) {
+    send({ ids: sendIds.value }).then((res) => {
+      ElMessage.success('发送成功')
+    })
+  }
+  else {
+    ElMessage.warning('没有发送的单位或个人')
+  }
+}
+
 const initDialog = (params: any) => {
   // 从路由中获取参数
   type.value = params.type
@@ -205,7 +247,8 @@
       questionnaireInfo.value.senderId = userInfo.id
       questionnaireInfo.value.senderName = userInfo.name
       questionnaireInfo.value.sendTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
-
+      questionnaireInfo.value.labCode = userInfo.bizLabCode // 实验室代码
+      questionnaireInfo.value.labCodeName = userInfo.labCodeName // 实验室名称
       break
 
     case 'detail':
@@ -275,6 +318,9 @@
     <el-form ref="questionnaireFormRef" :model="questionnaireInfo" :rules="questionnaireFormRules" label-position="right" label-width="110px" border stripe>
       <detail-page title="委托方满意度调查表">
         <template #btns>
+          <el-button v-if="type === 'detail'" type="primary" @click="handleSend">
+            发送
+          </el-button>
           <el-button v-if="type !== 'detail'" type="primary" @click="saveButtonHandler">
             保存
           </el-button>
@@ -284,7 +330,6 @@
         </template>
 
         <el-row :gutter="24">
-          <!-- 第一行 第一列 -->
           <el-col :span="6">
             <el-form-item label="实验室" prop="labCode">
               <el-select v-model="questionnaireInfo.labCode" placeholder="请选择实验室" :disabled="type === 'detail'" style="width: 100%;">
@@ -292,46 +337,52 @@
               </el-select>
               <el-input v-model="questionnaireInfo.labCodeName" type="hidden" />
             </el-form-item>
-
-            <el-form-item label="填写单位" prop="customerId">
-              <el-input v-model="questionnaireInfo.customerName" :disabled="true" placeholder="选择填写人时自动填充" />
-              <el-input v-model="questionnaireInfo.customerId" type="hidden" />
-            </el-form-item>
           </el-col>
-
           <el-col :span="6">
             <el-form-item label="文件编号">
-              <el-input v-model="questionnaireInfo.questionnaireNo" placeholder="文件编号，保存后自动生成" :disabled="true" />
-            </el-form-item>
-
-            <el-form-item label="填写人" prop="writerId">
-              <el-input v-model="questionnaireInfo.writerName" :readonly="true" :disabled="true">
-                <template #append>
-                  <el-button size="small" :disabled="type === 'detail'" @click="showFilterCustomerDialog">
-                    选择
-                  </el-button>
-                </template>
-              </el-input>
-              <el-input v-model="questionnaireInfo.writerId" type="hidden" />
+              <el-input v-model="questionnaireInfo.questionnaireNo" placeholder="系统自动生成" :disabled="true" />
             </el-form-item>
           </el-col>
-
           <el-col :span="6">
             <el-form-item label="发送人">
               <el-input v-model="questionnaireInfo.senderName" :disabled="true" />
               <el-input v-model="questionnaireInfo.senderId" type="hidden" />
             </el-form-item>
-
-            <el-form-item label="填写时间">
-              <el-input v-model="questionnaireInfo.writeTime" :disabled="true" />
-            </el-form-item>
           </el-col>
-
           <el-col :span="6">
             <el-form-item label="发送时间">
               <el-input v-model="questionnaireInfo.sendTime" placeholder="保存后自动生成" :disabled="true" />
             </el-form-item>
           </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="填写人" prop="writerName" style="display: flex;">
+              <el-button size="small" type="primary" :disabled="type === 'detail'" @click="showFilterCustomerDialog">
+                {{ questionnaireInfo.writerName ? '继续添加' : '添加' }}
+              </el-button>
+              <el-button size="small" type="info" :disabled="type === 'detail'" @click="clean">
+                清空
+              </el-button>
+              <el-input v-model="questionnaireInfo.writerName" placeholder="请添加填写人" style="margin-top: 8px;" :readonly="true" :disabled="true" type="textarea" autosize>
+                <!-- <template #append>
+                  <el-button size="small" :disabled="type === 'detail'" @click="showFilterCustomerDialog">
+                    选择
+                  </el-button>
+                </template> -->
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="填写单位" prop="customerId">
+              <el-input v-model="questionnaireInfo.customerName" type="textarea" :autosize="{ minRows: 3 }" :disabled="true" placeholder="选择填写人时自动填充" />
+              <el-input v-model="questionnaireInfo.customerId" type="hidden" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="填写时间">
+              <el-input v-model="questionnaireInfo.writeTime" :disabled="true" />
+            </el-form-item>
+          </el-col>
         </el-row>
       </detail-page>
 
@@ -350,8 +401,8 @@
         </el-row>
       </table-container>
     </el-form>
-
-    <filter-customer-staff ref="refFilterCustomer" title="请选择填写单位和填写人" @record-selected="recordSelectedHandler" />
+    <!-- 单选填写人--先选委托方，再去选委托方下面的人 -->
+    <filter-customer-staff ref="refFilterCustomer" :is-multi="true" title="请选择填写单位和填写人" @record-selected="recordSelectedHandler" />
   </app-container>
 </template>
 
diff --git a/src/views/resource/customer/questionnaire/list.vue b/src/views/resource/customer/questionnaire/list.vue
index a2306ff..553e5f3 100644
--- a/src/views/resource/customer/questionnaire/list.vue
+++ b/src/views/resource/customer/questionnaire/list.vue
@@ -2,9 +2,9 @@
 <script name="QuestionnaireList" lang="ts" setup>
 import { ElMessage, dayjs } from 'element-plus'
 import type { DateModelType } from 'element-plus'
-import type{ ICustomerQuestionnaireInfo, IListQuery } from './customer-questionnaire'
+import type { ICustomerQuestionnaireInfo, IListQuery } from './customer-questionnaire'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getQuestionnaireList } from '@/api/resource/questionnaire'
+import { getQuestionnaireList, remindWorker } from '@/api/resource/questionnaire'
 
 const { proxy } = getCurrentInstance() as any
 const router = useRouter()
@@ -118,7 +118,9 @@
 }
 
 const urging = (row: ICustomerQuestionnaireInfo) => {
-  ElMessage.success(`满意度调查表 ${row.questionnaireNo} 填写消息已发送`)
+  remindWorker({ id: row.id }).then((res) => {
+    ElMessage.success(`满意度调查表 ${row.questionnaireNo} 填写消息已催办`)
+  })
 }
 
 watch(dateRangeSend, (val) => {
@@ -194,7 +196,8 @@
               <el-button size="small" type="primary" link @click="detail(row)">
                 详情
               </el-button>
-              <el-button v-if="row.writeStatus !== '已提交'" size="small" type="primary" link @click="urging(row)">
+              <!-- <el-button v-if="row.writeStatus !== '已提交'" size="small" type="primary" link @click="urging(row)"> -->
+              <el-button size="small" type="primary" link @click="urging(row)">
                 催办
               </el-button>
             </template>
diff --git a/src/views/resource/customer/situationReport/dialog/selectSuggestFormDialog.vue b/src/views/resource/customer/situationReport/dialog/selectSuggestFormDialog.vue
index 8fa636b..a491499 100644
--- a/src/views/resource/customer/situationReport/dialog/selectSuggestFormDialog.vue
+++ b/src/views/resource/customer/situationReport/dialog/selectSuggestFormDialog.vue
@@ -130,7 +130,7 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择委托方" width="65%">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择委托方意见登记表" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="clearList">
       <search-item width="162px">
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index a5508b4..9066757 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -456,7 +456,7 @@
     locationName: '', // 地点名称
     locationNo: '', // 地点编号
     labName: lab, // 所属实验室
-    limit: 20,
+    limit: 999999,
     offset: 1,
   }
   getLocationList(params).then((response) => {
diff --git a/src/views/resource/environment/voltage/edit.vue b/src/views/resource/environment/voltage/edit.vue
index b8a9290..ad03b80 100644
--- a/src/views/resource/environment/voltage/edit.vue
+++ b/src/views/resource/environment/voltage/edit.vue
@@ -58,6 +58,8 @@
 
   testUseEquipment: '', //	测试所用设备
   testUseEquipmentId: '', //		测试所用设备id
+  model: '', // 型号
+  manufactureNo: '', // 出厂编号
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
   groupCode: '', // 部门
@@ -417,6 +419,8 @@
   if (list && list.length) {
     recordForm.value.testUseEquipment = list[0].equipmentName //	测试所用设备
     recordForm.value.testUseEquipmentId = list[0].id //		测试所用设备id
+    recordForm.value.model = list[0].model //		型号
+    recordForm.value.manufactureNo = list[0].manufactureNo //		出厂编号
   }
 }
 
@@ -463,8 +467,7 @@
   // 从路由中获取参数
   type.value = params.type
   id.value = params.id !== undefined ? params.id : ''
-  status.value = params.status !== undefined ? params.status : ''
-
+  status.value = params.status
   // 默认显示第一个tab内容
   current.value = radioItems.value[0].value
   currentLabel.value = radioItems.value[0].name
@@ -517,7 +520,6 @@
     if (radioItems.value[radioItems.value.length - 1].value === 'voltage-approval') {
       radioItems.value.pop()
     }
-    console.log(radioItems.value)
   }
   else { // 非全部和草稿箱把审批详情加上
     if (radioItems.value[radioItems.value.length - 1].value !== 'voltage-approval') {
@@ -541,7 +543,7 @@
     locationName: '', // 地点名称
     locationNo: '', // 地点编号
     labName: lab, // 所属实验室
-    limit: 20,
+    limit: 999999,
     offset: 1,
   }
   getLocationList(params).then((response) => {
@@ -618,6 +620,20 @@
       <detail-block v-if="current === 'voltage-basic'">
         <el-row :gutter="24">
           <el-col :span="6">
+            <el-form-item label="实验室" prop="labCode">
+              <el-select v-model="recordForm.labCode" placeholder="请选择实验室" :disabled="type === 'detail'" style="width: 100%;" @change="changeLab">
+                <el-option v-for="dict in labCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="recordForm.groupCode" placeholder="请选择部门" :disabled="type === 'detail'" style="width: 100%;">
+                <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="记录编号">
               <el-input v-model="recordForm.recordNo" placeholder="系统自动生成" :disabled="true" />
             </el-form-item>
@@ -651,7 +667,7 @@
             <el-form-item label="测试地点" prop="testLocation">
               <!-- <el-input v-model="recordForm.testLocation" :placeholder="type === 'detail' ? ' ' : '请输入测试地点'" :disabled="type === 'detail'" /> -->
               <el-autocomplete
-                v-model="detailRequire.testLocation"
+                v-model="recordForm.testLocation"
                 :fetch-suggestions="querySearchTestLocation"
                 placeholder="工作间名称"
                 clearable
@@ -669,27 +685,22 @@
               </el-input>
             </el-form-item>
           </el-col>
-
           <el-col :span="6">
+            <el-form-item label="型号" prop="model">
+              <el-input v-model="recordForm.model" :placeholder="type === 'detail' ? ' ' : '型号'" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号" prop="manufactureNo">
+              <el-input v-model="recordForm.manufactureNo" :placeholder="type === 'detail' ? ' ' : '出厂编号'" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
             <el-form-item label="测试依据" prop="testBasis">
               <el-input v-model="recordForm.testBasis" :placeholder="type === 'detail' ? ' ' : '请输入测试依据'" :disabled="type === 'detail'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="实验室" prop="labCode">
-              <el-select v-model="recordForm.labCode" placeholder="请选择实验室" :disabled="type === 'detail'" style="width: 100%;" @change="changeLab">
-                <el-option v-for="dict in labCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="recordForm.groupCode" placeholder="请选择部门" :disabled="type === 'detail'" style="width: 100%;">
-                <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="电源电压空载(V)" prop="powerVoltageNoLoad">
               <el-input v-model="recordForm.powerVoltageNoLoad" :placeholder="type === 'detail' ? ' ' : '请输入电源电压空载'" :disabled="type === 'detail'" />
             </el-form-item>
diff --git a/src/views/resource/environment/voltage/list.vue b/src/views/resource/environment/voltage/list.vue
index 001a6d6..bce6ec9 100644
--- a/src/views/resource/environment/voltage/list.vue
+++ b/src/views/resource/environment/voltage/list.vue
@@ -52,33 +52,35 @@
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '测试时间', value: 'testTime', align: 'center', width: '120' },
-  { text: '测试地点', value: 'testLocation', align: 'center', width: '200' },
-  { text: '实验室', value: 'labCodeName', align: 'center' },
-  { text: '部门', value: 'groupCodeName', align: 'center' },
-  { text: '测试所用设备', value: 'testUseEquipment', align: 'center', width: '200' },
-  { text: '测试依据', value: 'testBasis', align: 'center' },
+  { text: '测试地点', value: 'testLocation', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '测试所用设备', value: 'testUseEquipment', align: 'center' },
+  { text: '型号', value: 'model', align: 'center' },
+  { text: '出厂编号', value: 'manufactureNo', align: 'center' },
+  { text: '测试依据', value: 'testBasis', align: 'center', width: '220' },
   {
     text: '电源电压(V)',
     value: '',
     align: 'center',
-    width: '120',
+    width: '220',
     children: [
-      { text: '空载', value: 'powerVoltageNoLoad', align: 'center', width: '60' },
-      { text: '加载', value: 'powerVoltageLoad', align: 'center', width: '60' },
+      { text: '空载', value: 'powerVoltageNoLoad', align: 'center', width: '120' },
+      { text: '加载', value: 'powerVoltageLoad', align: 'center', width: '120' },
     ],
   },
   {
     text: '零地电压(V)',
     value: '',
     align: 'center',
-    width: '120',
+    width: '220',
     children: [
-      { text: '空载', value: 'zeroVoltageNoLoad', align: 'center', width: '60' },
-      { text: '加载', value: 'zeroVoltageLoad', align: 'center', width: '60' },
+      { text: '空载', value: 'zeroVoltageNoLoad', align: 'center', width: '120' },
+      { text: '加载', value: 'zeroVoltageLoad', align: 'center', width: '120' },
     ],
   },
-  { text: '结论', value: 'conclusion', align: 'center', width: '160' },
-  { text: '测试人', value: 'createUserName', align: 'center', width: '120' },
+  { text: '结论', value: 'conclusion', align: 'center' },
+  { text: '测试人', value: 'createUserName', align: 'center' },
   { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '100' },
 ])
 const list = ref<Array<IVoltageRecord>>([]) // 表格数据
diff --git a/src/views/resource/environment/voltage/voltage-interface.ts b/src/views/resource/environment/voltage/voltage-interface.ts
index 5afb1fe..cd7c137 100644
--- a/src/views/resource/environment/voltage/voltage-interface.ts
+++ b/src/views/resource/environment/voltage/voltage-interface.ts
@@ -36,6 +36,8 @@
 
   testUseEquipment: string //	测试所用设备
   testUseEquipmentId: string //		测试所用设备id
+  model: string // 型号
+  manufactureNo: string // 出厂编号
   labCode: string // 实验室
   labCodeName: string // 实验室名称
   groupCode: string // 部门
diff --git a/src/views/resource/outsideService/consumable/applyDetail.vue b/src/views/resource/outsideService/consumable/applyDetail.vue
index 0950cc1..65d27dd 100644
--- a/src/views/resource/outsideService/consumable/applyDetail.vue
+++ b/src/views/resource/outsideService/consumable/applyDetail.vue
@@ -638,7 +638,7 @@
         <table-container title="物资明细">
           <template v-if="type !== 'detail'" #btns-right>
             <el-button type="primary" @click="addEditableRow">
-              增加行
+              批量增加
             </el-button>
             <el-button type="info" @click="delSupplierRecords">
               删除行

diff --git a/src/api/resource/questionnaire.ts b/src/api/resource/questionnaire.ts
index f40c875..9e55dc7 100644
--- a/src/api/resource/questionnaire.ts
+++ b/src/api/resource/questionnaire.ts
@@ -17,3 +17,22 @@
     data,
   })
 }
+
+// 发送
+export function send(data: { ids: string[] }) {
+  return request({
+    url: `${prefix}/questionnaire/send`,
+    method: 'post',
+    data,
+  })
+}
+
+remindWorker
+// 催办
+export function remindWorker(data: { id: string }) {
+  return request({
+    url: `${prefix}/questionnaire/remindWorker`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/resource/common/filterConsumableCheck.vue b/src/views/resource/common/filterConsumableCheck.vue
new file mode 100644
index 0000000..14f6d0a
--- /dev/null
+++ b/src/views/resource/common/filterConsumableCheck.vue
@@ -0,0 +1,198 @@
+<!-- 选择物资验收记录 -->
+<script lang="ts" setup name="FilterConsumableCheck">
+import { ElMessage } from 'element-plus'
+import type { Ref } from 'vue'
+import { ref } from 'vue'
+import dayjs from 'dayjs'
+import type { DateModelType } from 'element-plus'
+import { getLocationList } from '@/api/business/taskMeasure/measureData'
+import { getGoodsCheckList } from '@/api/resource/supplierConsumable'
+import { getStaffList } from '@/api/resource/register'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { getCustomerInfoList } from '@/api/resource/customer'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  recordNo: '', // 记录单编号
+  createDept: '',
+  createUserName: '', // 创建人
+  acceptTimeStart: '', // 创建时间-起始
+  acceptTimeEnd: '', // 创建时间-结束
+  approvalStatus: '0', // 审批状态
+  formId: SCHEDULE.CHECK_MATERIAL_RECORD_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
+  offset: 1,
+  limit: 20,
+})
+// 多选选中的内容
+const checkoutList = ref([])
+const loadingTable = ref(false)
+const list = ref([]) // 表格数据
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '文件编号', value: 'recordNo', align: 'center', width: '200' },
+  { text: '物资名称', value: 'goodsName', align: 'center' },
+  { text: '规格型号', value: 'goodsModel', align: 'center' },
+  { text: '验收部门', value: 'createDept', align: 'center', width: '160' },
+  { text: '验收人', value: 'createUserName', align: 'center', width: '120' },
+  { text: '验收时间', value: 'createTime', align: 'center', width: '120' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '100' },
+])
+const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
+
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getGoodsCheckList(listQuery.value).then((response) => {
+    if (response.code === 200) {
+      list.value = response.data.rows.map((item: any) => {
+        return {
+          ...item,
+          createTime: item.createTime!.length > 16 ? item.createTime!.substring(0, 10) : '',
+        }
+      })
+      total.value = parseInt(response.data.total)
+    }
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
+}
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    recordNo: '', // 记录单编号
+    createDept: '',
+    createUserName: '', // 创建人
+    acceptTimeStart: '', // 创建时间-起始
+    acceptTimeEnd: '', // 创建时间-结束
+    approvalStatus: '0', // 审批状态
+    formId: SCHEDULE.CHECK_MATERIAL_RECORD_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
+    offset: 1,
+    limit: 20,
+  }
+  dateRange.value = ['', '']
+  fetchData()
+}
+// 搜索
+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
+  }
+  search()
+}
+// 点击确定
+const confirmSelect = (row: any) => {
+  emits('confirm', [row])
+  dialogFormVisible.value = false
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData()
+}
+
+watch(dateRange, (val) => {
+  if (val) {
+    listQuery.value.acceptTimeStart = dayjs(val[0]).format('YYYY-MM-DD') === 'Invalid Date' ? '' : dayjs(val[0]).format('YYYY-MM-DD')
+    listQuery.value.acceptTimeEnd = dayjs(val[1]).format('YYYY-MM-DD') === 'Invalid Date' ? '' : dayjs(val[1]).format('YYYY-MM-DD')
+  }
+  else {
+    listQuery.value.acceptTimeStart = ''
+    listQuery.value.acceptTimeEnd = ''
+  }
+})
+
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择工作间" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input v-model="listQuery.recordNo" placeholder="文件编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.createDept" placeholder="验收部门" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.createUserName" placeholder="验收人" clearable />
+      </search-item>
+      <search-item>
+        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="验收时间（开始）" end-placeholder="验收时间（结束）" />
+      </search-item>
+    </search-area>
+
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        :height="520"
+        :is-show-single-select-button="true"
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column fixed="right" label="操作" align="center" width="130">
+            <template #default="{ row }">
+              <el-button size="small" type="primary" @click="confirmSelect(row)">
+                选定
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <!-- <el-button type="primary" @click="confirmSelect">确认</el-button> -->
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/resource/common/filterCustomerStaff.vue b/src/views/resource/common/filterCustomerStaff.vue
index 610bf51..fd40e61 100644
--- a/src/views/resource/common/filterCustomerStaff.vue
+++ b/src/views/resource/common/filterCustomerStaff.vue
@@ -1,5 +1,6 @@
 <!-- 筛选系统用户弹窗 -->
 <script name="FilterCustomerStaff" lang="ts" setup>
+import { ElMessage } from 'element-plus'
 import type { ICustomerFilter, ICustomerTree } from './common-interface'
 import type { ICustomerInfo } from '@/views/resource/customer/info/customer-info'
 import type { IlistQueryType } from '@/views/system/user/user-interface'
@@ -7,11 +8,15 @@
 import { getCustomerInfoList } from '@/api/resource/customer'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 
-defineProps({
+const props = defineProps({
   title: {
     type: String,
     default: '请选择',
   },
+  isMulti: { // 是否多选
+    type: Boolean,
+    default: false,
+  },
 })
 
 const emit = defineEmits(['recordSelected'])
@@ -20,9 +25,10 @@
   children: 'children',
   label: 'customerName',
 }
-
+const tableLoading = ref(false)
 // 定义变量
 const customerIdSelected = ref<string>('')
+const customerDeptIdSelected = ref<string>('')
 const customerNameSelected = ref<string>('')
 const disabledCustomerName = ref(false) // 委托方筛选是否禁用
 const getCustomerName = ref('') // 委托方
@@ -44,7 +50,9 @@
   endTime: '',
   deptType: '',
 })
+const tableRef = ref()
 const sysUserList = ref([])
+const checkoutList = ref([]) // 多选
 const total = ref<number>(0) // 数据总条数
 const columns = ref <Array<TableColumn>>([
   { text: '账号', value: 'account', align: 'center' },
@@ -53,9 +61,13 @@
 ]) // 表头
 
 const customerTree = ref<Array<ICustomerTree>>([])
-
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
 // 查询用户列表
 const getSysUserList = () => {
+  tableLoading.value = true
   getAllUserList(sysUserQuery.value).then((res) => {
     if (res.code === 200) {
       sysUserList.value = res.data.rows.map((item: any) => {
@@ -63,10 +75,12 @@
           ...item,
           customerId: customerIdSelected.value,
           customerName: customerNameSelected.value,
+          customerDeptId: customerDeptIdSelected,
         }
       })
       total.value = Number(res.data.total)
     }
+    tableLoading.value = false
   })
 }
 
@@ -101,17 +115,25 @@
 
   // 赋值选中的委托方
   customerIdSelected.value = data.id
+  customerDeptIdSelected.value = data.deptId
   customerNameSelected.value = data.customerName
 
   getSysUserList()
 }
 
-// 选中用户
+// 单选选定
 const selectSingleUser = (row: Object) => {
   emit('recordSelected', row)
 }
 
-const showOrHideFilterDialog = (show: boolean, customerName = '', disabledCustomerNameParam = false) => {
+/**
+ * 弹窗显隐
+ * @param show 控制弹窗显隐
+ * @param customerName 委托方名称
+ * @param disabledCustomerNameParam 禁止修改委托方名称
+ * @param writerNames 委托方意见登记表--[]则清空原有的多选
+ */
+const showOrHideFilterDialog = (show: boolean, customerName = '', disabledCustomerNameParam = false, writerNames = []) => {
   if (show === false) {
     customerQuery.value.customerName = ''
     customerQuery.value.approvalStatus = '0'
@@ -136,6 +158,21 @@
   }
 
   showFilterDialog.value = show
+
+  if (!writerNames.length && show && tableRef.value) {
+    console.log('清除多选')
+    tableRef.value.clearMulti()
+  }
+}
+
+// 多选确定
+const submitEquipmentSelected = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('至少选中一条数据')
+    return false
+  }
+  emit('recordSelected', checkoutList.value)
+  showOrHideFilterDialog(false)
 }
 
 defineExpose({
@@ -176,13 +213,18 @@
         </search-area>
 
         <!-- 表格数据展示 -->
-        <table-container :title-show="false">
+        <table-container v-loading="tableLoading" :title-show="false">
           <!-- 表格区域 -->
           <normal-table
             id="sysUserFilter"
+            ref="tableRef"
             :data="sysUserList" :total="total" :columns="columns"
             :query="{ limit: sysUserQuery.limit, offset: sysUserQuery.offset }"
+            is-showmulti-select
+            :is-multi="isMulti"
+            :height="520"
             @change="changePage"
+            @multi-select="handleSelectionChange"
           >
             <template #preColumns>
               <el-table-column label="序号" width="55" align="center">
@@ -191,7 +233,7 @@
                 </template>
               </el-table-column>
             </template>
-            <template #columns>
+            <template v-if="!props.isMulti" #columns>
               <el-table-column fixed="right" label="操作" align="center" width="130">
                 <template #default="{ row }">
                   <el-button size="small" type="primary" @click="selectSingleUser(row)">
@@ -204,6 +246,15 @@
         </table-container>
       </div>
     </div>
+    <!-- 多选 -->
+    <template v-if="props.isMulti" #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitEquipmentSelected">
+          确定
+        </el-button>
+        <el-button @click="showOrHideFilterDialog(false)">取消</el-button>
+      </span>
+    </template>
   </el-dialog>
 </template>
 
diff --git a/src/views/resource/common/filterSysUser.vue b/src/views/resource/common/filterSysUser.vue
index 71ec72d..4efa44f 100644
--- a/src/views/resource/common/filterSysUser.vue
+++ b/src/views/resource/common/filterSysUser.vue
@@ -1,7 +1,8 @@
 <!-- 筛选系统用户弹窗 -->
 <script name="FilterSysUser" lang="ts" setup>
+import { ElMessage } from 'element-plus'
 import type { IlistQueryType, addInfo } from '@/views/system/user/user-interface'
-import { getUserList } from '@/api/system/user'
+import { getAllUserList } from '@/api/system/user'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
 
@@ -11,6 +12,10 @@
     type: Boolean,
     default: true,
   },
+  isMulti: { // 是否多选
+    type: Boolean,
+    default: false,
+  },
 })
 const emit = defineEmits(['recordSelected'])
 const tableLoading = ref(false)
@@ -28,6 +33,7 @@
 })
 const pid = ref<string>('')
 const sysUserList = ref<Array<addInfo>>([])
+const checkoutList = ref<Array<addInfo>>([]) // 多选
 const total = ref<number>(0) // 数据总条数
 const columns = ref <Array<TableColumn>>([
   { text: '账号', value: 'account', align: 'center' },
@@ -35,7 +41,10 @@
   { text: '部门', value: 'deptName', align: 'center' },
   { text: '人员类别', value: 'avatarName', align: 'center' },
 ]) // 表头
-
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
 const staffTypeMap = ref({}) as any// 人员类别
 // 获取字典
 const fetchDict = async () => {
@@ -48,7 +57,7 @@
 
 const getSysUserList = () => {
   tableLoading.value = true
-  getUserList(searchQuery).then((res) => {
+  getAllUserList(searchQuery).then((res) => {
     if (res.code === 200) {
       sysUserList.value = res.data.rows.map((item: { avatar: string }) => {
         return {
@@ -62,6 +71,19 @@
   })
 }
 
+// 重置
+const reset = () => {
+  searchQuery.keywords = ''
+  searchQuery.deptId = ''
+  searchQuery.offset = 1
+  searchQuery.limit = 20
+  searchQuery.sort = ''
+  searchQuery.beginTime = ''
+  searchQuery.endTime = ''
+  searchQuery.deptType = ''
+  getSysUserList()
+}
+
 // 逻辑
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -73,10 +95,12 @@
   getSysUserList()
 }
 
+// 单选确定
 const selectSingleUser = (row: addInfo) => {
   emit('recordSelected', row)
 }
 
+// 取消
 const showOrHideFilterDialog = (show: boolean, deptId = '') => {
   if (show === false) {
     searchQuery.keywords = ''
@@ -95,6 +119,16 @@
   showFilterDialog.value = show
 }
 
+// 多选确定
+const submitEquipmentSelected = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('至少选中一条数据')
+    return false
+  }
+  emit('recordSelected', checkoutList.value)
+  showOrHideFilterDialog(false)
+}
+
 defineExpose({
   showOrHideFilterDialog,
 })
@@ -102,7 +136,7 @@
 
 <template>
   <el-dialog v-model="showFilterDialog" title="选择用户" :append-to-body="true" :close-on-click-modal="false" top="10vh">
-    <search-area :need-clear="false" @search="getSysUserList">
+    <search-area :need-clear="true" @search="getSysUserList" @clear="reset">
       <search-item>
         <el-input v-model="searchQuery.keywords" placeholder="姓名" clearable />
       </search-item>
@@ -119,7 +153,11 @@
         v-loading="tableLoading" :data="sysUserList" :total="total"
         :columns="columns"
         :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+        is-showmulti-select
+        :is-multi="isMulti"
+        :height="520"
         @change="changePage"
+        @multi-select="handleSelectionChange"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
@@ -128,7 +166,8 @@
             </template>
           </el-table-column>
         </template>
-        <template #columns>
+        <!-- 单选 -->
+        <template v-if="!props.isMulti" #columns>
           <el-table-column fixed="right" label="操作" align="center" width="130">
             <template #default="{ row }">
               <el-button size="small" type="primary" @click="selectSingleUser(row)">
@@ -139,5 +178,14 @@
         </template>
       </normal-table>
     </table-container>
+    <!-- 多选 -->
+    <template v-if="props.isMulti" #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitEquipmentSelected">
+          确定
+        </el-button>
+        <el-button @click="showOrHideFilterDialog(false)">取消</el-button>
+      </span>
+    </template>
   </el-dialog>
 </template>
diff --git a/src/views/resource/customer/questionnaire/customer-questionnaire.ts b/src/views/resource/customer/questionnaire/customer-questionnaire.ts
index 7391891..a3b40fc 100644
--- a/src/views/resource/customer/questionnaire/customer-questionnaire.ts
+++ b/src/views/resource/customer/questionnaire/customer-questionnaire.ts
@@ -39,6 +39,8 @@
   itemTen: string
   score?: string
   [key: string]: string | undefined
+  sendFlag: string // 是否已发送（1/2）
+  sendFlagName: string // 是否已发送（1/2）
 }
 
 export interface ICustomerRateColumn {
diff --git a/src/views/resource/customer/questionnaire/detail.vue b/src/views/resource/customer/questionnaire/detail.vue
index 6560afd..553ebb4 100644
--- a/src/views/resource/customer/questionnaire/detail.vue
+++ b/src/views/resource/customer/questionnaire/detail.vue
@@ -1,12 +1,14 @@
 <!-- 委托方满意度调查表详情 -->
 <script name="QuestionnaireDetail" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
-import type{ ICustomerQuestionnaireInfo, ICustomerRateColumn } from './customer-questionnaire'
+import type { ICustomerQuestionnaireInfo, ICustomerRateColumn } from './customer-questionnaire'
 import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
 import useUserStore from '@/store/modules/user'
-import { addQuestionnaire } from '@/api/resource/questionnaire'
+import FilterSysUser from '@/views/resource/common/filterSysUser.vue'
+import { addQuestionnaire, send } from '@/api/resource/questionnaire'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import { getDictByCode } from '@/api/system/dict'
+import { uniqueArray } from '@/utils/Array'
 
 // 从路由中传过来的参数
 const type = ref<string>('')
@@ -18,7 +20,7 @@
 
 const questionnaireFormRef = ref()
 const refFilterCustomer = ref()
-
+const sendIds = ref<string[]>([]) // 发送的参数
 const questionnaireInfo = ref<ICustomerQuestionnaireInfo>({
   id: '',
   customerId: '',
@@ -31,8 +33,8 @@
   senderId: '',
   senderName: '',
   sendTime: '',
-  writerId: '',
-  writerName: '',
+  writerId: '', // 填写人id（单选用-新建不让传）
+  writerName: '', // 填写人名字(多选时候-新建不让传)
   writeTime: '',
   writeStatus: '',
   itemOne: '',
@@ -45,12 +47,15 @@
   itemEight: '',
   itemNine: '',
   itemTen: '',
+
+  sendFlag: '', // 是否已发送（1/2）
+  sendFlagName: '', // 是否已发送（1/2）
 })
 
 const questionnaireFormRules = ref({
-  labCode: [{ required: true, message: '实验室不能为空，请选择', trigger: ['change', 'blur'] }],
-  customerId: [{ required: true, message: '填写单位不能为空，请选择', trigger: 'change' }],
-  writerId: [{ required: true, message: '填写人不能为空，请选择', trigger: 'change' }],
+  labCode: [{ required: true, message: '实验室不能为空', trigger: ['change', 'blur'] }],
+  customerId: [{ required: true, message: '填写单位不能为空', trigger: 'change' }],
+  writerName: [{ required: true, message: '填写人不能为空', trigger: 'change' }],
 }) // 表单验证规则
 
 // 字典值
@@ -71,28 +76,43 @@
   { index: 10, text: '10、对所提供的计量保障是否满意', value: 0, attributeName: 'itemTen' },
 ])
 
-// 逻辑
-
-// 显示筛选填写用户和单位的弹窗
+// ---------------------------------------------多选填写人----------------------------------------------
+const writerNames = ref<{ customerId: string; writerId: string }[]>([]) // 选择的填写人数组
+// 点击选择填写人
 const showFilterCustomerDialog = () => {
-  refFilterCustomer.value.showOrHideFilterDialog(true)
+  refFilterCustomer.value.showOrHideFilterDialog(true, '', false, writerNames.value)
 }
 
-// 返回选定结果
-const recordSelectedHandler = (row: any) => {
+// 选定填写人
+const recordSelectedHandler = (list: any) => {
   refFilterCustomer.value.showOrHideFilterDialog(false)
-
-  if (row.id !== '') {
-    questionnaireInfo.value.customerId = row.customerId
-    questionnaireInfo.value.customerName = row.customerName
-    questionnaireInfo.value.writerId = row.id
-    questionnaireInfo.value.writerName = row.name
+  if (list && list.length) {
+    writerNames.value = list.map((item: { customerDeptId: string; id: string }) => {
+      return {
+        customerId: item.customerDeptId,
+        writerId: item.id,
+      }
+    })
+    questionnaireInfo.value.writerName = list.map((item: { name: string }) => item.name).join(',')
+    // 填写单位
+    questionnaireInfo.value.customerName = uniqueArray(list.map((item: { customerName: string }) => item.customerName)).join(',')
+    questionnaireInfo.value.customerId = uniqueArray(list.map((item: { customerDeptId: string }) => item.customerDeptId)).join(',')
   }
   else {
     ElMessage.error('填写单位和填写人不能为空，请重新选择')
   }
 }
 
+// 清空填写人
+const clean = () => {
+  questionnaireInfo.value.writerName = ''
+  questionnaireInfo.value.customerName = ''
+  questionnaireInfo.value.customerId = ''
+  writerNames.value = []
+}
+
+// ---------------------------------------------------------------------------------------------------
+
 // 保存
 const saveQuestionnaireInfo = () => {
   let satisfactionStr = ''
@@ -109,19 +129,29 @@
     if (satisfactionStr.length === 10) {
       questionnaireInfo.value.writeTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 填写时间为当前时间
     }
-
+    const params = {
+      ...questionnaireInfo.value,
+      writerId: null, // 填写人id（单选用-多选时候新建不让传）
+      writerName: null, // 填写人名字(多选时候-新建不让传)
+      sendFlag: '2', // 是否已发送（1/2）
+      sendFlagName: '未发送', // 是否已发送（1/2）
+      customerName: null,
+      customerId: null,
+      sendDTOs: writerNames.value, // 填写人信息
+    }
     // 提交接口
-    addQuestionnaire(questionnaireInfo.value).then((res) => {
+    addQuestionnaire(params).then((res) => {
       if (res.code === 200) {
       // 提示保存成功
-        ElMessage.success('委托方满意度调查表创建并发送成功')
+        ElMessage.success('委托方满意度调查表创建成功')
 
         // 设置返回的委托方id和委托方编号
-        questionnaireInfo.value.questionnaireNo = res.data.questionnaireNo
-        questionnaireInfo.value.id = res.data.id
-        id.value = res.data.id
+        // questionnaireInfo.value.questionnaireNo = res.data.questionnaireNo
+        // questionnaireInfo.value.id = res.data.id
+        // id.value = res.data.id
 
         type.value = 'detail'
+        sendIds.value = res.data
       }
       else {
       // 提示失败信息
@@ -193,6 +223,18 @@
   router.go(-1)
 }
 
+// 点击发送
+const handleSend = () => {
+  if (sendIds && sendIds.value.length) {
+    send({ ids: sendIds.value }).then((res) => {
+      ElMessage.success('发送成功')
+    })
+  }
+  else {
+    ElMessage.warning('没有发送的单位或个人')
+  }
+}
+
 const initDialog = (params: any) => {
   // 从路由中获取参数
   type.value = params.type
@@ -205,7 +247,8 @@
       questionnaireInfo.value.senderId = userInfo.id
       questionnaireInfo.value.senderName = userInfo.name
       questionnaireInfo.value.sendTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
-
+      questionnaireInfo.value.labCode = userInfo.bizLabCode // 实验室代码
+      questionnaireInfo.value.labCodeName = userInfo.labCodeName // 实验室名称
       break
 
     case 'detail':
@@ -275,6 +318,9 @@
     <el-form ref="questionnaireFormRef" :model="questionnaireInfo" :rules="questionnaireFormRules" label-position="right" label-width="110px" border stripe>
       <detail-page title="委托方满意度调查表">
         <template #btns>
+          <el-button v-if="type === 'detail'" type="primary" @click="handleSend">
+            发送
+          </el-button>
           <el-button v-if="type !== 'detail'" type="primary" @click="saveButtonHandler">
             保存
           </el-button>
@@ -284,7 +330,6 @@
         </template>
 
         <el-row :gutter="24">
-          <!-- 第一行 第一列 -->
           <el-col :span="6">
             <el-form-item label="实验室" prop="labCode">
               <el-select v-model="questionnaireInfo.labCode" placeholder="请选择实验室" :disabled="type === 'detail'" style="width: 100%;">
@@ -292,46 +337,52 @@
               </el-select>
               <el-input v-model="questionnaireInfo.labCodeName" type="hidden" />
             </el-form-item>
-
-            <el-form-item label="填写单位" prop="customerId">
-              <el-input v-model="questionnaireInfo.customerName" :disabled="true" placeholder="选择填写人时自动填充" />
-              <el-input v-model="questionnaireInfo.customerId" type="hidden" />
-            </el-form-item>
           </el-col>
-
           <el-col :span="6">
             <el-form-item label="文件编号">
-              <el-input v-model="questionnaireInfo.questionnaireNo" placeholder="文件编号，保存后自动生成" :disabled="true" />
-            </el-form-item>
-
-            <el-form-item label="填写人" prop="writerId">
-              <el-input v-model="questionnaireInfo.writerName" :readonly="true" :disabled="true">
-                <template #append>
-                  <el-button size="small" :disabled="type === 'detail'" @click="showFilterCustomerDialog">
-                    选择
-                  </el-button>
-                </template>
-              </el-input>
-              <el-input v-model="questionnaireInfo.writerId" type="hidden" />
+              <el-input v-model="questionnaireInfo.questionnaireNo" placeholder="系统自动生成" :disabled="true" />
             </el-form-item>
           </el-col>
-
           <el-col :span="6">
             <el-form-item label="发送人">
               <el-input v-model="questionnaireInfo.senderName" :disabled="true" />
               <el-input v-model="questionnaireInfo.senderId" type="hidden" />
             </el-form-item>
-
-            <el-form-item label="填写时间">
-              <el-input v-model="questionnaireInfo.writeTime" :disabled="true" />
-            </el-form-item>
           </el-col>
-
           <el-col :span="6">
             <el-form-item label="发送时间">
               <el-input v-model="questionnaireInfo.sendTime" placeholder="保存后自动生成" :disabled="true" />
             </el-form-item>
           </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="填写人" prop="writerName" style="display: flex;">
+              <el-button size="small" type="primary" :disabled="type === 'detail'" @click="showFilterCustomerDialog">
+                {{ questionnaireInfo.writerName ? '继续添加' : '添加' }}
+              </el-button>
+              <el-button size="small" type="info" :disabled="type === 'detail'" @click="clean">
+                清空
+              </el-button>
+              <el-input v-model="questionnaireInfo.writerName" placeholder="请添加填写人" style="margin-top: 8px;" :readonly="true" :disabled="true" type="textarea" autosize>
+                <!-- <template #append>
+                  <el-button size="small" :disabled="type === 'detail'" @click="showFilterCustomerDialog">
+                    选择
+                  </el-button>
+                </template> -->
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="填写单位" prop="customerId">
+              <el-input v-model="questionnaireInfo.customerName" type="textarea" :autosize="{ minRows: 3 }" :disabled="true" placeholder="选择填写人时自动填充" />
+              <el-input v-model="questionnaireInfo.customerId" type="hidden" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="填写时间">
+              <el-input v-model="questionnaireInfo.writeTime" :disabled="true" />
+            </el-form-item>
+          </el-col>
         </el-row>
       </detail-page>
 
@@ -350,8 +401,8 @@
         </el-row>
       </table-container>
     </el-form>
-
-    <filter-customer-staff ref="refFilterCustomer" title="请选择填写单位和填写人" @record-selected="recordSelectedHandler" />
+    <!-- 单选填写人--先选委托方，再去选委托方下面的人 -->
+    <filter-customer-staff ref="refFilterCustomer" :is-multi="true" title="请选择填写单位和填写人" @record-selected="recordSelectedHandler" />
   </app-container>
 </template>
 
diff --git a/src/views/resource/customer/questionnaire/list.vue b/src/views/resource/customer/questionnaire/list.vue
index a2306ff..553e5f3 100644
--- a/src/views/resource/customer/questionnaire/list.vue
+++ b/src/views/resource/customer/questionnaire/list.vue
@@ -2,9 +2,9 @@
 <script name="QuestionnaireList" lang="ts" setup>
 import { ElMessage, dayjs } from 'element-plus'
 import type { DateModelType } from 'element-plus'
-import type{ ICustomerQuestionnaireInfo, IListQuery } from './customer-questionnaire'
+import type { ICustomerQuestionnaireInfo, IListQuery } from './customer-questionnaire'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getQuestionnaireList } from '@/api/resource/questionnaire'
+import { getQuestionnaireList, remindWorker } from '@/api/resource/questionnaire'
 
 const { proxy } = getCurrentInstance() as any
 const router = useRouter()
@@ -118,7 +118,9 @@
 }
 
 const urging = (row: ICustomerQuestionnaireInfo) => {
-  ElMessage.success(`满意度调查表 ${row.questionnaireNo} 填写消息已发送`)
+  remindWorker({ id: row.id }).then((res) => {
+    ElMessage.success(`满意度调查表 ${row.questionnaireNo} 填写消息已催办`)
+  })
 }
 
 watch(dateRangeSend, (val) => {
@@ -194,7 +196,8 @@
               <el-button size="small" type="primary" link @click="detail(row)">
                 详情
               </el-button>
-              <el-button v-if="row.writeStatus !== '已提交'" size="small" type="primary" link @click="urging(row)">
+              <!-- <el-button v-if="row.writeStatus !== '已提交'" size="small" type="primary" link @click="urging(row)"> -->
+              <el-button size="small" type="primary" link @click="urging(row)">
                 催办
               </el-button>
             </template>
diff --git a/src/views/resource/customer/situationReport/dialog/selectSuggestFormDialog.vue b/src/views/resource/customer/situationReport/dialog/selectSuggestFormDialog.vue
index 8fa636b..a491499 100644
--- a/src/views/resource/customer/situationReport/dialog/selectSuggestFormDialog.vue
+++ b/src/views/resource/customer/situationReport/dialog/selectSuggestFormDialog.vue
@@ -130,7 +130,7 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择委托方" width="65%">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择委托方意见登记表" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="clearList">
       <search-item width="162px">
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index a5508b4..9066757 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -456,7 +456,7 @@
     locationName: '', // 地点名称
     locationNo: '', // 地点编号
     labName: lab, // 所属实验室
-    limit: 20,
+    limit: 999999,
     offset: 1,
   }
   getLocationList(params).then((response) => {
diff --git a/src/views/resource/environment/voltage/edit.vue b/src/views/resource/environment/voltage/edit.vue
index b8a9290..ad03b80 100644
--- a/src/views/resource/environment/voltage/edit.vue
+++ b/src/views/resource/environment/voltage/edit.vue
@@ -58,6 +58,8 @@
 
   testUseEquipment: '', //	测试所用设备
   testUseEquipmentId: '', //		测试所用设备id
+  model: '', // 型号
+  manufactureNo: '', // 出厂编号
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
   groupCode: '', // 部门
@@ -417,6 +419,8 @@
   if (list && list.length) {
     recordForm.value.testUseEquipment = list[0].equipmentName //	测试所用设备
     recordForm.value.testUseEquipmentId = list[0].id //		测试所用设备id
+    recordForm.value.model = list[0].model //		型号
+    recordForm.value.manufactureNo = list[0].manufactureNo //		出厂编号
   }
 }
 
@@ -463,8 +467,7 @@
   // 从路由中获取参数
   type.value = params.type
   id.value = params.id !== undefined ? params.id : ''
-  status.value = params.status !== undefined ? params.status : ''
-
+  status.value = params.status
   // 默认显示第一个tab内容
   current.value = radioItems.value[0].value
   currentLabel.value = radioItems.value[0].name
@@ -517,7 +520,6 @@
     if (radioItems.value[radioItems.value.length - 1].value === 'voltage-approval') {
       radioItems.value.pop()
     }
-    console.log(radioItems.value)
   }
   else { // 非全部和草稿箱把审批详情加上
     if (radioItems.value[radioItems.value.length - 1].value !== 'voltage-approval') {
@@ -541,7 +543,7 @@
     locationName: '', // 地点名称
     locationNo: '', // 地点编号
     labName: lab, // 所属实验室
-    limit: 20,
+    limit: 999999,
     offset: 1,
   }
   getLocationList(params).then((response) => {
@@ -618,6 +620,20 @@
       <detail-block v-if="current === 'voltage-basic'">
         <el-row :gutter="24">
           <el-col :span="6">
+            <el-form-item label="实验室" prop="labCode">
+              <el-select v-model="recordForm.labCode" placeholder="请选择实验室" :disabled="type === 'detail'" style="width: 100%;" @change="changeLab">
+                <el-option v-for="dict in labCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="recordForm.groupCode" placeholder="请选择部门" :disabled="type === 'detail'" style="width: 100%;">
+                <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="记录编号">
               <el-input v-model="recordForm.recordNo" placeholder="系统自动生成" :disabled="true" />
             </el-form-item>
@@ -651,7 +667,7 @@
             <el-form-item label="测试地点" prop="testLocation">
               <!-- <el-input v-model="recordForm.testLocation" :placeholder="type === 'detail' ? ' ' : '请输入测试地点'" :disabled="type === 'detail'" /> -->
               <el-autocomplete
-                v-model="detailRequire.testLocation"
+                v-model="recordForm.testLocation"
                 :fetch-suggestions="querySearchTestLocation"
                 placeholder="工作间名称"
                 clearable
@@ -669,27 +685,22 @@
               </el-input>
             </el-form-item>
           </el-col>
-
           <el-col :span="6">
+            <el-form-item label="型号" prop="model">
+              <el-input v-model="recordForm.model" :placeholder="type === 'detail' ? ' ' : '型号'" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号" prop="manufactureNo">
+              <el-input v-model="recordForm.manufactureNo" :placeholder="type === 'detail' ? ' ' : '出厂编号'" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
             <el-form-item label="测试依据" prop="testBasis">
               <el-input v-model="recordForm.testBasis" :placeholder="type === 'detail' ? ' ' : '请输入测试依据'" :disabled="type === 'detail'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="实验室" prop="labCode">
-              <el-select v-model="recordForm.labCode" placeholder="请选择实验室" :disabled="type === 'detail'" style="width: 100%;" @change="changeLab">
-                <el-option v-for="dict in labCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="recordForm.groupCode" placeholder="请选择部门" :disabled="type === 'detail'" style="width: 100%;">
-                <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="电源电压空载(V)" prop="powerVoltageNoLoad">
               <el-input v-model="recordForm.powerVoltageNoLoad" :placeholder="type === 'detail' ? ' ' : '请输入电源电压空载'" :disabled="type === 'detail'" />
             </el-form-item>
diff --git a/src/views/resource/environment/voltage/list.vue b/src/views/resource/environment/voltage/list.vue
index 001a6d6..bce6ec9 100644
--- a/src/views/resource/environment/voltage/list.vue
+++ b/src/views/resource/environment/voltage/list.vue
@@ -52,33 +52,35 @@
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '测试时间', value: 'testTime', align: 'center', width: '120' },
-  { text: '测试地点', value: 'testLocation', align: 'center', width: '200' },
-  { text: '实验室', value: 'labCodeName', align: 'center' },
-  { text: '部门', value: 'groupCodeName', align: 'center' },
-  { text: '测试所用设备', value: 'testUseEquipment', align: 'center', width: '200' },
-  { text: '测试依据', value: 'testBasis', align: 'center' },
+  { text: '测试地点', value: 'testLocation', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '测试所用设备', value: 'testUseEquipment', align: 'center' },
+  { text: '型号', value: 'model', align: 'center' },
+  { text: '出厂编号', value: 'manufactureNo', align: 'center' },
+  { text: '测试依据', value: 'testBasis', align: 'center', width: '220' },
   {
     text: '电源电压(V)',
     value: '',
     align: 'center',
-    width: '120',
+    width: '220',
     children: [
-      { text: '空载', value: 'powerVoltageNoLoad', align: 'center', width: '60' },
-      { text: '加载', value: 'powerVoltageLoad', align: 'center', width: '60' },
+      { text: '空载', value: 'powerVoltageNoLoad', align: 'center', width: '120' },
+      { text: '加载', value: 'powerVoltageLoad', align: 'center', width: '120' },
     ],
   },
   {
     text: '零地电压(V)',
     value: '',
     align: 'center',
-    width: '120',
+    width: '220',
     children: [
-      { text: '空载', value: 'zeroVoltageNoLoad', align: 'center', width: '60' },
-      { text: '加载', value: 'zeroVoltageLoad', align: 'center', width: '60' },
+      { text: '空载', value: 'zeroVoltageNoLoad', align: 'center', width: '120' },
+      { text: '加载', value: 'zeroVoltageLoad', align: 'center', width: '120' },
     ],
   },
-  { text: '结论', value: 'conclusion', align: 'center', width: '160' },
-  { text: '测试人', value: 'createUserName', align: 'center', width: '120' },
+  { text: '结论', value: 'conclusion', align: 'center' },
+  { text: '测试人', value: 'createUserName', align: 'center' },
   { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '100' },
 ])
 const list = ref<Array<IVoltageRecord>>([]) // 表格数据
diff --git a/src/views/resource/environment/voltage/voltage-interface.ts b/src/views/resource/environment/voltage/voltage-interface.ts
index 5afb1fe..cd7c137 100644
--- a/src/views/resource/environment/voltage/voltage-interface.ts
+++ b/src/views/resource/environment/voltage/voltage-interface.ts
@@ -36,6 +36,8 @@
 
   testUseEquipment: string //	测试所用设备
   testUseEquipmentId: string //		测试所用设备id
+  model: string // 型号
+  manufactureNo: string // 出厂编号
   labCode: string // 实验室
   labCodeName: string // 实验室名称
   groupCode: string // 部门
diff --git a/src/views/resource/outsideService/consumable/applyDetail.vue b/src/views/resource/outsideService/consumable/applyDetail.vue
index 0950cc1..65d27dd 100644
--- a/src/views/resource/outsideService/consumable/applyDetail.vue
+++ b/src/views/resource/outsideService/consumable/applyDetail.vue
@@ -638,7 +638,7 @@
         <table-container title="物资明细">
           <template v-if="type !== 'detail'" #btns-right>
             <el-button type="primary" @click="addEditableRow">
-              增加行
+              批量增加
             </el-button>
             <el-button type="info" @click="delSupplierRecords">
               删除行
diff --git a/src/views/resource/outsideService/consumable/checkDetail.vue b/src/views/resource/outsideService/consumable/checkDetail.vue
index bbc7a1b..1caccd0 100644
--- a/src/views/resource/outsideService/consumable/checkDetail.vue
+++ b/src/views/resource/outsideService/consumable/checkDetail.vue
@@ -1,7 +1,7 @@
 <!-- 物资验收记录单详情 -->
 <script name="ConsumableCheckDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
-import type { IConsumableApply, IGoodsCheckRecord } from './consumable-interface'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import type { IConsumableApply, IGoodsCheckRecord, IRecordDetail } from './consumable-interface'
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import FilterConsumableApply from '@/views/resource/common/filterConsumableApply.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
@@ -10,6 +10,7 @@
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
+import { useCheckList } from '@/commonMethods/useCheckList'
 
 // 变量
 // 从路由中传过来的参数
@@ -62,17 +63,23 @@
 })
 
 const checkRules = ref({
-  labCode: [{ required: true, message: '实验室不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
-  acceptTime: [{ required: true, message: '验收时间不能为空，请选择', trigger: 'blur' }],
-  goodsApplyNo: [{ required: true, message: '易耗物资申请单不能为空，请选择', trigger: 'blur' }],
-  goodsName: [{ required: true, message: '物资名称不能为空', trigger: 'blur' }],
-  goodsModel: [{ required: true, message: '规格型号不能为空', trigger: 'blur' }],
-  goodsSupplier: [{ required: true, message: '生产厂家不能为空', trigger: 'blur' }],
-  goodsWorth: [{ required: true, message: '价值不能为空', trigger: 'blur' }],
-  performance: [{ required: true, message: '主要性能指标不能为空', trigger: 'blur' }],
+  labCode: [{ required: true, message: '实验室不能为空', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['change', 'blur'] }],
+  acceptTime: [{ required: true, message: '验收时间不能为空', trigger: 'blur' }],
+  goodsApplyNo: [{ required: true, message: '易耗物资申请单不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 
+const recordDetailList = ref<IRecordDetail[]>([]) // 验收详情表格
+const recordDetailCheckoutList = ref<IRecordDetail[]>([]) // 验收详情多选
+const goodsColumns = [
+  { text: '名称', value: 'goodsName', align: 'center', required: true },
+  { text: '规格型号', value: 'goodsModel', align: 'center', required: true },
+  { text: '生产厂家', value: 'goodsSupplier', align: 'center', required: true },
+  { text: '价值', value: 'goodsWorth', align: 'center', required: true },
+  { text: '数量', value: 'goodsAmount', align: 'center', required: true },
+  { text: '主要性能指标', value: 'performance', align: 'center', required: true },
+] // 表头
+
 // 是否显示相关按钮
 const saveButtVisable = ref<boolean>(false) // 是否显示 保存 按钮
 const submitButtVisable = ref<boolean>(false) // 是否显示 提交 按钮
@@ -165,7 +172,16 @@
 // 保存至草稿箱
 const saveDraftCheck = () => {
   goodsCheckForm.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 创建时间改为提交时间
-  saveGoodsCheck(goodsCheckForm.value).then((res) => {
+  const params = {
+    ...goodsCheckForm.value,
+    recordDetailList: recordDetailList.value,
+  }
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  saveGoodsCheck(params).then((res) => {
     if (res.code === 200) {
       // 提示保存成功
       ElMessage.success('保存成功')
@@ -176,15 +192,22 @@
 
       type.value = 'update'
       status.value = '1' // 保存成功后进入草稿箱 为了不显示审批详情
+      loading.close()
     }
     else {
       // 提示失败信息
       ElMessage.error(`保存失败：${res.message}`)
+      loading.close()
     }
   })
 }
 // 编辑草稿箱（不走流程审批）
 const updateDraftCheck = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
   updateGoodsCheck(goodsCheckForm.value).then((res) => {
     if (res.code === 200) {
       // 提示保存成功
@@ -194,6 +217,7 @@
       // 提示失败信息
       ElMessage.error(`保存失败：${res.message}`)
     }
+    loading.close()
   })
 }
 
@@ -210,7 +234,9 @@
 // 新建时保存后的处理 获取返回的id
 const saveButtonHandler = async () => {
   if (!goodsCheckRef) { return }
-
+  if (!useCheckList(recordDetailList.value, goodsColumns, '物资明细')) {
+    return false
+  }
   await goodsCheckRef.value.validate((valid: boolean) => {
     if (valid === true) {
       ElMessageBox.confirm(
@@ -242,6 +268,11 @@
       cancelButtonText: '取消',
       type: 'warning',
     }).then(() => {
+      const loading = ElLoading.service({
+        lock: true,
+        text: '加载中...',
+        background: 'rgba(255, 255, 255, 0.6)',
+      })
       submitGoodsCheck({
         formId: SCHEDULE.CHECK_MATERIAL_RECORD_APPROVAL,
         id: goodsCheckForm.value.id,
@@ -255,6 +286,7 @@
         else {
           ElMessage.error(`物资验收记录单 ${goodsCheckForm.value.recordNo} 提交失败：${res.message}`)
         }
+        loading.close()
       })
     })
   }
@@ -262,6 +294,11 @@
     // 之前已经在流程中的表单 保存提交
     await goodsCheckRef.value.validate((valid: boolean) => {
       if (valid === true) {
+        const loading = ElLoading.service({
+          lock: true,
+          text: '加载中...',
+          background: 'rgba(255, 255, 255, 0.6)',
+        })
         failUpdateGoodsCheck(goodsCheckForm.value).then((res) => {
           if (res.code === 200) {
           // 提示保存成功
@@ -274,6 +311,7 @@
           // 提示失败信息
             ElMessage.error(`物资验收记录单 ${goodsCheckForm.value.recordNo} 提交失败：${res.message}`)
           }
+          loading.close()
         })
       }
     })
@@ -282,17 +320,23 @@
 
 // 根据id查询详情
 const detailById = async (id: string) => {
-  await detailGoodsCheck({ id }).then((res) => {
-    if (res.code === 200) {
-      goodsCheckForm.value = res.data
-      if (goodsCheckForm.value.taskId === '') {
-        goodsCheckForm.value.taskId = sessionStorage.getItem('consumableCheckTaskId')!
-      }
-      detailConsumableApply({ id: goodsCheckForm.value.goodsApplyId }).then((response) => {
-        goodsCheckForm.value.goodsApplyNo = response.data.applyNo
-      })
-    }
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
   })
+  const res = await detailGoodsCheck({ id })
+  if (res.code === 200) {
+    goodsCheckForm.value = res.data
+    if (goodsCheckForm.value.taskId === '') {
+      goodsCheckForm.value.taskId = sessionStorage.getItem('consumableCheckTaskId')!
+    }
+    detailConsumableApply({ id: goodsCheckForm.value.goodsApplyId }).then((response) => {
+      goodsCheckForm.value.goodsApplyNo = response.data.applyNo
+    })
+    recordDetailList.value = res.data.recordDetailList // 物资明细
+    loading.close()
+  }
 }
 
 // 流程审批-拒绝
@@ -307,7 +351,35 @@
 
 // 取消流程
 const revokeClickedHandler = () => {
-  approvalDialog.value.initDialog('revoke', goodsCheckForm.value.id, goodsCheckForm.value.taskId || route.query.taskId, goodsCheckForm.value.processId || route.query.processId)
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      const loading = ElLoading.service({
+        lock: true,
+        text: '加载中...',
+        background: 'rgba(255, 255, 255, 0.6)',
+      })
+      const params = {
+        processInstanceId: goodsCheckForm.value.processId!,
+        comments: '',
+        id: id.value,
+      }
+      revokeApprovalCheck(params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '已取消',
+        })
+        cancelButtVisable.value = false
+        loading.close()
+      })
+    })
 }
 
 // 删除审批单
@@ -339,22 +411,6 @@
   }
 }
 
-// 取消
-const revokeHandler = (param: any) => {
-  revokeApprovalCheck(param).then((res) => {
-    if (res.code === 200) {
-      ElMessage.success('流程取消成功')
-    }
-    else {
-      ElMessage.error(`流程取消失败：${res.message}`)
-    }
-    // 关闭弹窗
-    approvalDialog.value.handleClose()
-
-    cancelButtVisable.value = false
-  })
-}
-
 // 拒绝
 const refuseHandler = (param: any) => {
   refuseApprovalCheck(param).then((res) => {
@@ -371,17 +427,71 @@
   })
 }
 
+// ------------------------------------物资明细表格-------------------------------------------------------------
+// 多选
+const multiSelect = (e: any) => {
+  recordDetailCheckoutList.value = e
+}
+
+// 增加行
+const addRow = () => {
+  if (!useCheckList(recordDetailList.value, goodsColumns, '物资明细')) {
+    return false
+  }
+  recordDetailList.value.push({
+    goodsAmount: '', // 数量
+    goodsModel: '', // 型号
+    goodsName: '', // 名称
+    goodsSupplier: '', // 生产厂家
+    goodsWorth: '', // 价值
+    id: '',
+    recordId: '',
+    performance: '', // 性能指标
+  })
+}
+
+// 删除行
+const delRow = () => {
+  if (recordDetailCheckoutList.value.length === 0) {
+    ElMessage.warning('请至少选择一行')
+    return
+  }
+
+  recordDetailList.value = recordDetailList.value.filter(item => recordDetailCheckoutList.value.includes(item) === false)
+}
+// ------------------------------------物资申请单------------------------------------------------------------------------
+// 点击选择物资申请单
 const showConsumableApplyFilter = () => {
   applyFilterRef.value.showOrHideFilterDialog(true)
 }
 
+// 选好物资申请单
 const applyFormSelectedHandler = (apply: IConsumableApply) => {
   goodsCheckForm.value.goodsApplyId = apply.id
   goodsCheckForm.value.goodsApplyNo = apply.applyNo
   goodsCheckForm.value.goodsApply = apply.applyName
 
   applyFilterRef.value.showOrHideFilterDialog(false)
+
+  // 查询物资申请单详情-获取物资列表
+  if (apply.id) {
+    detailConsumableApply({ id: apply.id }).then((res) => {
+      recordDetailList.value = res.data.goodsDetailList.map((item: any) => {
+        return {
+          goodsAmount: item.goodsQuantity, // 数量
+          goodsModel: item.goodsModel, // 型号
+          goodsName: item.goodsName, // 名称
+          goodsSupplier: item.supplierName, // 生产厂家
+          goodsWorth: '', // 价值
+          id: '',
+          recordId: item.id,
+          performance: '', // 性能指标
+        }
+      })
+    })
+  }
 }
+// ---------------------------------------------------------------------------------------------------------------------
 
 const getLabCodeDict = async () => {
   // 先从缓存中获取
@@ -439,6 +549,10 @@
       goodsCheckForm.value.createDeptId = userInfo.deptId
       goodsCheckForm.value.createDept = userInfo.deptName
       goodsCheckForm.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
+      goodsCheckForm.value.labCode = userInfo.bizLabCode // 实验室代码
+      goodsCheckForm.value.labCodeName = userInfo.labCodeName // 实验室名称
+      goodsCheckForm.value.groupCode = userInfo.groupNo // 部门代码
+      goodsCheckForm.value.groupCodeName = userInfo.groupName // 部门名称
 
       keyFieldsDisable.value = false
 
@@ -511,7 +625,7 @@
           <el-button v-if="submitButtVisable" :disabled="id === ''" type="primary" @click="submitButtonHandler">
             提交
           </el-button>
-          <el-button v-if="saveButtVisable" type="primary" @click="saveButtonHandler">
+          <el-button v-if="saveButtVisable" :disabled="type === 'create' && id !== ''" type="primary" @click="saveButtonHandler">
             保存
           </el-button>
 
@@ -536,7 +650,7 @@
           <!-- 第一行 第一列 -->
           <el-col :span="6">
             <el-form-item label="实验室" prop="labCode">
-              <el-select v-model="goodsCheckForm.labCode" placeholder="请选择实验室" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-select v-model="goodsCheckForm.labCode" placeholder="请选择实验室" :disabled="keyFieldsDisable || type === 'detail'" style="width: 100%;">
                 <el-option v-for="dict in labCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
@@ -548,7 +662,7 @@
 
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="goodsCheckForm.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-select v-model="goodsCheckForm.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable || type === 'detail'" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
@@ -560,10 +674,10 @@
 
           <el-col :span="6">
             <el-form-item label="文件编号">
-              <el-input v-model="goodsCheckForm.recordNo" placeholder="文件编号，保存后自动生成" :disabled="true" />
+              <el-input v-model="goodsCheckForm.recordNo" placeholder="系统自动生成" :disabled="true" />
             </el-form-item>
             <el-form-item label="验收时间" prop="acceptTime">
-              <el-date-picker v-model="goodsCheckForm.acceptTime" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="type === 'detail'" style="width: 100%;" />
+              <el-date-picker v-model="goodsCheckForm.acceptTime" :placeholder="type === 'detail' ? ' ' : '验收时间'" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="type === 'detail'" style="width: 100%;" />
             </el-form-item>
           </el-col>
 
@@ -575,7 +689,7 @@
             <el-form-item label="物资申请单" prop="goodsApplyNo">
               <el-input v-model="goodsCheckForm.goodsApplyId" type="hidden" />
               <el-input v-model="goodsCheckForm.goodsApplyNo" :disabled="true">
-                <template #append>
+                <template v-if="type !== 'detail'" #append>
                   <el-button size="small" :disabled="keyFieldsDisable" @click="showConsumableApplyFilter">
                     选择
                   </el-button>
@@ -585,48 +699,49 @@
           </el-col>
         </el-row>
       </detail-block>
-      <detail-block v-if="current === 'consumable-check-basic'" title="">
-        <table-container title="验收详情">
-          <el-row :gutter="24">
-            <el-col :span="6">
-              <el-form-item label="名称" prop="goodsName">
-                <el-input v-model="goodsCheckForm.goodsName" :disabled="type === 'detail'" />
-              </el-form-item>
-            </el-col>
+      <detail-block v-if="current === 'consumable-check-basic'" title="物资明细">
+        <template v-if="type !== 'detail'" #btns>
+          <el-button type="primary" @click="addRow">
+            增加行
+          </el-button>
+          <el-button type="info" @click="delRow">
+            删除行
+          </el-button>
+        </template>
 
-            <el-col :span="6">
-              <el-form-item label="规格型号" prop="goodsModel">
-                <el-input v-model="goodsCheckForm.goodsModel" :disabled="type === 'detail'" />
-              </el-form-item>
-            </el-col>
+        <!-- 表格区域 -->
+        <el-table :data="recordDetailList" border @selection-change="multiSelect">
+          <el-table-column v-if="type !== 'detail'" type="selection" align="center" width="38" />
+          <el-table-column align="center" label="序号" width="55" type="index" />
+          <el-table-column
+            v-for="item in goodsColumns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
 
-            <el-col :span="6">
-              <el-form-item label="生产厂家" prop="goodsSupplier">
-                <el-input v-model="goodsCheckForm.goodsSupplier" :disabled="type === 'detail'" />
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="6">
-              <el-form-item label="价值" prop="goodsWorth">
-                <el-input v-model="goodsCheckForm.goodsWorth" :disabled="type === 'detail'" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-          <el-row :gutter="24">
-            <el-col :span="18">
-              <el-form-item label="主要性能指标" prop="performance">
-                <el-input v-model="goodsCheckForm.performance" type="textarea" :rows="5" :disabled="type === 'detail'" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </table-container>
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required && type !== 'detail'" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-input
+                v-if="item.required === true && type !== 'detail'"
+                v-model="scope.row[item.value]"
+                :placeholder="item.text"
+                type="textarea"
+                autosize
+              />
+            </template>
+          </el-table-column>
+        </el-table>
       </detail-block>
     </el-form>
 
     <approval-dialog
       ref="approvalDialog"
-      @on-success="approvalSuccessHandler" @on-refuse="refuseHandler" @on-revoke="revokeHandler"
+      @on-success="approvalSuccessHandler" @on-refuse="refuseHandler"
     />
 
     <filter-consumable-apply ref="applyFilterRef" @record-selected="applyFormSelectedHandler" />

diff --git a/src/api/resource/questionnaire.ts b/src/api/resource/questionnaire.ts
index f40c875..9e55dc7 100644
--- a/src/api/resource/questionnaire.ts
+++ b/src/api/resource/questionnaire.ts
@@ -17,3 +17,22 @@
     data,
   })
 }
+
+// 发送
+export function send(data: { ids: string[] }) {
+  return request({
+    url: `${prefix}/questionnaire/send`,
+    method: 'post',
+    data,
+  })
+}
+
+remindWorker
+// 催办
+export function remindWorker(data: { id: string }) {
+  return request({
+    url: `${prefix}/questionnaire/remindWorker`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/resource/common/filterConsumableCheck.vue b/src/views/resource/common/filterConsumableCheck.vue
new file mode 100644
index 0000000..14f6d0a
--- /dev/null
+++ b/src/views/resource/common/filterConsumableCheck.vue
@@ -0,0 +1,198 @@
+<!-- 选择物资验收记录 -->
+<script lang="ts" setup name="FilterConsumableCheck">
+import { ElMessage } from 'element-plus'
+import type { Ref } from 'vue'
+import { ref } from 'vue'
+import dayjs from 'dayjs'
+import type { DateModelType } from 'element-plus'
+import { getLocationList } from '@/api/business/taskMeasure/measureData'
+import { getGoodsCheckList } from '@/api/resource/supplierConsumable'
+import { getStaffList } from '@/api/resource/register'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { getCustomerInfoList } from '@/api/resource/customer'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  recordNo: '', // 记录单编号
+  createDept: '',
+  createUserName: '', // 创建人
+  acceptTimeStart: '', // 创建时间-起始
+  acceptTimeEnd: '', // 创建时间-结束
+  approvalStatus: '0', // 审批状态
+  formId: SCHEDULE.CHECK_MATERIAL_RECORD_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
+  offset: 1,
+  limit: 20,
+})
+// 多选选中的内容
+const checkoutList = ref([])
+const loadingTable = ref(false)
+const list = ref([]) // 表格数据
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '文件编号', value: 'recordNo', align: 'center', width: '200' },
+  { text: '物资名称', value: 'goodsName', align: 'center' },
+  { text: '规格型号', value: 'goodsModel', align: 'center' },
+  { text: '验收部门', value: 'createDept', align: 'center', width: '160' },
+  { text: '验收人', value: 'createUserName', align: 'center', width: '120' },
+  { text: '验收时间', value: 'createTime', align: 'center', width: '120' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '100' },
+])
+const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
+
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getGoodsCheckList(listQuery.value).then((response) => {
+    if (response.code === 200) {
+      list.value = response.data.rows.map((item: any) => {
+        return {
+          ...item,
+          createTime: item.createTime!.length > 16 ? item.createTime!.substring(0, 10) : '',
+        }
+      })
+      total.value = parseInt(response.data.total)
+    }
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
+}
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    recordNo: '', // 记录单编号
+    createDept: '',
+    createUserName: '', // 创建人
+    acceptTimeStart: '', // 创建时间-起始
+    acceptTimeEnd: '', // 创建时间-结束
+    approvalStatus: '0', // 审批状态
+    formId: SCHEDULE.CHECK_MATERIAL_RECORD_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
+    offset: 1,
+    limit: 20,
+  }
+  dateRange.value = ['', '']
+  fetchData()
+}
+// 搜索
+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
+  }
+  search()
+}
+// 点击确定
+const confirmSelect = (row: any) => {
+  emits('confirm', [row])
+  dialogFormVisible.value = false
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData()
+}
+
+watch(dateRange, (val) => {
+  if (val) {
+    listQuery.value.acceptTimeStart = dayjs(val[0]).format('YYYY-MM-DD') === 'Invalid Date' ? '' : dayjs(val[0]).format('YYYY-MM-DD')
+    listQuery.value.acceptTimeEnd = dayjs(val[1]).format('YYYY-MM-DD') === 'Invalid Date' ? '' : dayjs(val[1]).format('YYYY-MM-DD')
+  }
+  else {
+    listQuery.value.acceptTimeStart = ''
+    listQuery.value.acceptTimeEnd = ''
+  }
+})
+
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择工作间" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input v-model="listQuery.recordNo" placeholder="文件编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.createDept" placeholder="验收部门" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.createUserName" placeholder="验收人" clearable />
+      </search-item>
+      <search-item>
+        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="验收时间（开始）" end-placeholder="验收时间（结束）" />
+      </search-item>
+    </search-area>
+
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        :height="520"
+        :is-show-single-select-button="true"
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column fixed="right" label="操作" align="center" width="130">
+            <template #default="{ row }">
+              <el-button size="small" type="primary" @click="confirmSelect(row)">
+                选定
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <!-- <el-button type="primary" @click="confirmSelect">确认</el-button> -->
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/resource/common/filterCustomerStaff.vue b/src/views/resource/common/filterCustomerStaff.vue
index 610bf51..fd40e61 100644
--- a/src/views/resource/common/filterCustomerStaff.vue
+++ b/src/views/resource/common/filterCustomerStaff.vue
@@ -1,5 +1,6 @@
 <!-- 筛选系统用户弹窗 -->
 <script name="FilterCustomerStaff" lang="ts" setup>
+import { ElMessage } from 'element-plus'
 import type { ICustomerFilter, ICustomerTree } from './common-interface'
 import type { ICustomerInfo } from '@/views/resource/customer/info/customer-info'
 import type { IlistQueryType } from '@/views/system/user/user-interface'
@@ -7,11 +8,15 @@
 import { getCustomerInfoList } from '@/api/resource/customer'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 
-defineProps({
+const props = defineProps({
   title: {
     type: String,
     default: '请选择',
   },
+  isMulti: { // 是否多选
+    type: Boolean,
+    default: false,
+  },
 })
 
 const emit = defineEmits(['recordSelected'])
@@ -20,9 +25,10 @@
   children: 'children',
   label: 'customerName',
 }
-
+const tableLoading = ref(false)
 // 定义变量
 const customerIdSelected = ref<string>('')
+const customerDeptIdSelected = ref<string>('')
 const customerNameSelected = ref<string>('')
 const disabledCustomerName = ref(false) // 委托方筛选是否禁用
 const getCustomerName = ref('') // 委托方
@@ -44,7 +50,9 @@
   endTime: '',
   deptType: '',
 })
+const tableRef = ref()
 const sysUserList = ref([])
+const checkoutList = ref([]) // 多选
 const total = ref<number>(0) // 数据总条数
 const columns = ref <Array<TableColumn>>([
   { text: '账号', value: 'account', align: 'center' },
@@ -53,9 +61,13 @@
 ]) // 表头
 
 const customerTree = ref<Array<ICustomerTree>>([])
-
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
 // 查询用户列表
 const getSysUserList = () => {
+  tableLoading.value = true
   getAllUserList(sysUserQuery.value).then((res) => {
     if (res.code === 200) {
       sysUserList.value = res.data.rows.map((item: any) => {
@@ -63,10 +75,12 @@
           ...item,
           customerId: customerIdSelected.value,
           customerName: customerNameSelected.value,
+          customerDeptId: customerDeptIdSelected,
         }
       })
       total.value = Number(res.data.total)
     }
+    tableLoading.value = false
   })
 }
 
@@ -101,17 +115,25 @@
 
   // 赋值选中的委托方
   customerIdSelected.value = data.id
+  customerDeptIdSelected.value = data.deptId
   customerNameSelected.value = data.customerName
 
   getSysUserList()
 }
 
-// 选中用户
+// 单选选定
 const selectSingleUser = (row: Object) => {
   emit('recordSelected', row)
 }
 
-const showOrHideFilterDialog = (show: boolean, customerName = '', disabledCustomerNameParam = false) => {
+/**
+ * 弹窗显隐
+ * @param show 控制弹窗显隐
+ * @param customerName 委托方名称
+ * @param disabledCustomerNameParam 禁止修改委托方名称
+ * @param writerNames 委托方意见登记表--[]则清空原有的多选
+ */
+const showOrHideFilterDialog = (show: boolean, customerName = '', disabledCustomerNameParam = false, writerNames = []) => {
   if (show === false) {
     customerQuery.value.customerName = ''
     customerQuery.value.approvalStatus = '0'
@@ -136,6 +158,21 @@
   }
 
   showFilterDialog.value = show
+
+  if (!writerNames.length && show && tableRef.value) {
+    console.log('清除多选')
+    tableRef.value.clearMulti()
+  }
+}
+
+// 多选确定
+const submitEquipmentSelected = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('至少选中一条数据')
+    return false
+  }
+  emit('recordSelected', checkoutList.value)
+  showOrHideFilterDialog(false)
 }
 
 defineExpose({
@@ -176,13 +213,18 @@
         </search-area>
 
         <!-- 表格数据展示 -->
-        <table-container :title-show="false">
+        <table-container v-loading="tableLoading" :title-show="false">
           <!-- 表格区域 -->
           <normal-table
             id="sysUserFilter"
+            ref="tableRef"
             :data="sysUserList" :total="total" :columns="columns"
             :query="{ limit: sysUserQuery.limit, offset: sysUserQuery.offset }"
+            is-showmulti-select
+            :is-multi="isMulti"
+            :height="520"
             @change="changePage"
+            @multi-select="handleSelectionChange"
           >
             <template #preColumns>
               <el-table-column label="序号" width="55" align="center">
@@ -191,7 +233,7 @@
                 </template>
               </el-table-column>
             </template>
-            <template #columns>
+            <template v-if="!props.isMulti" #columns>
               <el-table-column fixed="right" label="操作" align="center" width="130">
                 <template #default="{ row }">
                   <el-button size="small" type="primary" @click="selectSingleUser(row)">
@@ -204,6 +246,15 @@
         </table-container>
       </div>
     </div>
+    <!-- 多选 -->
+    <template v-if="props.isMulti" #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitEquipmentSelected">
+          确定
+        </el-button>
+        <el-button @click="showOrHideFilterDialog(false)">取消</el-button>
+      </span>
+    </template>
   </el-dialog>
 </template>
 
diff --git a/src/views/resource/common/filterSysUser.vue b/src/views/resource/common/filterSysUser.vue
index 71ec72d..4efa44f 100644
--- a/src/views/resource/common/filterSysUser.vue
+++ b/src/views/resource/common/filterSysUser.vue
@@ -1,7 +1,8 @@
 <!-- 筛选系统用户弹窗 -->
 <script name="FilterSysUser" lang="ts" setup>
+import { ElMessage } from 'element-plus'
 import type { IlistQueryType, addInfo } from '@/views/system/user/user-interface'
-import { getUserList } from '@/api/system/user'
+import { getAllUserList } from '@/api/system/user'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
 
@@ -11,6 +12,10 @@
     type: Boolean,
     default: true,
   },
+  isMulti: { // 是否多选
+    type: Boolean,
+    default: false,
+  },
 })
 const emit = defineEmits(['recordSelected'])
 const tableLoading = ref(false)
@@ -28,6 +33,7 @@
 })
 const pid = ref<string>('')
 const sysUserList = ref<Array<addInfo>>([])
+const checkoutList = ref<Array<addInfo>>([]) // 多选
 const total = ref<number>(0) // 数据总条数
 const columns = ref <Array<TableColumn>>([
   { text: '账号', value: 'account', align: 'center' },
@@ -35,7 +41,10 @@
   { text: '部门', value: 'deptName', align: 'center' },
   { text: '人员类别', value: 'avatarName', align: 'center' },
 ]) // 表头
-
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
 const staffTypeMap = ref({}) as any// 人员类别
 // 获取字典
 const fetchDict = async () => {
@@ -48,7 +57,7 @@
 
 const getSysUserList = () => {
   tableLoading.value = true
-  getUserList(searchQuery).then((res) => {
+  getAllUserList(searchQuery).then((res) => {
     if (res.code === 200) {
       sysUserList.value = res.data.rows.map((item: { avatar: string }) => {
         return {
@@ -62,6 +71,19 @@
   })
 }
 
+// 重置
+const reset = () => {
+  searchQuery.keywords = ''
+  searchQuery.deptId = ''
+  searchQuery.offset = 1
+  searchQuery.limit = 20
+  searchQuery.sort = ''
+  searchQuery.beginTime = ''
+  searchQuery.endTime = ''
+  searchQuery.deptType = ''
+  getSysUserList()
+}
+
 // 逻辑
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -73,10 +95,12 @@
   getSysUserList()
 }
 
+// 单选确定
 const selectSingleUser = (row: addInfo) => {
   emit('recordSelected', row)
 }
 
+// 取消
 const showOrHideFilterDialog = (show: boolean, deptId = '') => {
   if (show === false) {
     searchQuery.keywords = ''
@@ -95,6 +119,16 @@
   showFilterDialog.value = show
 }
 
+// 多选确定
+const submitEquipmentSelected = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('至少选中一条数据')
+    return false
+  }
+  emit('recordSelected', checkoutList.value)
+  showOrHideFilterDialog(false)
+}
+
 defineExpose({
   showOrHideFilterDialog,
 })
@@ -102,7 +136,7 @@
 
 <template>
   <el-dialog v-model="showFilterDialog" title="选择用户" :append-to-body="true" :close-on-click-modal="false" top="10vh">
-    <search-area :need-clear="false" @search="getSysUserList">
+    <search-area :need-clear="true" @search="getSysUserList" @clear="reset">
       <search-item>
         <el-input v-model="searchQuery.keywords" placeholder="姓名" clearable />
       </search-item>
@@ -119,7 +153,11 @@
         v-loading="tableLoading" :data="sysUserList" :total="total"
         :columns="columns"
         :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+        is-showmulti-select
+        :is-multi="isMulti"
+        :height="520"
         @change="changePage"
+        @multi-select="handleSelectionChange"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
@@ -128,7 +166,8 @@
             </template>
           </el-table-column>
         </template>
-        <template #columns>
+        <!-- 单选 -->
+        <template v-if="!props.isMulti" #columns>
           <el-table-column fixed="right" label="操作" align="center" width="130">
             <template #default="{ row }">
               <el-button size="small" type="primary" @click="selectSingleUser(row)">
@@ -139,5 +178,14 @@
         </template>
       </normal-table>
     </table-container>
+    <!-- 多选 -->
+    <template v-if="props.isMulti" #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitEquipmentSelected">
+          确定
+        </el-button>
+        <el-button @click="showOrHideFilterDialog(false)">取消</el-button>
+      </span>
+    </template>
   </el-dialog>
 </template>
diff --git a/src/views/resource/customer/questionnaire/customer-questionnaire.ts b/src/views/resource/customer/questionnaire/customer-questionnaire.ts
index 7391891..a3b40fc 100644
--- a/src/views/resource/customer/questionnaire/customer-questionnaire.ts
+++ b/src/views/resource/customer/questionnaire/customer-questionnaire.ts
@@ -39,6 +39,8 @@
   itemTen: string
   score?: string
   [key: string]: string | undefined
+  sendFlag: string // 是否已发送（1/2）
+  sendFlagName: string // 是否已发送（1/2）
 }
 
 export interface ICustomerRateColumn {
diff --git a/src/views/resource/customer/questionnaire/detail.vue b/src/views/resource/customer/questionnaire/detail.vue
index 6560afd..553ebb4 100644
--- a/src/views/resource/customer/questionnaire/detail.vue
+++ b/src/views/resource/customer/questionnaire/detail.vue
@@ -1,12 +1,14 @@
 <!-- 委托方满意度调查表详情 -->
 <script name="QuestionnaireDetail" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
-import type{ ICustomerQuestionnaireInfo, ICustomerRateColumn } from './customer-questionnaire'
+import type { ICustomerQuestionnaireInfo, ICustomerRateColumn } from './customer-questionnaire'
 import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
 import useUserStore from '@/store/modules/user'
-import { addQuestionnaire } from '@/api/resource/questionnaire'
+import FilterSysUser from '@/views/resource/common/filterSysUser.vue'
+import { addQuestionnaire, send } from '@/api/resource/questionnaire'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import { getDictByCode } from '@/api/system/dict'
+import { uniqueArray } from '@/utils/Array'
 
 // 从路由中传过来的参数
 const type = ref<string>('')
@@ -18,7 +20,7 @@
 
 const questionnaireFormRef = ref()
 const refFilterCustomer = ref()
-
+const sendIds = ref<string[]>([]) // 发送的参数
 const questionnaireInfo = ref<ICustomerQuestionnaireInfo>({
   id: '',
   customerId: '',
@@ -31,8 +33,8 @@
   senderId: '',
   senderName: '',
   sendTime: '',
-  writerId: '',
-  writerName: '',
+  writerId: '', // 填写人id（单选用-新建不让传）
+  writerName: '', // 填写人名字(多选时候-新建不让传)
   writeTime: '',
   writeStatus: '',
   itemOne: '',
@@ -45,12 +47,15 @@
   itemEight: '',
   itemNine: '',
   itemTen: '',
+
+  sendFlag: '', // 是否已发送（1/2）
+  sendFlagName: '', // 是否已发送（1/2）
 })
 
 const questionnaireFormRules = ref({
-  labCode: [{ required: true, message: '实验室不能为空，请选择', trigger: ['change', 'blur'] }],
-  customerId: [{ required: true, message: '填写单位不能为空，请选择', trigger: 'change' }],
-  writerId: [{ required: true, message: '填写人不能为空，请选择', trigger: 'change' }],
+  labCode: [{ required: true, message: '实验室不能为空', trigger: ['change', 'blur'] }],
+  customerId: [{ required: true, message: '填写单位不能为空', trigger: 'change' }],
+  writerName: [{ required: true, message: '填写人不能为空', trigger: 'change' }],
 }) // 表单验证规则
 
 // 字典值
@@ -71,28 +76,43 @@
   { index: 10, text: '10、对所提供的计量保障是否满意', value: 0, attributeName: 'itemTen' },
 ])
 
-// 逻辑
-
-// 显示筛选填写用户和单位的弹窗
+// ---------------------------------------------多选填写人----------------------------------------------
+const writerNames = ref<{ customerId: string; writerId: string }[]>([]) // 选择的填写人数组
+// 点击选择填写人
 const showFilterCustomerDialog = () => {
-  refFilterCustomer.value.showOrHideFilterDialog(true)
+  refFilterCustomer.value.showOrHideFilterDialog(true, '', false, writerNames.value)
 }
 
-// 返回选定结果
-const recordSelectedHandler = (row: any) => {
+// 选定填写人
+const recordSelectedHandler = (list: any) => {
   refFilterCustomer.value.showOrHideFilterDialog(false)
-
-  if (row.id !== '') {
-    questionnaireInfo.value.customerId = row.customerId
-    questionnaireInfo.value.customerName = row.customerName
-    questionnaireInfo.value.writerId = row.id
-    questionnaireInfo.value.writerName = row.name
+  if (list && list.length) {
+    writerNames.value = list.map((item: { customerDeptId: string; id: string }) => {
+      return {
+        customerId: item.customerDeptId,
+        writerId: item.id,
+      }
+    })
+    questionnaireInfo.value.writerName = list.map((item: { name: string }) => item.name).join(',')
+    // 填写单位
+    questionnaireInfo.value.customerName = uniqueArray(list.map((item: { customerName: string }) => item.customerName)).join(',')
+    questionnaireInfo.value.customerId = uniqueArray(list.map((item: { customerDeptId: string }) => item.customerDeptId)).join(',')
   }
   else {
     ElMessage.error('填写单位和填写人不能为空，请重新选择')
   }
 }
 
+// 清空填写人
+const clean = () => {
+  questionnaireInfo.value.writerName = ''
+  questionnaireInfo.value.customerName = ''
+  questionnaireInfo.value.customerId = ''
+  writerNames.value = []
+}
+
+// ---------------------------------------------------------------------------------------------------
+
 // 保存
 const saveQuestionnaireInfo = () => {
   let satisfactionStr = ''
@@ -109,19 +129,29 @@
     if (satisfactionStr.length === 10) {
       questionnaireInfo.value.writeTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 填写时间为当前时间
     }
-
+    const params = {
+      ...questionnaireInfo.value,
+      writerId: null, // 填写人id（单选用-多选时候新建不让传）
+      writerName: null, // 填写人名字(多选时候-新建不让传)
+      sendFlag: '2', // 是否已发送（1/2）
+      sendFlagName: '未发送', // 是否已发送（1/2）
+      customerName: null,
+      customerId: null,
+      sendDTOs: writerNames.value, // 填写人信息
+    }
     // 提交接口
-    addQuestionnaire(questionnaireInfo.value).then((res) => {
+    addQuestionnaire(params).then((res) => {
       if (res.code === 200) {
       // 提示保存成功
-        ElMessage.success('委托方满意度调查表创建并发送成功')
+        ElMessage.success('委托方满意度调查表创建成功')
 
         // 设置返回的委托方id和委托方编号
-        questionnaireInfo.value.questionnaireNo = res.data.questionnaireNo
-        questionnaireInfo.value.id = res.data.id
-        id.value = res.data.id
+        // questionnaireInfo.value.questionnaireNo = res.data.questionnaireNo
+        // questionnaireInfo.value.id = res.data.id
+        // id.value = res.data.id
 
         type.value = 'detail'
+        sendIds.value = res.data
       }
       else {
       // 提示失败信息
@@ -193,6 +223,18 @@
   router.go(-1)
 }
 
+// 点击发送
+const handleSend = () => {
+  if (sendIds && sendIds.value.length) {
+    send({ ids: sendIds.value }).then((res) => {
+      ElMessage.success('发送成功')
+    })
+  }
+  else {
+    ElMessage.warning('没有发送的单位或个人')
+  }
+}
+
 const initDialog = (params: any) => {
   // 从路由中获取参数
   type.value = params.type
@@ -205,7 +247,8 @@
       questionnaireInfo.value.senderId = userInfo.id
       questionnaireInfo.value.senderName = userInfo.name
       questionnaireInfo.value.sendTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
-
+      questionnaireInfo.value.labCode = userInfo.bizLabCode // 实验室代码
+      questionnaireInfo.value.labCodeName = userInfo.labCodeName // 实验室名称
       break
 
     case 'detail':
@@ -275,6 +318,9 @@
     <el-form ref="questionnaireFormRef" :model="questionnaireInfo" :rules="questionnaireFormRules" label-position="right" label-width="110px" border stripe>
       <detail-page title="委托方满意度调查表">
         <template #btns>
+          <el-button v-if="type === 'detail'" type="primary" @click="handleSend">
+            发送
+          </el-button>
           <el-button v-if="type !== 'detail'" type="primary" @click="saveButtonHandler">
             保存
           </el-button>
@@ -284,7 +330,6 @@
         </template>
 
         <el-row :gutter="24">
-          <!-- 第一行 第一列 -->
           <el-col :span="6">
             <el-form-item label="实验室" prop="labCode">
               <el-select v-model="questionnaireInfo.labCode" placeholder="请选择实验室" :disabled="type === 'detail'" style="width: 100%;">
@@ -292,46 +337,52 @@
               </el-select>
               <el-input v-model="questionnaireInfo.labCodeName" type="hidden" />
             </el-form-item>
-
-            <el-form-item label="填写单位" prop="customerId">
-              <el-input v-model="questionnaireInfo.customerName" :disabled="true" placeholder="选择填写人时自动填充" />
-              <el-input v-model="questionnaireInfo.customerId" type="hidden" />
-            </el-form-item>
           </el-col>
-
           <el-col :span="6">
             <el-form-item label="文件编号">
-              <el-input v-model="questionnaireInfo.questionnaireNo" placeholder="文件编号，保存后自动生成" :disabled="true" />
-            </el-form-item>
-
-            <el-form-item label="填写人" prop="writerId">
-              <el-input v-model="questionnaireInfo.writerName" :readonly="true" :disabled="true">
-                <template #append>
-                  <el-button size="small" :disabled="type === 'detail'" @click="showFilterCustomerDialog">
-                    选择
-                  </el-button>
-                </template>
-              </el-input>
-              <el-input v-model="questionnaireInfo.writerId" type="hidden" />
+              <el-input v-model="questionnaireInfo.questionnaireNo" placeholder="系统自动生成" :disabled="true" />
             </el-form-item>
           </el-col>
-
           <el-col :span="6">
             <el-form-item label="发送人">
               <el-input v-model="questionnaireInfo.senderName" :disabled="true" />
               <el-input v-model="questionnaireInfo.senderId" type="hidden" />
             </el-form-item>
-
-            <el-form-item label="填写时间">
-              <el-input v-model="questionnaireInfo.writeTime" :disabled="true" />
-            </el-form-item>
           </el-col>
-
           <el-col :span="6">
             <el-form-item label="发送时间">
               <el-input v-model="questionnaireInfo.sendTime" placeholder="保存后自动生成" :disabled="true" />
             </el-form-item>
           </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="填写人" prop="writerName" style="display: flex;">
+              <el-button size="small" type="primary" :disabled="type === 'detail'" @click="showFilterCustomerDialog">
+                {{ questionnaireInfo.writerName ? '继续添加' : '添加' }}
+              </el-button>
+              <el-button size="small" type="info" :disabled="type === 'detail'" @click="clean">
+                清空
+              </el-button>
+              <el-input v-model="questionnaireInfo.writerName" placeholder="请添加填写人" style="margin-top: 8px;" :readonly="true" :disabled="true" type="textarea" autosize>
+                <!-- <template #append>
+                  <el-button size="small" :disabled="type === 'detail'" @click="showFilterCustomerDialog">
+                    选择
+                  </el-button>
+                </template> -->
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="填写单位" prop="customerId">
+              <el-input v-model="questionnaireInfo.customerName" type="textarea" :autosize="{ minRows: 3 }" :disabled="true" placeholder="选择填写人时自动填充" />
+              <el-input v-model="questionnaireInfo.customerId" type="hidden" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="填写时间">
+              <el-input v-model="questionnaireInfo.writeTime" :disabled="true" />
+            </el-form-item>
+          </el-col>
         </el-row>
       </detail-page>
 
@@ -350,8 +401,8 @@
         </el-row>
       </table-container>
     </el-form>
-
-    <filter-customer-staff ref="refFilterCustomer" title="请选择填写单位和填写人" @record-selected="recordSelectedHandler" />
+    <!-- 单选填写人--先选委托方，再去选委托方下面的人 -->
+    <filter-customer-staff ref="refFilterCustomer" :is-multi="true" title="请选择填写单位和填写人" @record-selected="recordSelectedHandler" />
   </app-container>
 </template>
 
diff --git a/src/views/resource/customer/questionnaire/list.vue b/src/views/resource/customer/questionnaire/list.vue
index a2306ff..553e5f3 100644
--- a/src/views/resource/customer/questionnaire/list.vue
+++ b/src/views/resource/customer/questionnaire/list.vue
@@ -2,9 +2,9 @@
 <script name="QuestionnaireList" lang="ts" setup>
 import { ElMessage, dayjs } from 'element-plus'
 import type { DateModelType } from 'element-plus'
-import type{ ICustomerQuestionnaireInfo, IListQuery } from './customer-questionnaire'
+import type { ICustomerQuestionnaireInfo, IListQuery } from './customer-questionnaire'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getQuestionnaireList } from '@/api/resource/questionnaire'
+import { getQuestionnaireList, remindWorker } from '@/api/resource/questionnaire'
 
 const { proxy } = getCurrentInstance() as any
 const router = useRouter()
@@ -118,7 +118,9 @@
 }
 
 const urging = (row: ICustomerQuestionnaireInfo) => {
-  ElMessage.success(`满意度调查表 ${row.questionnaireNo} 填写消息已发送`)
+  remindWorker({ id: row.id }).then((res) => {
+    ElMessage.success(`满意度调查表 ${row.questionnaireNo} 填写消息已催办`)
+  })
 }
 
 watch(dateRangeSend, (val) => {
@@ -194,7 +196,8 @@
               <el-button size="small" type="primary" link @click="detail(row)">
                 详情
               </el-button>
-              <el-button v-if="row.writeStatus !== '已提交'" size="small" type="primary" link @click="urging(row)">
+              <!-- <el-button v-if="row.writeStatus !== '已提交'" size="small" type="primary" link @click="urging(row)"> -->
+              <el-button size="small" type="primary" link @click="urging(row)">
                 催办
               </el-button>
             </template>
diff --git a/src/views/resource/customer/situationReport/dialog/selectSuggestFormDialog.vue b/src/views/resource/customer/situationReport/dialog/selectSuggestFormDialog.vue
index 8fa636b..a491499 100644
--- a/src/views/resource/customer/situationReport/dialog/selectSuggestFormDialog.vue
+++ b/src/views/resource/customer/situationReport/dialog/selectSuggestFormDialog.vue
@@ -130,7 +130,7 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择委托方" width="65%">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择委托方意见登记表" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="clearList">
       <search-item width="162px">
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index a5508b4..9066757 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -456,7 +456,7 @@
     locationName: '', // 地点名称
     locationNo: '', // 地点编号
     labName: lab, // 所属实验室
-    limit: 20,
+    limit: 999999,
     offset: 1,
   }
   getLocationList(params).then((response) => {
diff --git a/src/views/resource/environment/voltage/edit.vue b/src/views/resource/environment/voltage/edit.vue
index b8a9290..ad03b80 100644
--- a/src/views/resource/environment/voltage/edit.vue
+++ b/src/views/resource/environment/voltage/edit.vue
@@ -58,6 +58,8 @@
 
   testUseEquipment: '', //	测试所用设备
   testUseEquipmentId: '', //		测试所用设备id
+  model: '', // 型号
+  manufactureNo: '', // 出厂编号
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
   groupCode: '', // 部门
@@ -417,6 +419,8 @@
   if (list && list.length) {
     recordForm.value.testUseEquipment = list[0].equipmentName //	测试所用设备
     recordForm.value.testUseEquipmentId = list[0].id //		测试所用设备id
+    recordForm.value.model = list[0].model //		型号
+    recordForm.value.manufactureNo = list[0].manufactureNo //		出厂编号
   }
 }
 
@@ -463,8 +467,7 @@
   // 从路由中获取参数
   type.value = params.type
   id.value = params.id !== undefined ? params.id : ''
-  status.value = params.status !== undefined ? params.status : ''
-
+  status.value = params.status
   // 默认显示第一个tab内容
   current.value = radioItems.value[0].value
   currentLabel.value = radioItems.value[0].name
@@ -517,7 +520,6 @@
     if (radioItems.value[radioItems.value.length - 1].value === 'voltage-approval') {
       radioItems.value.pop()
     }
-    console.log(radioItems.value)
   }
   else { // 非全部和草稿箱把审批详情加上
     if (radioItems.value[radioItems.value.length - 1].value !== 'voltage-approval') {
@@ -541,7 +543,7 @@
     locationName: '', // 地点名称
     locationNo: '', // 地点编号
     labName: lab, // 所属实验室
-    limit: 20,
+    limit: 999999,
     offset: 1,
   }
   getLocationList(params).then((response) => {
@@ -618,6 +620,20 @@
       <detail-block v-if="current === 'voltage-basic'">
         <el-row :gutter="24">
           <el-col :span="6">
+            <el-form-item label="实验室" prop="labCode">
+              <el-select v-model="recordForm.labCode" placeholder="请选择实验室" :disabled="type === 'detail'" style="width: 100%;" @change="changeLab">
+                <el-option v-for="dict in labCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="recordForm.groupCode" placeholder="请选择部门" :disabled="type === 'detail'" style="width: 100%;">
+                <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="记录编号">
               <el-input v-model="recordForm.recordNo" placeholder="系统自动生成" :disabled="true" />
             </el-form-item>
@@ -651,7 +667,7 @@
             <el-form-item label="测试地点" prop="testLocation">
               <!-- <el-input v-model="recordForm.testLocation" :placeholder="type === 'detail' ? ' ' : '请输入测试地点'" :disabled="type === 'detail'" /> -->
               <el-autocomplete
-                v-model="detailRequire.testLocation"
+                v-model="recordForm.testLocation"
                 :fetch-suggestions="querySearchTestLocation"
                 placeholder="工作间名称"
                 clearable
@@ -669,27 +685,22 @@
               </el-input>
             </el-form-item>
           </el-col>
-
           <el-col :span="6">
+            <el-form-item label="型号" prop="model">
+              <el-input v-model="recordForm.model" :placeholder="type === 'detail' ? ' ' : '型号'" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号" prop="manufactureNo">
+              <el-input v-model="recordForm.manufactureNo" :placeholder="type === 'detail' ? ' ' : '出厂编号'" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
             <el-form-item label="测试依据" prop="testBasis">
               <el-input v-model="recordForm.testBasis" :placeholder="type === 'detail' ? ' ' : '请输入测试依据'" :disabled="type === 'detail'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="实验室" prop="labCode">
-              <el-select v-model="recordForm.labCode" placeholder="请选择实验室" :disabled="type === 'detail'" style="width: 100%;" @change="changeLab">
-                <el-option v-for="dict in labCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="recordForm.groupCode" placeholder="请选择部门" :disabled="type === 'detail'" style="width: 100%;">
-                <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="电源电压空载(V)" prop="powerVoltageNoLoad">
               <el-input v-model="recordForm.powerVoltageNoLoad" :placeholder="type === 'detail' ? ' ' : '请输入电源电压空载'" :disabled="type === 'detail'" />
             </el-form-item>
diff --git a/src/views/resource/environment/voltage/list.vue b/src/views/resource/environment/voltage/list.vue
index 001a6d6..bce6ec9 100644
--- a/src/views/resource/environment/voltage/list.vue
+++ b/src/views/resource/environment/voltage/list.vue
@@ -52,33 +52,35 @@
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '测试时间', value: 'testTime', align: 'center', width: '120' },
-  { text: '测试地点', value: 'testLocation', align: 'center', width: '200' },
-  { text: '实验室', value: 'labCodeName', align: 'center' },
-  { text: '部门', value: 'groupCodeName', align: 'center' },
-  { text: '测试所用设备', value: 'testUseEquipment', align: 'center', width: '200' },
-  { text: '测试依据', value: 'testBasis', align: 'center' },
+  { text: '测试地点', value: 'testLocation', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '测试所用设备', value: 'testUseEquipment', align: 'center' },
+  { text: '型号', value: 'model', align: 'center' },
+  { text: '出厂编号', value: 'manufactureNo', align: 'center' },
+  { text: '测试依据', value: 'testBasis', align: 'center', width: '220' },
   {
     text: '电源电压(V)',
     value: '',
     align: 'center',
-    width: '120',
+    width: '220',
     children: [
-      { text: '空载', value: 'powerVoltageNoLoad', align: 'center', width: '60' },
-      { text: '加载', value: 'powerVoltageLoad', align: 'center', width: '60' },
+      { text: '空载', value: 'powerVoltageNoLoad', align: 'center', width: '120' },
+      { text: '加载', value: 'powerVoltageLoad', align: 'center', width: '120' },
     ],
   },
   {
     text: '零地电压(V)',
     value: '',
     align: 'center',
-    width: '120',
+    width: '220',
     children: [
-      { text: '空载', value: 'zeroVoltageNoLoad', align: 'center', width: '60' },
-      { text: '加载', value: 'zeroVoltageLoad', align: 'center', width: '60' },
+      { text: '空载', value: 'zeroVoltageNoLoad', align: 'center', width: '120' },
+      { text: '加载', value: 'zeroVoltageLoad', align: 'center', width: '120' },
     ],
   },
-  { text: '结论', value: 'conclusion', align: 'center', width: '160' },
-  { text: '测试人', value: 'createUserName', align: 'center', width: '120' },
+  { text: '结论', value: 'conclusion', align: 'center' },
+  { text: '测试人', value: 'createUserName', align: 'center' },
   { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '100' },
 ])
 const list = ref<Array<IVoltageRecord>>([]) // 表格数据
diff --git a/src/views/resource/environment/voltage/voltage-interface.ts b/src/views/resource/environment/voltage/voltage-interface.ts
index 5afb1fe..cd7c137 100644
--- a/src/views/resource/environment/voltage/voltage-interface.ts
+++ b/src/views/resource/environment/voltage/voltage-interface.ts
@@ -36,6 +36,8 @@
 
   testUseEquipment: string //	测试所用设备
   testUseEquipmentId: string //		测试所用设备id
+  model: string // 型号
+  manufactureNo: string // 出厂编号
   labCode: string // 实验室
   labCodeName: string // 实验室名称
   groupCode: string // 部门
diff --git a/src/views/resource/outsideService/consumable/applyDetail.vue b/src/views/resource/outsideService/consumable/applyDetail.vue
index 0950cc1..65d27dd 100644
--- a/src/views/resource/outsideService/consumable/applyDetail.vue
+++ b/src/views/resource/outsideService/consumable/applyDetail.vue
@@ -638,7 +638,7 @@
         <table-container title="物资明细">
           <template v-if="type !== 'detail'" #btns-right>
             <el-button type="primary" @click="addEditableRow">
-              增加行
+              批量增加
             </el-button>
             <el-button type="info" @click="delSupplierRecords">
               删除行
diff --git a/src/views/resource/outsideService/consumable/checkDetail.vue b/src/views/resource/outsideService/consumable/checkDetail.vue
index bbc7a1b..1caccd0 100644
--- a/src/views/resource/outsideService/consumable/checkDetail.vue
+++ b/src/views/resource/outsideService/consumable/checkDetail.vue
@@ -1,7 +1,7 @@
 <!-- 物资验收记录单详情 -->
 <script name="ConsumableCheckDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
-import type { IConsumableApply, IGoodsCheckRecord } from './consumable-interface'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import type { IConsumableApply, IGoodsCheckRecord, IRecordDetail } from './consumable-interface'
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import FilterConsumableApply from '@/views/resource/common/filterConsumableApply.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
@@ -10,6 +10,7 @@
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
+import { useCheckList } from '@/commonMethods/useCheckList'
 
 // 变量
 // 从路由中传过来的参数
@@ -62,17 +63,23 @@
 })
 
 const checkRules = ref({
-  labCode: [{ required: true, message: '实验室不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
-  acceptTime: [{ required: true, message: '验收时间不能为空，请选择', trigger: 'blur' }],
-  goodsApplyNo: [{ required: true, message: '易耗物资申请单不能为空，请选择', trigger: 'blur' }],
-  goodsName: [{ required: true, message: '物资名称不能为空', trigger: 'blur' }],
-  goodsModel: [{ required: true, message: '规格型号不能为空', trigger: 'blur' }],
-  goodsSupplier: [{ required: true, message: '生产厂家不能为空', trigger: 'blur' }],
-  goodsWorth: [{ required: true, message: '价值不能为空', trigger: 'blur' }],
-  performance: [{ required: true, message: '主要性能指标不能为空', trigger: 'blur' }],
+  labCode: [{ required: true, message: '实验室不能为空', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['change', 'blur'] }],
+  acceptTime: [{ required: true, message: '验收时间不能为空', trigger: 'blur' }],
+  goodsApplyNo: [{ required: true, message: '易耗物资申请单不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 
+const recordDetailList = ref<IRecordDetail[]>([]) // 验收详情表格
+const recordDetailCheckoutList = ref<IRecordDetail[]>([]) // 验收详情多选
+const goodsColumns = [
+  { text: '名称', value: 'goodsName', align: 'center', required: true },
+  { text: '规格型号', value: 'goodsModel', align: 'center', required: true },
+  { text: '生产厂家', value: 'goodsSupplier', align: 'center', required: true },
+  { text: '价值', value: 'goodsWorth', align: 'center', required: true },
+  { text: '数量', value: 'goodsAmount', align: 'center', required: true },
+  { text: '主要性能指标', value: 'performance', align: 'center', required: true },
+] // 表头
+
 // 是否显示相关按钮
 const saveButtVisable = ref<boolean>(false) // 是否显示 保存 按钮
 const submitButtVisable = ref<boolean>(false) // 是否显示 提交 按钮
@@ -165,7 +172,16 @@
 // 保存至草稿箱
 const saveDraftCheck = () => {
   goodsCheckForm.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 创建时间改为提交时间
-  saveGoodsCheck(goodsCheckForm.value).then((res) => {
+  const params = {
+    ...goodsCheckForm.value,
+    recordDetailList: recordDetailList.value,
+  }
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  saveGoodsCheck(params).then((res) => {
     if (res.code === 200) {
       // 提示保存成功
       ElMessage.success('保存成功')
@@ -176,15 +192,22 @@
 
       type.value = 'update'
       status.value = '1' // 保存成功后进入草稿箱 为了不显示审批详情
+      loading.close()
     }
     else {
       // 提示失败信息
       ElMessage.error(`保存失败：${res.message}`)
+      loading.close()
     }
   })
 }
 // 编辑草稿箱（不走流程审批）
 const updateDraftCheck = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
   updateGoodsCheck(goodsCheckForm.value).then((res) => {
     if (res.code === 200) {
       // 提示保存成功
@@ -194,6 +217,7 @@
       // 提示失败信息
       ElMessage.error(`保存失败：${res.message}`)
     }
+    loading.close()
   })
 }
 
@@ -210,7 +234,9 @@
 // 新建时保存后的处理 获取返回的id
 const saveButtonHandler = async () => {
   if (!goodsCheckRef) { return }
-
+  if (!useCheckList(recordDetailList.value, goodsColumns, '物资明细')) {
+    return false
+  }
   await goodsCheckRef.value.validate((valid: boolean) => {
     if (valid === true) {
       ElMessageBox.confirm(
@@ -242,6 +268,11 @@
       cancelButtonText: '取消',
       type: 'warning',
     }).then(() => {
+      const loading = ElLoading.service({
+        lock: true,
+        text: '加载中...',
+        background: 'rgba(255, 255, 255, 0.6)',
+      })
       submitGoodsCheck({
         formId: SCHEDULE.CHECK_MATERIAL_RECORD_APPROVAL,
         id: goodsCheckForm.value.id,
@@ -255,6 +286,7 @@
         else {
           ElMessage.error(`物资验收记录单 ${goodsCheckForm.value.recordNo} 提交失败：${res.message}`)
         }
+        loading.close()
       })
     })
   }
@@ -262,6 +294,11 @@
     // 之前已经在流程中的表单 保存提交
     await goodsCheckRef.value.validate((valid: boolean) => {
       if (valid === true) {
+        const loading = ElLoading.service({
+          lock: true,
+          text: '加载中...',
+          background: 'rgba(255, 255, 255, 0.6)',
+        })
         failUpdateGoodsCheck(goodsCheckForm.value).then((res) => {
           if (res.code === 200) {
           // 提示保存成功
@@ -274,6 +311,7 @@
           // 提示失败信息
             ElMessage.error(`物资验收记录单 ${goodsCheckForm.value.recordNo} 提交失败：${res.message}`)
           }
+          loading.close()
         })
       }
     })
@@ -282,17 +320,23 @@
 
 // 根据id查询详情
 const detailById = async (id: string) => {
-  await detailGoodsCheck({ id }).then((res) => {
-    if (res.code === 200) {
-      goodsCheckForm.value = res.data
-      if (goodsCheckForm.value.taskId === '') {
-        goodsCheckForm.value.taskId = sessionStorage.getItem('consumableCheckTaskId')!
-      }
-      detailConsumableApply({ id: goodsCheckForm.value.goodsApplyId }).then((response) => {
-        goodsCheckForm.value.goodsApplyNo = response.data.applyNo
-      })
-    }
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
   })
+  const res = await detailGoodsCheck({ id })
+  if (res.code === 200) {
+    goodsCheckForm.value = res.data
+    if (goodsCheckForm.value.taskId === '') {
+      goodsCheckForm.value.taskId = sessionStorage.getItem('consumableCheckTaskId')!
+    }
+    detailConsumableApply({ id: goodsCheckForm.value.goodsApplyId }).then((response) => {
+      goodsCheckForm.value.goodsApplyNo = response.data.applyNo
+    })
+    recordDetailList.value = res.data.recordDetailList // 物资明细
+    loading.close()
+  }
 }
 
 // 流程审批-拒绝
@@ -307,7 +351,35 @@
 
 // 取消流程
 const revokeClickedHandler = () => {
-  approvalDialog.value.initDialog('revoke', goodsCheckForm.value.id, goodsCheckForm.value.taskId || route.query.taskId, goodsCheckForm.value.processId || route.query.processId)
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      const loading = ElLoading.service({
+        lock: true,
+        text: '加载中...',
+        background: 'rgba(255, 255, 255, 0.6)',
+      })
+      const params = {
+        processInstanceId: goodsCheckForm.value.processId!,
+        comments: '',
+        id: id.value,
+      }
+      revokeApprovalCheck(params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '已取消',
+        })
+        cancelButtVisable.value = false
+        loading.close()
+      })
+    })
 }
 
 // 删除审批单
@@ -339,22 +411,6 @@
   }
 }
 
-// 取消
-const revokeHandler = (param: any) => {
-  revokeApprovalCheck(param).then((res) => {
-    if (res.code === 200) {
-      ElMessage.success('流程取消成功')
-    }
-    else {
-      ElMessage.error(`流程取消失败：${res.message}`)
-    }
-    // 关闭弹窗
-    approvalDialog.value.handleClose()
-
-    cancelButtVisable.value = false
-  })
-}
-
 // 拒绝
 const refuseHandler = (param: any) => {
   refuseApprovalCheck(param).then((res) => {
@@ -371,17 +427,71 @@
   })
 }
 
+// ------------------------------------物资明细表格-------------------------------------------------------------
+// 多选
+const multiSelect = (e: any) => {
+  recordDetailCheckoutList.value = e
+}
+
+// 增加行
+const addRow = () => {
+  if (!useCheckList(recordDetailList.value, goodsColumns, '物资明细')) {
+    return false
+  }
+  recordDetailList.value.push({
+    goodsAmount: '', // 数量
+    goodsModel: '', // 型号
+    goodsName: '', // 名称
+    goodsSupplier: '', // 生产厂家
+    goodsWorth: '', // 价值
+    id: '',
+    recordId: '',
+    performance: '', // 性能指标
+  })
+}
+
+// 删除行
+const delRow = () => {
+  if (recordDetailCheckoutList.value.length === 0) {
+    ElMessage.warning('请至少选择一行')
+    return
+  }
+
+  recordDetailList.value = recordDetailList.value.filter(item => recordDetailCheckoutList.value.includes(item) === false)
+}
+// ------------------------------------物资申请单------------------------------------------------------------------------
+// 点击选择物资申请单
 const showConsumableApplyFilter = () => {
   applyFilterRef.value.showOrHideFilterDialog(true)
 }
 
+// 选好物资申请单
 const applyFormSelectedHandler = (apply: IConsumableApply) => {
   goodsCheckForm.value.goodsApplyId = apply.id
   goodsCheckForm.value.goodsApplyNo = apply.applyNo
   goodsCheckForm.value.goodsApply = apply.applyName
 
   applyFilterRef.value.showOrHideFilterDialog(false)
+
+  // 查询物资申请单详情-获取物资列表
+  if (apply.id) {
+    detailConsumableApply({ id: apply.id }).then((res) => {
+      recordDetailList.value = res.data.goodsDetailList.map((item: any) => {
+        return {
+          goodsAmount: item.goodsQuantity, // 数量
+          goodsModel: item.goodsModel, // 型号
+          goodsName: item.goodsName, // 名称
+          goodsSupplier: item.supplierName, // 生产厂家
+          goodsWorth: '', // 价值
+          id: '',
+          recordId: item.id,
+          performance: '', // 性能指标
+        }
+      })
+    })
+  }
 }
+// ---------------------------------------------------------------------------------------------------------------------
 
 const getLabCodeDict = async () => {
   // 先从缓存中获取
@@ -439,6 +549,10 @@
       goodsCheckForm.value.createDeptId = userInfo.deptId
       goodsCheckForm.value.createDept = userInfo.deptName
       goodsCheckForm.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
+      goodsCheckForm.value.labCode = userInfo.bizLabCode // 实验室代码
+      goodsCheckForm.value.labCodeName = userInfo.labCodeName // 实验室名称
+      goodsCheckForm.value.groupCode = userInfo.groupNo // 部门代码
+      goodsCheckForm.value.groupCodeName = userInfo.groupName // 部门名称
 
       keyFieldsDisable.value = false
 
@@ -511,7 +625,7 @@
           <el-button v-if="submitButtVisable" :disabled="id === ''" type="primary" @click="submitButtonHandler">
             提交
           </el-button>
-          <el-button v-if="saveButtVisable" type="primary" @click="saveButtonHandler">
+          <el-button v-if="saveButtVisable" :disabled="type === 'create' && id !== ''" type="primary" @click="saveButtonHandler">
             保存
           </el-button>
 
@@ -536,7 +650,7 @@
           <!-- 第一行 第一列 -->
           <el-col :span="6">
             <el-form-item label="实验室" prop="labCode">
-              <el-select v-model="goodsCheckForm.labCode" placeholder="请选择实验室" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-select v-model="goodsCheckForm.labCode" placeholder="请选择实验室" :disabled="keyFieldsDisable || type === 'detail'" style="width: 100%;">
                 <el-option v-for="dict in labCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
@@ -548,7 +662,7 @@
 
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="goodsCheckForm.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-select v-model="goodsCheckForm.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable || type === 'detail'" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
@@ -560,10 +674,10 @@
 
           <el-col :span="6">
             <el-form-item label="文件编号">
-              <el-input v-model="goodsCheckForm.recordNo" placeholder="文件编号，保存后自动生成" :disabled="true" />
+              <el-input v-model="goodsCheckForm.recordNo" placeholder="系统自动生成" :disabled="true" />
             </el-form-item>
             <el-form-item label="验收时间" prop="acceptTime">
-              <el-date-picker v-model="goodsCheckForm.acceptTime" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="type === 'detail'" style="width: 100%;" />
+              <el-date-picker v-model="goodsCheckForm.acceptTime" :placeholder="type === 'detail' ? ' ' : '验收时间'" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="type === 'detail'" style="width: 100%;" />
             </el-form-item>
           </el-col>
 
@@ -575,7 +689,7 @@
             <el-form-item label="物资申请单" prop="goodsApplyNo">
               <el-input v-model="goodsCheckForm.goodsApplyId" type="hidden" />
               <el-input v-model="goodsCheckForm.goodsApplyNo" :disabled="true">
-                <template #append>
+                <template v-if="type !== 'detail'" #append>
                   <el-button size="small" :disabled="keyFieldsDisable" @click="showConsumableApplyFilter">
                     选择
                   </el-button>
@@ -585,48 +699,49 @@
           </el-col>
         </el-row>
       </detail-block>
-      <detail-block v-if="current === 'consumable-check-basic'" title="">
-        <table-container title="验收详情">
-          <el-row :gutter="24">
-            <el-col :span="6">
-              <el-form-item label="名称" prop="goodsName">
-                <el-input v-model="goodsCheckForm.goodsName" :disabled="type === 'detail'" />
-              </el-form-item>
-            </el-col>
+      <detail-block v-if="current === 'consumable-check-basic'" title="物资明细">
+        <template v-if="type !== 'detail'" #btns>
+          <el-button type="primary" @click="addRow">
+            增加行
+          </el-button>
+          <el-button type="info" @click="delRow">
+            删除行
+          </el-button>
+        </template>
 
-            <el-col :span="6">
-              <el-form-item label="规格型号" prop="goodsModel">
-                <el-input v-model="goodsCheckForm.goodsModel" :disabled="type === 'detail'" />
-              </el-form-item>
-            </el-col>
+        <!-- 表格区域 -->
+        <el-table :data="recordDetailList" border @selection-change="multiSelect">
+          <el-table-column v-if="type !== 'detail'" type="selection" align="center" width="38" />
+          <el-table-column align="center" label="序号" width="55" type="index" />
+          <el-table-column
+            v-for="item in goodsColumns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
 
-            <el-col :span="6">
-              <el-form-item label="生产厂家" prop="goodsSupplier">
-                <el-input v-model="goodsCheckForm.goodsSupplier" :disabled="type === 'detail'" />
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="6">
-              <el-form-item label="价值" prop="goodsWorth">
-                <el-input v-model="goodsCheckForm.goodsWorth" :disabled="type === 'detail'" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-          <el-row :gutter="24">
-            <el-col :span="18">
-              <el-form-item label="主要性能指标" prop="performance">
-                <el-input v-model="goodsCheckForm.performance" type="textarea" :rows="5" :disabled="type === 'detail'" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </table-container>
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required && type !== 'detail'" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-input
+                v-if="item.required === true && type !== 'detail'"
+                v-model="scope.row[item.value]"
+                :placeholder="item.text"
+                type="textarea"
+                autosize
+              />
+            </template>
+          </el-table-column>
+        </el-table>
       </detail-block>
     </el-form>
 
     <approval-dialog
       ref="approvalDialog"
-      @on-success="approvalSuccessHandler" @on-refuse="refuseHandler" @on-revoke="revokeHandler"
+      @on-success="approvalSuccessHandler" @on-refuse="refuseHandler"
     />
 
     <filter-consumable-apply ref="applyFilterRef" @record-selected="applyFormSelectedHandler" />
diff --git a/src/views/resource/outsideService/consumable/checkList.vue b/src/views/resource/outsideService/consumable/checkList.vue
index 2ef68f8..0da57fa 100644
--- a/src/views/resource/outsideService/consumable/checkList.vue
+++ b/src/views/resource/outsideService/consumable/checkList.vue
@@ -248,7 +248,29 @@
 
 // 取消（撤回审批单）
 const revokeApprById = (row: IGoodsCheckRecord) => {
-  apprDial.value.initDialog('revoke', row.id, row.taskId, row.processId)
+  const params = {
+    processInstanceId: row.processId!,
+    comments: '',
+    id: row.id,
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      revokeApprovalCheck(params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '已取消',
+        })
+        fetchData(true)
+      })
+    })
 }
 
 // 流程操作之后刷新
@@ -256,22 +278,6 @@
   fetchData(true)
 }
 
-// 取消
-const revokeHandler = (param: any) => {
-  revokeApprovalCheck(param).then((res) => {
-    if (res.code === 200) {
-      ElMessage.success('流程取消成功')
-    }
-    else {
-      ElMessage.error(`流程取消失败：${res.message}`)
-    }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
-    fetchData(true)
-  })
-}
-
 // 拒绝
 const refuseHandler = (param: any) => {
   refuseApprovalCheck(param).then((res) => {
@@ -424,7 +430,6 @@
       ref="apprDial"
       @on-success="afterApprovalHandler"
       @on-refuse="refuseHandler"
-      @on-revoke="revokeHandler"
     />
 
     <!-- 右上角按钮集合 -->

diff --git a/src/api/resource/questionnaire.ts b/src/api/resource/questionnaire.ts
index f40c875..9e55dc7 100644
--- a/src/api/resource/questionnaire.ts
+++ b/src/api/resource/questionnaire.ts
@@ -17,3 +17,22 @@
     data,
   })
 }
+
+// 发送
+export function send(data: { ids: string[] }) {
+  return request({
+    url: `${prefix}/questionnaire/send`,
+    method: 'post',
+    data,
+  })
+}
+
+remindWorker
+// 催办
+export function remindWorker(data: { id: string }) {
+  return request({
+    url: `${prefix}/questionnaire/remindWorker`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/resource/common/filterConsumableCheck.vue b/src/views/resource/common/filterConsumableCheck.vue
new file mode 100644
index 0000000..14f6d0a
--- /dev/null
+++ b/src/views/resource/common/filterConsumableCheck.vue
@@ -0,0 +1,198 @@
+<!-- 选择物资验收记录 -->
+<script lang="ts" setup name="FilterConsumableCheck">
+import { ElMessage } from 'element-plus'
+import type { Ref } from 'vue'
+import { ref } from 'vue'
+import dayjs from 'dayjs'
+import type { DateModelType } from 'element-plus'
+import { getLocationList } from '@/api/business/taskMeasure/measureData'
+import { getGoodsCheckList } from '@/api/resource/supplierConsumable'
+import { getStaffList } from '@/api/resource/register'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { getCustomerInfoList } from '@/api/resource/customer'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  recordNo: '', // 记录单编号
+  createDept: '',
+  createUserName: '', // 创建人
+  acceptTimeStart: '', // 创建时间-起始
+  acceptTimeEnd: '', // 创建时间-结束
+  approvalStatus: '0', // 审批状态
+  formId: SCHEDULE.CHECK_MATERIAL_RECORD_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
+  offset: 1,
+  limit: 20,
+})
+// 多选选中的内容
+const checkoutList = ref([])
+const loadingTable = ref(false)
+const list = ref([]) // 表格数据
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '文件编号', value: 'recordNo', align: 'center', width: '200' },
+  { text: '物资名称', value: 'goodsName', align: 'center' },
+  { text: '规格型号', value: 'goodsModel', align: 'center' },
+  { text: '验收部门', value: 'createDept', align: 'center', width: '160' },
+  { text: '验收人', value: 'createUserName', align: 'center', width: '120' },
+  { text: '验收时间', value: 'createTime', align: 'center', width: '120' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '100' },
+])
+const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
+
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getGoodsCheckList(listQuery.value).then((response) => {
+    if (response.code === 200) {
+      list.value = response.data.rows.map((item: any) => {
+        return {
+          ...item,
+          createTime: item.createTime!.length > 16 ? item.createTime!.substring(0, 10) : '',
+        }
+      })
+      total.value = parseInt(response.data.total)
+    }
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
+}
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    recordNo: '', // 记录单编号
+    createDept: '',
+    createUserName: '', // 创建人
+    acceptTimeStart: '', // 创建时间-起始
+    acceptTimeEnd: '', // 创建时间-结束
+    approvalStatus: '0', // 审批状态
+    formId: SCHEDULE.CHECK_MATERIAL_RECORD_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
+    offset: 1,
+    limit: 20,
+  }
+  dateRange.value = ['', '']
+  fetchData()
+}
+// 搜索
+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
+  }
+  search()
+}
+// 点击确定
+const confirmSelect = (row: any) => {
+  emits('confirm', [row])
+  dialogFormVisible.value = false
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData()
+}
+
+watch(dateRange, (val) => {
+  if (val) {
+    listQuery.value.acceptTimeStart = dayjs(val[0]).format('YYYY-MM-DD') === 'Invalid Date' ? '' : dayjs(val[0]).format('YYYY-MM-DD')
+    listQuery.value.acceptTimeEnd = dayjs(val[1]).format('YYYY-MM-DD') === 'Invalid Date' ? '' : dayjs(val[1]).format('YYYY-MM-DD')
+  }
+  else {
+    listQuery.value.acceptTimeStart = ''
+    listQuery.value.acceptTimeEnd = ''
+  }
+})
+
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择工作间" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input v-model="listQuery.recordNo" placeholder="文件编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.createDept" placeholder="验收部门" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.createUserName" placeholder="验收人" clearable />
+      </search-item>
+      <search-item>
+        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="验收时间（开始）" end-placeholder="验收时间（结束）" />
+      </search-item>
+    </search-area>
+
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        :height="520"
+        :is-show-single-select-button="true"
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column fixed="right" label="操作" align="center" width="130">
+            <template #default="{ row }">
+              <el-button size="small" type="primary" @click="confirmSelect(row)">
+                选定
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <!-- <el-button type="primary" @click="confirmSelect">确认</el-button> -->
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/resource/common/filterCustomerStaff.vue b/src/views/resource/common/filterCustomerStaff.vue
index 610bf51..fd40e61 100644
--- a/src/views/resource/common/filterCustomerStaff.vue
+++ b/src/views/resource/common/filterCustomerStaff.vue
@@ -1,5 +1,6 @@
 <!-- 筛选系统用户弹窗 -->
 <script name="FilterCustomerStaff" lang="ts" setup>
+import { ElMessage } from 'element-plus'
 import type { ICustomerFilter, ICustomerTree } from './common-interface'
 import type { ICustomerInfo } from '@/views/resource/customer/info/customer-info'
 import type { IlistQueryType } from '@/views/system/user/user-interface'
@@ -7,11 +8,15 @@
 import { getCustomerInfoList } from '@/api/resource/customer'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 
-defineProps({
+const props = defineProps({
   title: {
     type: String,
     default: '请选择',
   },
+  isMulti: { // 是否多选
+    type: Boolean,
+    default: false,
+  },
 })
 
 const emit = defineEmits(['recordSelected'])
@@ -20,9 +25,10 @@
   children: 'children',
   label: 'customerName',
 }
-
+const tableLoading = ref(false)
 // 定义变量
 const customerIdSelected = ref<string>('')
+const customerDeptIdSelected = ref<string>('')
 const customerNameSelected = ref<string>('')
 const disabledCustomerName = ref(false) // 委托方筛选是否禁用
 const getCustomerName = ref('') // 委托方
@@ -44,7 +50,9 @@
   endTime: '',
   deptType: '',
 })
+const tableRef = ref()
 const sysUserList = ref([])
+const checkoutList = ref([]) // 多选
 const total = ref<number>(0) // 数据总条数
 const columns = ref <Array<TableColumn>>([
   { text: '账号', value: 'account', align: 'center' },
@@ -53,9 +61,13 @@
 ]) // 表头
 
 const customerTree = ref<Array<ICustomerTree>>([])
-
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
 // 查询用户列表
 const getSysUserList = () => {
+  tableLoading.value = true
   getAllUserList(sysUserQuery.value).then((res) => {
     if (res.code === 200) {
       sysUserList.value = res.data.rows.map((item: any) => {
@@ -63,10 +75,12 @@
           ...item,
           customerId: customerIdSelected.value,
           customerName: customerNameSelected.value,
+          customerDeptId: customerDeptIdSelected,
         }
       })
       total.value = Number(res.data.total)
     }
+    tableLoading.value = false
   })
 }
 
@@ -101,17 +115,25 @@
 
   // 赋值选中的委托方
   customerIdSelected.value = data.id
+  customerDeptIdSelected.value = data.deptId
   customerNameSelected.value = data.customerName
 
   getSysUserList()
 }
 
-// 选中用户
+// 单选选定
 const selectSingleUser = (row: Object) => {
   emit('recordSelected', row)
 }
 
-const showOrHideFilterDialog = (show: boolean, customerName = '', disabledCustomerNameParam = false) => {
+/**
+ * 弹窗显隐
+ * @param show 控制弹窗显隐
+ * @param customerName 委托方名称
+ * @param disabledCustomerNameParam 禁止修改委托方名称
+ * @param writerNames 委托方意见登记表--[]则清空原有的多选
+ */
+const showOrHideFilterDialog = (show: boolean, customerName = '', disabledCustomerNameParam = false, writerNames = []) => {
   if (show === false) {
     customerQuery.value.customerName = ''
     customerQuery.value.approvalStatus = '0'
@@ -136,6 +158,21 @@
   }
 
   showFilterDialog.value = show
+
+  if (!writerNames.length && show && tableRef.value) {
+    console.log('清除多选')
+    tableRef.value.clearMulti()
+  }
+}
+
+// 多选确定
+const submitEquipmentSelected = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('至少选中一条数据')
+    return false
+  }
+  emit('recordSelected', checkoutList.value)
+  showOrHideFilterDialog(false)
 }
 
 defineExpose({
@@ -176,13 +213,18 @@
         </search-area>
 
         <!-- 表格数据展示 -->
-        <table-container :title-show="false">
+        <table-container v-loading="tableLoading" :title-show="false">
           <!-- 表格区域 -->
           <normal-table
             id="sysUserFilter"
+            ref="tableRef"
             :data="sysUserList" :total="total" :columns="columns"
             :query="{ limit: sysUserQuery.limit, offset: sysUserQuery.offset }"
+            is-showmulti-select
+            :is-multi="isMulti"
+            :height="520"
             @change="changePage"
+            @multi-select="handleSelectionChange"
           >
             <template #preColumns>
               <el-table-column label="序号" width="55" align="center">
@@ -191,7 +233,7 @@
                 </template>
               </el-table-column>
             </template>
-            <template #columns>
+            <template v-if="!props.isMulti" #columns>
               <el-table-column fixed="right" label="操作" align="center" width="130">
                 <template #default="{ row }">
                   <el-button size="small" type="primary" @click="selectSingleUser(row)">
@@ -204,6 +246,15 @@
         </table-container>
       </div>
     </div>
+    <!-- 多选 -->
+    <template v-if="props.isMulti" #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitEquipmentSelected">
+          确定
+        </el-button>
+        <el-button @click="showOrHideFilterDialog(false)">取消</el-button>
+      </span>
+    </template>
   </el-dialog>
 </template>
 
diff --git a/src/views/resource/common/filterSysUser.vue b/src/views/resource/common/filterSysUser.vue
index 71ec72d..4efa44f 100644
--- a/src/views/resource/common/filterSysUser.vue
+++ b/src/views/resource/common/filterSysUser.vue
@@ -1,7 +1,8 @@
 <!-- 筛选系统用户弹窗 -->
 <script name="FilterSysUser" lang="ts" setup>
+import { ElMessage } from 'element-plus'
 import type { IlistQueryType, addInfo } from '@/views/system/user/user-interface'
-import { getUserList } from '@/api/system/user'
+import { getAllUserList } from '@/api/system/user'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
 
@@ -11,6 +12,10 @@
     type: Boolean,
     default: true,
   },
+  isMulti: { // 是否多选
+    type: Boolean,
+    default: false,
+  },
 })
 const emit = defineEmits(['recordSelected'])
 const tableLoading = ref(false)
@@ -28,6 +33,7 @@
 })
 const pid = ref<string>('')
 const sysUserList = ref<Array<addInfo>>([])
+const checkoutList = ref<Array<addInfo>>([]) // 多选
 const total = ref<number>(0) // 数据总条数
 const columns = ref <Array<TableColumn>>([
   { text: '账号', value: 'account', align: 'center' },
@@ -35,7 +41,10 @@
   { text: '部门', value: 'deptName', align: 'center' },
   { text: '人员类别', value: 'avatarName', align: 'center' },
 ]) // 表头
-
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
 const staffTypeMap = ref({}) as any// 人员类别
 // 获取字典
 const fetchDict = async () => {
@@ -48,7 +57,7 @@
 
 const getSysUserList = () => {
   tableLoading.value = true
-  getUserList(searchQuery).then((res) => {
+  getAllUserList(searchQuery).then((res) => {
     if (res.code === 200) {
       sysUserList.value = res.data.rows.map((item: { avatar: string }) => {
         return {
@@ -62,6 +71,19 @@
   })
 }
 
+// 重置
+const reset = () => {
+  searchQuery.keywords = ''
+  searchQuery.deptId = ''
+  searchQuery.offset = 1
+  searchQuery.limit = 20
+  searchQuery.sort = ''
+  searchQuery.beginTime = ''
+  searchQuery.endTime = ''
+  searchQuery.deptType = ''
+  getSysUserList()
+}
+
 // 逻辑
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -73,10 +95,12 @@
   getSysUserList()
 }
 
+// 单选确定
 const selectSingleUser = (row: addInfo) => {
   emit('recordSelected', row)
 }
 
+// 取消
 const showOrHideFilterDialog = (show: boolean, deptId = '') => {
   if (show === false) {
     searchQuery.keywords = ''
@@ -95,6 +119,16 @@
   showFilterDialog.value = show
 }
 
+// 多选确定
+const submitEquipmentSelected = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('至少选中一条数据')
+    return false
+  }
+  emit('recordSelected', checkoutList.value)
+  showOrHideFilterDialog(false)
+}
+
 defineExpose({
   showOrHideFilterDialog,
 })
@@ -102,7 +136,7 @@
 
 <template>
   <el-dialog v-model="showFilterDialog" title="选择用户" :append-to-body="true" :close-on-click-modal="false" top="10vh">
-    <search-area :need-clear="false" @search="getSysUserList">
+    <search-area :need-clear="true" @search="getSysUserList" @clear="reset">
       <search-item>
         <el-input v-model="searchQuery.keywords" placeholder="姓名" clearable />
       </search-item>
@@ -119,7 +153,11 @@
         v-loading="tableLoading" :data="sysUserList" :total="total"
         :columns="columns"
         :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+        is-showmulti-select
+        :is-multi="isMulti"
+        :height="520"
         @change="changePage"
+        @multi-select="handleSelectionChange"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
@@ -128,7 +166,8 @@
             </template>
           </el-table-column>
         </template>
-        <template #columns>
+        <!-- 单选 -->
+        <template v-if="!props.isMulti" #columns>
           <el-table-column fixed="right" label="操作" align="center" width="130">
             <template #default="{ row }">
               <el-button size="small" type="primary" @click="selectSingleUser(row)">
@@ -139,5 +178,14 @@
         </template>
       </normal-table>
     </table-container>
+    <!-- 多选 -->
+    <template v-if="props.isMulti" #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitEquipmentSelected">
+          确定
+        </el-button>
+        <el-button @click="showOrHideFilterDialog(false)">取消</el-button>
+      </span>
+    </template>
   </el-dialog>
 </template>
diff --git a/src/views/resource/customer/questionnaire/customer-questionnaire.ts b/src/views/resource/customer/questionnaire/customer-questionnaire.ts
index 7391891..a3b40fc 100644
--- a/src/views/resource/customer/questionnaire/customer-questionnaire.ts
+++ b/src/views/resource/customer/questionnaire/customer-questionnaire.ts
@@ -39,6 +39,8 @@
   itemTen: string
   score?: string
   [key: string]: string | undefined
+  sendFlag: string // 是否已发送（1/2）
+  sendFlagName: string // 是否已发送（1/2）
 }
 
 export interface ICustomerRateColumn {
diff --git a/src/views/resource/customer/questionnaire/detail.vue b/src/views/resource/customer/questionnaire/detail.vue
index 6560afd..553ebb4 100644
--- a/src/views/resource/customer/questionnaire/detail.vue
+++ b/src/views/resource/customer/questionnaire/detail.vue
@@ -1,12 +1,14 @@
 <!-- 委托方满意度调查表详情 -->
 <script name="QuestionnaireDetail" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
-import type{ ICustomerQuestionnaireInfo, ICustomerRateColumn } from './customer-questionnaire'
+import type { ICustomerQuestionnaireInfo, ICustomerRateColumn } from './customer-questionnaire'
 import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
 import useUserStore from '@/store/modules/user'
-import { addQuestionnaire } from '@/api/resource/questionnaire'
+import FilterSysUser from '@/views/resource/common/filterSysUser.vue'
+import { addQuestionnaire, send } from '@/api/resource/questionnaire'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import { getDictByCode } from '@/api/system/dict'
+import { uniqueArray } from '@/utils/Array'
 
 // 从路由中传过来的参数
 const type = ref<string>('')
@@ -18,7 +20,7 @@
 
 const questionnaireFormRef = ref()
 const refFilterCustomer = ref()
-
+const sendIds = ref<string[]>([]) // 发送的参数
 const questionnaireInfo = ref<ICustomerQuestionnaireInfo>({
   id: '',
   customerId: '',
@@ -31,8 +33,8 @@
   senderId: '',
   senderName: '',
   sendTime: '',
-  writerId: '',
-  writerName: '',
+  writerId: '', // 填写人id（单选用-新建不让传）
+  writerName: '', // 填写人名字(多选时候-新建不让传)
   writeTime: '',
   writeStatus: '',
   itemOne: '',
@@ -45,12 +47,15 @@
   itemEight: '',
   itemNine: '',
   itemTen: '',
+
+  sendFlag: '', // 是否已发送（1/2）
+  sendFlagName: '', // 是否已发送（1/2）
 })
 
 const questionnaireFormRules = ref({
-  labCode: [{ required: true, message: '实验室不能为空，请选择', trigger: ['change', 'blur'] }],
-  customerId: [{ required: true, message: '填写单位不能为空，请选择', trigger: 'change' }],
-  writerId: [{ required: true, message: '填写人不能为空，请选择', trigger: 'change' }],
+  labCode: [{ required: true, message: '实验室不能为空', trigger: ['change', 'blur'] }],
+  customerId: [{ required: true, message: '填写单位不能为空', trigger: 'change' }],
+  writerName: [{ required: true, message: '填写人不能为空', trigger: 'change' }],
 }) // 表单验证规则
 
 // 字典值
@@ -71,28 +76,43 @@
   { index: 10, text: '10、对所提供的计量保障是否满意', value: 0, attributeName: 'itemTen' },
 ])
 
-// 逻辑
-
-// 显示筛选填写用户和单位的弹窗
+// ---------------------------------------------多选填写人----------------------------------------------
+const writerNames = ref<{ customerId: string; writerId: string }[]>([]) // 选择的填写人数组
+// 点击选择填写人
 const showFilterCustomerDialog = () => {
-  refFilterCustomer.value.showOrHideFilterDialog(true)
+  refFilterCustomer.value.showOrHideFilterDialog(true, '', false, writerNames.value)
 }
 
-// 返回选定结果
-const recordSelectedHandler = (row: any) => {
+// 选定填写人
+const recordSelectedHandler = (list: any) => {
   refFilterCustomer.value.showOrHideFilterDialog(false)
-
-  if (row.id !== '') {
-    questionnaireInfo.value.customerId = row.customerId
-    questionnaireInfo.value.customerName = row.customerName
-    questionnaireInfo.value.writerId = row.id
-    questionnaireInfo.value.writerName = row.name
+  if (list && list.length) {
+    writerNames.value = list.map((item: { customerDeptId: string; id: string }) => {
+      return {
+        customerId: item.customerDeptId,
+        writerId: item.id,
+      }
+    })
+    questionnaireInfo.value.writerName = list.map((item: { name: string }) => item.name).join(',')
+    // 填写单位
+    questionnaireInfo.value.customerName = uniqueArray(list.map((item: { customerName: string }) => item.customerName)).join(',')
+    questionnaireInfo.value.customerId = uniqueArray(list.map((item: { customerDeptId: string }) => item.customerDeptId)).join(',')
   }
   else {
     ElMessage.error('填写单位和填写人不能为空，请重新选择')
   }
 }
 
+// 清空填写人
+const clean = () => {
+  questionnaireInfo.value.writerName = ''
+  questionnaireInfo.value.customerName = ''
+  questionnaireInfo.value.customerId = ''
+  writerNames.value = []
+}
+
+// ---------------------------------------------------------------------------------------------------
+
 // 保存
 const saveQuestionnaireInfo = () => {
   let satisfactionStr = ''
@@ -109,19 +129,29 @@
     if (satisfactionStr.length === 10) {
       questionnaireInfo.value.writeTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 填写时间为当前时间
     }
-
+    const params = {
+      ...questionnaireInfo.value,
+      writerId: null, // 填写人id（单选用-多选时候新建不让传）
+      writerName: null, // 填写人名字(多选时候-新建不让传)
+      sendFlag: '2', // 是否已发送（1/2）
+      sendFlagName: '未发送', // 是否已发送（1/2）
+      customerName: null,
+      customerId: null,
+      sendDTOs: writerNames.value, // 填写人信息
+    }
     // 提交接口
-    addQuestionnaire(questionnaireInfo.value).then((res) => {
+    addQuestionnaire(params).then((res) => {
       if (res.code === 200) {
       // 提示保存成功
-        ElMessage.success('委托方满意度调查表创建并发送成功')
+        ElMessage.success('委托方满意度调查表创建成功')
 
         // 设置返回的委托方id和委托方编号
-        questionnaireInfo.value.questionnaireNo = res.data.questionnaireNo
-        questionnaireInfo.value.id = res.data.id
-        id.value = res.data.id
+        // questionnaireInfo.value.questionnaireNo = res.data.questionnaireNo
+        // questionnaireInfo.value.id = res.data.id
+        // id.value = res.data.id
 
         type.value = 'detail'
+        sendIds.value = res.data
       }
       else {
       // 提示失败信息
@@ -193,6 +223,18 @@
   router.go(-1)
 }
 
+// 点击发送
+const handleSend = () => {
+  if (sendIds && sendIds.value.length) {
+    send({ ids: sendIds.value }).then((res) => {
+      ElMessage.success('发送成功')
+    })
+  }
+  else {
+    ElMessage.warning('没有发送的单位或个人')
+  }
+}
+
 const initDialog = (params: any) => {
   // 从路由中获取参数
   type.value = params.type
@@ -205,7 +247,8 @@
       questionnaireInfo.value.senderId = userInfo.id
       questionnaireInfo.value.senderName = userInfo.name
       questionnaireInfo.value.sendTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
-
+      questionnaireInfo.value.labCode = userInfo.bizLabCode // 实验室代码
+      questionnaireInfo.value.labCodeName = userInfo.labCodeName // 实验室名称
       break
 
     case 'detail':
@@ -275,6 +318,9 @@
     <el-form ref="questionnaireFormRef" :model="questionnaireInfo" :rules="questionnaireFormRules" label-position="right" label-width="110px" border stripe>
       <detail-page title="委托方满意度调查表">
         <template #btns>
+          <el-button v-if="type === 'detail'" type="primary" @click="handleSend">
+            发送
+          </el-button>
           <el-button v-if="type !== 'detail'" type="primary" @click="saveButtonHandler">
             保存
           </el-button>
@@ -284,7 +330,6 @@
         </template>
 
         <el-row :gutter="24">
-          <!-- 第一行 第一列 -->
           <el-col :span="6">
             <el-form-item label="实验室" prop="labCode">
               <el-select v-model="questionnaireInfo.labCode" placeholder="请选择实验室" :disabled="type === 'detail'" style="width: 100%;">
@@ -292,46 +337,52 @@
               </el-select>
               <el-input v-model="questionnaireInfo.labCodeName" type="hidden" />
             </el-form-item>
-
-            <el-form-item label="填写单位" prop="customerId">
-              <el-input v-model="questionnaireInfo.customerName" :disabled="true" placeholder="选择填写人时自动填充" />
-              <el-input v-model="questionnaireInfo.customerId" type="hidden" />
-            </el-form-item>
           </el-col>
-
           <el-col :span="6">
             <el-form-item label="文件编号">
-              <el-input v-model="questionnaireInfo.questionnaireNo" placeholder="文件编号，保存后自动生成" :disabled="true" />
-            </el-form-item>
-
-            <el-form-item label="填写人" prop="writerId">
-              <el-input v-model="questionnaireInfo.writerName" :readonly="true" :disabled="true">
-                <template #append>
-                  <el-button size="small" :disabled="type === 'detail'" @click="showFilterCustomerDialog">
-                    选择
-                  </el-button>
-                </template>
-              </el-input>
-              <el-input v-model="questionnaireInfo.writerId" type="hidden" />
+              <el-input v-model="questionnaireInfo.questionnaireNo" placeholder="系统自动生成" :disabled="true" />
             </el-form-item>
           </el-col>
-
           <el-col :span="6">
             <el-form-item label="发送人">
               <el-input v-model="questionnaireInfo.senderName" :disabled="true" />
               <el-input v-model="questionnaireInfo.senderId" type="hidden" />
             </el-form-item>
-
-            <el-form-item label="填写时间">
-              <el-input v-model="questionnaireInfo.writeTime" :disabled="true" />
-            </el-form-item>
           </el-col>
-
           <el-col :span="6">
             <el-form-item label="发送时间">
               <el-input v-model="questionnaireInfo.sendTime" placeholder="保存后自动生成" :disabled="true" />
             </el-form-item>
           </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="填写人" prop="writerName" style="display: flex;">
+              <el-button size="small" type="primary" :disabled="type === 'detail'" @click="showFilterCustomerDialog">
+                {{ questionnaireInfo.writerName ? '继续添加' : '添加' }}
+              </el-button>
+              <el-button size="small" type="info" :disabled="type === 'detail'" @click="clean">
+                清空
+              </el-button>
+              <el-input v-model="questionnaireInfo.writerName" placeholder="请添加填写人" style="margin-top: 8px;" :readonly="true" :disabled="true" type="textarea" autosize>
+                <!-- <template #append>
+                  <el-button size="small" :disabled="type === 'detail'" @click="showFilterCustomerDialog">
+                    选择
+                  </el-button>
+                </template> -->
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="填写单位" prop="customerId">
+              <el-input v-model="questionnaireInfo.customerName" type="textarea" :autosize="{ minRows: 3 }" :disabled="true" placeholder="选择填写人时自动填充" />
+              <el-input v-model="questionnaireInfo.customerId" type="hidden" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="填写时间">
+              <el-input v-model="questionnaireInfo.writeTime" :disabled="true" />
+            </el-form-item>
+          </el-col>
         </el-row>
       </detail-page>
 
@@ -350,8 +401,8 @@
         </el-row>
       </table-container>
     </el-form>
-
-    <filter-customer-staff ref="refFilterCustomer" title="请选择填写单位和填写人" @record-selected="recordSelectedHandler" />
+    <!-- 单选填写人--先选委托方，再去选委托方下面的人 -->
+    <filter-customer-staff ref="refFilterCustomer" :is-multi="true" title="请选择填写单位和填写人" @record-selected="recordSelectedHandler" />
   </app-container>
 </template>
 
diff --git a/src/views/resource/customer/questionnaire/list.vue b/src/views/resource/customer/questionnaire/list.vue
index a2306ff..553e5f3 100644
--- a/src/views/resource/customer/questionnaire/list.vue
+++ b/src/views/resource/customer/questionnaire/list.vue
@@ -2,9 +2,9 @@
 <script name="QuestionnaireList" lang="ts" setup>
 import { ElMessage, dayjs } from 'element-plus'
 import type { DateModelType } from 'element-plus'
-import type{ ICustomerQuestionnaireInfo, IListQuery } from './customer-questionnaire'
+import type { ICustomerQuestionnaireInfo, IListQuery } from './customer-questionnaire'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getQuestionnaireList } from '@/api/resource/questionnaire'
+import { getQuestionnaireList, remindWorker } from '@/api/resource/questionnaire'
 
 const { proxy } = getCurrentInstance() as any
 const router = useRouter()
@@ -118,7 +118,9 @@
 }
 
 const urging = (row: ICustomerQuestionnaireInfo) => {
-  ElMessage.success(`满意度调查表 ${row.questionnaireNo} 填写消息已发送`)
+  remindWorker({ id: row.id }).then((res) => {
+    ElMessage.success(`满意度调查表 ${row.questionnaireNo} 填写消息已催办`)
+  })
 }
 
 watch(dateRangeSend, (val) => {
@@ -194,7 +196,8 @@
               <el-button size="small" type="primary" link @click="detail(row)">
                 详情
               </el-button>
-              <el-button v-if="row.writeStatus !== '已提交'" size="small" type="primary" link @click="urging(row)">
+              <!-- <el-button v-if="row.writeStatus !== '已提交'" size="small" type="primary" link @click="urging(row)"> -->
+              <el-button size="small" type="primary" link @click="urging(row)">
                 催办
               </el-button>
             </template>
diff --git a/src/views/resource/customer/situationReport/dialog/selectSuggestFormDialog.vue b/src/views/resource/customer/situationReport/dialog/selectSuggestFormDialog.vue
index 8fa636b..a491499 100644
--- a/src/views/resource/customer/situationReport/dialog/selectSuggestFormDialog.vue
+++ b/src/views/resource/customer/situationReport/dialog/selectSuggestFormDialog.vue
@@ -130,7 +130,7 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择委托方" width="65%">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择委托方意见登记表" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="clearList">
       <search-item width="162px">
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index a5508b4..9066757 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -456,7 +456,7 @@
     locationName: '', // 地点名称
     locationNo: '', // 地点编号
     labName: lab, // 所属实验室
-    limit: 20,
+    limit: 999999,
     offset: 1,
   }
   getLocationList(params).then((response) => {
diff --git a/src/views/resource/environment/voltage/edit.vue b/src/views/resource/environment/voltage/edit.vue
index b8a9290..ad03b80 100644
--- a/src/views/resource/environment/voltage/edit.vue
+++ b/src/views/resource/environment/voltage/edit.vue
@@ -58,6 +58,8 @@
 
   testUseEquipment: '', //	测试所用设备
   testUseEquipmentId: '', //		测试所用设备id
+  model: '', // 型号
+  manufactureNo: '', // 出厂编号
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
   groupCode: '', // 部门
@@ -417,6 +419,8 @@
   if (list && list.length) {
     recordForm.value.testUseEquipment = list[0].equipmentName //	测试所用设备
     recordForm.value.testUseEquipmentId = list[0].id //		测试所用设备id
+    recordForm.value.model = list[0].model //		型号
+    recordForm.value.manufactureNo = list[0].manufactureNo //		出厂编号
   }
 }
 
@@ -463,8 +467,7 @@
   // 从路由中获取参数
   type.value = params.type
   id.value = params.id !== undefined ? params.id : ''
-  status.value = params.status !== undefined ? params.status : ''
-
+  status.value = params.status
   // 默认显示第一个tab内容
   current.value = radioItems.value[0].value
   currentLabel.value = radioItems.value[0].name
@@ -517,7 +520,6 @@
     if (radioItems.value[radioItems.value.length - 1].value === 'voltage-approval') {
       radioItems.value.pop()
     }
-    console.log(radioItems.value)
   }
   else { // 非全部和草稿箱把审批详情加上
     if (radioItems.value[radioItems.value.length - 1].value !== 'voltage-approval') {
@@ -541,7 +543,7 @@
     locationName: '', // 地点名称
     locationNo: '', // 地点编号
     labName: lab, // 所属实验室
-    limit: 20,
+    limit: 999999,
     offset: 1,
   }
   getLocationList(params).then((response) => {
@@ -618,6 +620,20 @@
       <detail-block v-if="current === 'voltage-basic'">
         <el-row :gutter="24">
           <el-col :span="6">
+            <el-form-item label="实验室" prop="labCode">
+              <el-select v-model="recordForm.labCode" placeholder="请选择实验室" :disabled="type === 'detail'" style="width: 100%;" @change="changeLab">
+                <el-option v-for="dict in labCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="recordForm.groupCode" placeholder="请选择部门" :disabled="type === 'detail'" style="width: 100%;">
+                <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="记录编号">
               <el-input v-model="recordForm.recordNo" placeholder="系统自动生成" :disabled="true" />
             </el-form-item>
@@ -651,7 +667,7 @@
             <el-form-item label="测试地点" prop="testLocation">
               <!-- <el-input v-model="recordForm.testLocation" :placeholder="type === 'detail' ? ' ' : '请输入测试地点'" :disabled="type === 'detail'" /> -->
               <el-autocomplete
-                v-model="detailRequire.testLocation"
+                v-model="recordForm.testLocation"
                 :fetch-suggestions="querySearchTestLocation"
                 placeholder="工作间名称"
                 clearable
@@ -669,27 +685,22 @@
               </el-input>
             </el-form-item>
           </el-col>
-
           <el-col :span="6">
+            <el-form-item label="型号" prop="model">
+              <el-input v-model="recordForm.model" :placeholder="type === 'detail' ? ' ' : '型号'" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号" prop="manufactureNo">
+              <el-input v-model="recordForm.manufactureNo" :placeholder="type === 'detail' ? ' ' : '出厂编号'" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
             <el-form-item label="测试依据" prop="testBasis">
               <el-input v-model="recordForm.testBasis" :placeholder="type === 'detail' ? ' ' : '请输入测试依据'" :disabled="type === 'detail'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="实验室" prop="labCode">
-              <el-select v-model="recordForm.labCode" placeholder="请选择实验室" :disabled="type === 'detail'" style="width: 100%;" @change="changeLab">
-                <el-option v-for="dict in labCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="recordForm.groupCode" placeholder="请选择部门" :disabled="type === 'detail'" style="width: 100%;">
-                <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="电源电压空载(V)" prop="powerVoltageNoLoad">
               <el-input v-model="recordForm.powerVoltageNoLoad" :placeholder="type === 'detail' ? ' ' : '请输入电源电压空载'" :disabled="type === 'detail'" />
             </el-form-item>
diff --git a/src/views/resource/environment/voltage/list.vue b/src/views/resource/environment/voltage/list.vue
index 001a6d6..bce6ec9 100644
--- a/src/views/resource/environment/voltage/list.vue
+++ b/src/views/resource/environment/voltage/list.vue
@@ -52,33 +52,35 @@
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '测试时间', value: 'testTime', align: 'center', width: '120' },
-  { text: '测试地点', value: 'testLocation', align: 'center', width: '200' },
-  { text: '实验室', value: 'labCodeName', align: 'center' },
-  { text: '部门', value: 'groupCodeName', align: 'center' },
-  { text: '测试所用设备', value: 'testUseEquipment', align: 'center', width: '200' },
-  { text: '测试依据', value: 'testBasis', align: 'center' },
+  { text: '测试地点', value: 'testLocation', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '测试所用设备', value: 'testUseEquipment', align: 'center' },
+  { text: '型号', value: 'model', align: 'center' },
+  { text: '出厂编号', value: 'manufactureNo', align: 'center' },
+  { text: '测试依据', value: 'testBasis', align: 'center', width: '220' },
   {
     text: '电源电压(V)',
     value: '',
     align: 'center',
-    width: '120',
+    width: '220',
     children: [
-      { text: '空载', value: 'powerVoltageNoLoad', align: 'center', width: '60' },
-      { text: '加载', value: 'powerVoltageLoad', align: 'center', width: '60' },
+      { text: '空载', value: 'powerVoltageNoLoad', align: 'center', width: '120' },
+      { text: '加载', value: 'powerVoltageLoad', align: 'center', width: '120' },
     ],
   },
   {
     text: '零地电压(V)',
     value: '',
     align: 'center',
-    width: '120',
+    width: '220',
     children: [
-      { text: '空载', value: 'zeroVoltageNoLoad', align: 'center', width: '60' },
-      { text: '加载', value: 'zeroVoltageLoad', align: 'center', width: '60' },
+      { text: '空载', value: 'zeroVoltageNoLoad', align: 'center', width: '120' },
+      { text: '加载', value: 'zeroVoltageLoad', align: 'center', width: '120' },
     ],
   },
-  { text: '结论', value: 'conclusion', align: 'center', width: '160' },
-  { text: '测试人', value: 'createUserName', align: 'center', width: '120' },
+  { text: '结论', value: 'conclusion', align: 'center' },
+  { text: '测试人', value: 'createUserName', align: 'center' },
   { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '100' },
 ])
 const list = ref<Array<IVoltageRecord>>([]) // 表格数据
diff --git a/src/views/resource/environment/voltage/voltage-interface.ts b/src/views/resource/environment/voltage/voltage-interface.ts
index 5afb1fe..cd7c137 100644
--- a/src/views/resource/environment/voltage/voltage-interface.ts
+++ b/src/views/resource/environment/voltage/voltage-interface.ts
@@ -36,6 +36,8 @@
 
   testUseEquipment: string //	测试所用设备
   testUseEquipmentId: string //		测试所用设备id
+  model: string // 型号
+  manufactureNo: string // 出厂编号
   labCode: string // 实验室
   labCodeName: string // 实验室名称
   groupCode: string // 部门
diff --git a/src/views/resource/outsideService/consumable/applyDetail.vue b/src/views/resource/outsideService/consumable/applyDetail.vue
index 0950cc1..65d27dd 100644
--- a/src/views/resource/outsideService/consumable/applyDetail.vue
+++ b/src/views/resource/outsideService/consumable/applyDetail.vue
@@ -638,7 +638,7 @@
         <table-container title="物资明细">
           <template v-if="type !== 'detail'" #btns-right>
             <el-button type="primary" @click="addEditableRow">
-              增加行
+              批量增加
             </el-button>
             <el-button type="info" @click="delSupplierRecords">
               删除行
diff --git a/src/views/resource/outsideService/consumable/checkDetail.vue b/src/views/resource/outsideService/consumable/checkDetail.vue
index bbc7a1b..1caccd0 100644
--- a/src/views/resource/outsideService/consumable/checkDetail.vue
+++ b/src/views/resource/outsideService/consumable/checkDetail.vue
@@ -1,7 +1,7 @@
 <!-- 物资验收记录单详情 -->
 <script name="ConsumableCheckDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
-import type { IConsumableApply, IGoodsCheckRecord } from './consumable-interface'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import type { IConsumableApply, IGoodsCheckRecord, IRecordDetail } from './consumable-interface'
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import FilterConsumableApply from '@/views/resource/common/filterConsumableApply.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
@@ -10,6 +10,7 @@
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
+import { useCheckList } from '@/commonMethods/useCheckList'
 
 // 变量
 // 从路由中传过来的参数
@@ -62,17 +63,23 @@
 })
 
 const checkRules = ref({
-  labCode: [{ required: true, message: '实验室不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
-  acceptTime: [{ required: true, message: '验收时间不能为空，请选择', trigger: 'blur' }],
-  goodsApplyNo: [{ required: true, message: '易耗物资申请单不能为空，请选择', trigger: 'blur' }],
-  goodsName: [{ required: true, message: '物资名称不能为空', trigger: 'blur' }],
-  goodsModel: [{ required: true, message: '规格型号不能为空', trigger: 'blur' }],
-  goodsSupplier: [{ required: true, message: '生产厂家不能为空', trigger: 'blur' }],
-  goodsWorth: [{ required: true, message: '价值不能为空', trigger: 'blur' }],
-  performance: [{ required: true, message: '主要性能指标不能为空', trigger: 'blur' }],
+  labCode: [{ required: true, message: '实验室不能为空', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['change', 'blur'] }],
+  acceptTime: [{ required: true, message: '验收时间不能为空', trigger: 'blur' }],
+  goodsApplyNo: [{ required: true, message: '易耗物资申请单不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 
+const recordDetailList = ref<IRecordDetail[]>([]) // 验收详情表格
+const recordDetailCheckoutList = ref<IRecordDetail[]>([]) // 验收详情多选
+const goodsColumns = [
+  { text: '名称', value: 'goodsName', align: 'center', required: true },
+  { text: '规格型号', value: 'goodsModel', align: 'center', required: true },
+  { text: '生产厂家', value: 'goodsSupplier', align: 'center', required: true },
+  { text: '价值', value: 'goodsWorth', align: 'center', required: true },
+  { text: '数量', value: 'goodsAmount', align: 'center', required: true },
+  { text: '主要性能指标', value: 'performance', align: 'center', required: true },
+] // 表头
+
 // 是否显示相关按钮
 const saveButtVisable = ref<boolean>(false) // 是否显示 保存 按钮
 const submitButtVisable = ref<boolean>(false) // 是否显示 提交 按钮
@@ -165,7 +172,16 @@
 // 保存至草稿箱
 const saveDraftCheck = () => {
   goodsCheckForm.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 创建时间改为提交时间
-  saveGoodsCheck(goodsCheckForm.value).then((res) => {
+  const params = {
+    ...goodsCheckForm.value,
+    recordDetailList: recordDetailList.value,
+  }
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  saveGoodsCheck(params).then((res) => {
     if (res.code === 200) {
       // 提示保存成功
       ElMessage.success('保存成功')
@@ -176,15 +192,22 @@
 
       type.value = 'update'
       status.value = '1' // 保存成功后进入草稿箱 为了不显示审批详情
+      loading.close()
     }
     else {
       // 提示失败信息
       ElMessage.error(`保存失败：${res.message}`)
+      loading.close()
     }
   })
 }
 // 编辑草稿箱（不走流程审批）
 const updateDraftCheck = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
   updateGoodsCheck(goodsCheckForm.value).then((res) => {
     if (res.code === 200) {
       // 提示保存成功
@@ -194,6 +217,7 @@
       // 提示失败信息
       ElMessage.error(`保存失败：${res.message}`)
     }
+    loading.close()
   })
 }
 
@@ -210,7 +234,9 @@
 // 新建时保存后的处理 获取返回的id
 const saveButtonHandler = async () => {
   if (!goodsCheckRef) { return }
-
+  if (!useCheckList(recordDetailList.value, goodsColumns, '物资明细')) {
+    return false
+  }
   await goodsCheckRef.value.validate((valid: boolean) => {
     if (valid === true) {
       ElMessageBox.confirm(
@@ -242,6 +268,11 @@
       cancelButtonText: '取消',
       type: 'warning',
     }).then(() => {
+      const loading = ElLoading.service({
+        lock: true,
+        text: '加载中...',
+        background: 'rgba(255, 255, 255, 0.6)',
+      })
       submitGoodsCheck({
         formId: SCHEDULE.CHECK_MATERIAL_RECORD_APPROVAL,
         id: goodsCheckForm.value.id,
@@ -255,6 +286,7 @@
         else {
           ElMessage.error(`物资验收记录单 ${goodsCheckForm.value.recordNo} 提交失败：${res.message}`)
         }
+        loading.close()
       })
     })
   }
@@ -262,6 +294,11 @@
     // 之前已经在流程中的表单 保存提交
     await goodsCheckRef.value.validate((valid: boolean) => {
       if (valid === true) {
+        const loading = ElLoading.service({
+          lock: true,
+          text: '加载中...',
+          background: 'rgba(255, 255, 255, 0.6)',
+        })
         failUpdateGoodsCheck(goodsCheckForm.value).then((res) => {
           if (res.code === 200) {
           // 提示保存成功
@@ -274,6 +311,7 @@
           // 提示失败信息
             ElMessage.error(`物资验收记录单 ${goodsCheckForm.value.recordNo} 提交失败：${res.message}`)
           }
+          loading.close()
         })
       }
     })
@@ -282,17 +320,23 @@
 
 // 根据id查询详情
 const detailById = async (id: string) => {
-  await detailGoodsCheck({ id }).then((res) => {
-    if (res.code === 200) {
-      goodsCheckForm.value = res.data
-      if (goodsCheckForm.value.taskId === '') {
-        goodsCheckForm.value.taskId = sessionStorage.getItem('consumableCheckTaskId')!
-      }
-      detailConsumableApply({ id: goodsCheckForm.value.goodsApplyId }).then((response) => {
-        goodsCheckForm.value.goodsApplyNo = response.data.applyNo
-      })
-    }
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
   })
+  const res = await detailGoodsCheck({ id })
+  if (res.code === 200) {
+    goodsCheckForm.value = res.data
+    if (goodsCheckForm.value.taskId === '') {
+      goodsCheckForm.value.taskId = sessionStorage.getItem('consumableCheckTaskId')!
+    }
+    detailConsumableApply({ id: goodsCheckForm.value.goodsApplyId }).then((response) => {
+      goodsCheckForm.value.goodsApplyNo = response.data.applyNo
+    })
+    recordDetailList.value = res.data.recordDetailList // 物资明细
+    loading.close()
+  }
 }
 
 // 流程审批-拒绝
@@ -307,7 +351,35 @@
 
 // 取消流程
 const revokeClickedHandler = () => {
-  approvalDialog.value.initDialog('revoke', goodsCheckForm.value.id, goodsCheckForm.value.taskId || route.query.taskId, goodsCheckForm.value.processId || route.query.processId)
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      const loading = ElLoading.service({
+        lock: true,
+        text: '加载中...',
+        background: 'rgba(255, 255, 255, 0.6)',
+      })
+      const params = {
+        processInstanceId: goodsCheckForm.value.processId!,
+        comments: '',
+        id: id.value,
+      }
+      revokeApprovalCheck(params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '已取消',
+        })
+        cancelButtVisable.value = false
+        loading.close()
+      })
+    })
 }
 
 // 删除审批单
@@ -339,22 +411,6 @@
   }
 }
 
-// 取消
-const revokeHandler = (param: any) => {
-  revokeApprovalCheck(param).then((res) => {
-    if (res.code === 200) {
-      ElMessage.success('流程取消成功')
-    }
-    else {
-      ElMessage.error(`流程取消失败：${res.message}`)
-    }
-    // 关闭弹窗
-    approvalDialog.value.handleClose()
-
-    cancelButtVisable.value = false
-  })
-}
-
 // 拒绝
 const refuseHandler = (param: any) => {
   refuseApprovalCheck(param).then((res) => {
@@ -371,17 +427,71 @@
   })
 }
 
+// ------------------------------------物资明细表格-------------------------------------------------------------
+// 多选
+const multiSelect = (e: any) => {
+  recordDetailCheckoutList.value = e
+}
+
+// 增加行
+const addRow = () => {
+  if (!useCheckList(recordDetailList.value, goodsColumns, '物资明细')) {
+    return false
+  }
+  recordDetailList.value.push({
+    goodsAmount: '', // 数量
+    goodsModel: '', // 型号
+    goodsName: '', // 名称
+    goodsSupplier: '', // 生产厂家
+    goodsWorth: '', // 价值
+    id: '',
+    recordId: '',
+    performance: '', // 性能指标
+  })
+}
+
+// 删除行
+const delRow = () => {
+  if (recordDetailCheckoutList.value.length === 0) {
+    ElMessage.warning('请至少选择一行')
+    return
+  }
+
+  recordDetailList.value = recordDetailList.value.filter(item => recordDetailCheckoutList.value.includes(item) === false)
+}
+// ------------------------------------物资申请单------------------------------------------------------------------------
+// 点击选择物资申请单
 const showConsumableApplyFilter = () => {
   applyFilterRef.value.showOrHideFilterDialog(true)
 }
 
+// 选好物资申请单
 const applyFormSelectedHandler = (apply: IConsumableApply) => {
   goodsCheckForm.value.goodsApplyId = apply.id
   goodsCheckForm.value.goodsApplyNo = apply.applyNo
   goodsCheckForm.value.goodsApply = apply.applyName
 
   applyFilterRef.value.showOrHideFilterDialog(false)
+
+  // 查询物资申请单详情-获取物资列表
+  if (apply.id) {
+    detailConsumableApply({ id: apply.id }).then((res) => {
+      recordDetailList.value = res.data.goodsDetailList.map((item: any) => {
+        return {
+          goodsAmount: item.goodsQuantity, // 数量
+          goodsModel: item.goodsModel, // 型号
+          goodsName: item.goodsName, // 名称
+          goodsSupplier: item.supplierName, // 生产厂家
+          goodsWorth: '', // 价值
+          id: '',
+          recordId: item.id,
+          performance: '', // 性能指标
+        }
+      })
+    })
+  }
 }
+// ---------------------------------------------------------------------------------------------------------------------
 
 const getLabCodeDict = async () => {
   // 先从缓存中获取
@@ -439,6 +549,10 @@
       goodsCheckForm.value.createDeptId = userInfo.deptId
       goodsCheckForm.value.createDept = userInfo.deptName
       goodsCheckForm.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
+      goodsCheckForm.value.labCode = userInfo.bizLabCode // 实验室代码
+      goodsCheckForm.value.labCodeName = userInfo.labCodeName // 实验室名称
+      goodsCheckForm.value.groupCode = userInfo.groupNo // 部门代码
+      goodsCheckForm.value.groupCodeName = userInfo.groupName // 部门名称
 
       keyFieldsDisable.value = false
 
@@ -511,7 +625,7 @@
           <el-button v-if="submitButtVisable" :disabled="id === ''" type="primary" @click="submitButtonHandler">
             提交
           </el-button>
-          <el-button v-if="saveButtVisable" type="primary" @click="saveButtonHandler">
+          <el-button v-if="saveButtVisable" :disabled="type === 'create' && id !== ''" type="primary" @click="saveButtonHandler">
             保存
           </el-button>
 
@@ -536,7 +650,7 @@
           <!-- 第一行 第一列 -->
           <el-col :span="6">
             <el-form-item label="实验室" prop="labCode">
-              <el-select v-model="goodsCheckForm.labCode" placeholder="请选择实验室" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-select v-model="goodsCheckForm.labCode" placeholder="请选择实验室" :disabled="keyFieldsDisable || type === 'detail'" style="width: 100%;">
                 <el-option v-for="dict in labCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
@@ -548,7 +662,7 @@
 
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="goodsCheckForm.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-select v-model="goodsCheckForm.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable || type === 'detail'" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
@@ -560,10 +674,10 @@
 
           <el-col :span="6">
             <el-form-item label="文件编号">
-              <el-input v-model="goodsCheckForm.recordNo" placeholder="文件编号，保存后自动生成" :disabled="true" />
+              <el-input v-model="goodsCheckForm.recordNo" placeholder="系统自动生成" :disabled="true" />
             </el-form-item>
             <el-form-item label="验收时间" prop="acceptTime">
-              <el-date-picker v-model="goodsCheckForm.acceptTime" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="type === 'detail'" style="width: 100%;" />
+              <el-date-picker v-model="goodsCheckForm.acceptTime" :placeholder="type === 'detail' ? ' ' : '验收时间'" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="type === 'detail'" style="width: 100%;" />
             </el-form-item>
           </el-col>
 
@@ -575,7 +689,7 @@
             <el-form-item label="物资申请单" prop="goodsApplyNo">
               <el-input v-model="goodsCheckForm.goodsApplyId" type="hidden" />
               <el-input v-model="goodsCheckForm.goodsApplyNo" :disabled="true">
-                <template #append>
+                <template v-if="type !== 'detail'" #append>
                   <el-button size="small" :disabled="keyFieldsDisable" @click="showConsumableApplyFilter">
                     选择
                   </el-button>
@@ -585,48 +699,49 @@
           </el-col>
         </el-row>
       </detail-block>
-      <detail-block v-if="current === 'consumable-check-basic'" title="">
-        <table-container title="验收详情">
-          <el-row :gutter="24">
-            <el-col :span="6">
-              <el-form-item label="名称" prop="goodsName">
-                <el-input v-model="goodsCheckForm.goodsName" :disabled="type === 'detail'" />
-              </el-form-item>
-            </el-col>
+      <detail-block v-if="current === 'consumable-check-basic'" title="物资明细">
+        <template v-if="type !== 'detail'" #btns>
+          <el-button type="primary" @click="addRow">
+            增加行
+          </el-button>
+          <el-button type="info" @click="delRow">
+            删除行
+          </el-button>
+        </template>
 
-            <el-col :span="6">
-              <el-form-item label="规格型号" prop="goodsModel">
-                <el-input v-model="goodsCheckForm.goodsModel" :disabled="type === 'detail'" />
-              </el-form-item>
-            </el-col>
+        <!-- 表格区域 -->
+        <el-table :data="recordDetailList" border @selection-change="multiSelect">
+          <el-table-column v-if="type !== 'detail'" type="selection" align="center" width="38" />
+          <el-table-column align="center" label="序号" width="55" type="index" />
+          <el-table-column
+            v-for="item in goodsColumns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
 
-            <el-col :span="6">
-              <el-form-item label="生产厂家" prop="goodsSupplier">
-                <el-input v-model="goodsCheckForm.goodsSupplier" :disabled="type === 'detail'" />
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="6">
-              <el-form-item label="价值" prop="goodsWorth">
-                <el-input v-model="goodsCheckForm.goodsWorth" :disabled="type === 'detail'" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-          <el-row :gutter="24">
-            <el-col :span="18">
-              <el-form-item label="主要性能指标" prop="performance">
-                <el-input v-model="goodsCheckForm.performance" type="textarea" :rows="5" :disabled="type === 'detail'" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </table-container>
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required && type !== 'detail'" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-input
+                v-if="item.required === true && type !== 'detail'"
+                v-model="scope.row[item.value]"
+                :placeholder="item.text"
+                type="textarea"
+                autosize
+              />
+            </template>
+          </el-table-column>
+        </el-table>
       </detail-block>
     </el-form>
 
     <approval-dialog
       ref="approvalDialog"
-      @on-success="approvalSuccessHandler" @on-refuse="refuseHandler" @on-revoke="revokeHandler"
+      @on-success="approvalSuccessHandler" @on-refuse="refuseHandler"
     />
 
     <filter-consumable-apply ref="applyFilterRef" @record-selected="applyFormSelectedHandler" />
diff --git a/src/views/resource/outsideService/consumable/checkList.vue b/src/views/resource/outsideService/consumable/checkList.vue
index 2ef68f8..0da57fa 100644
--- a/src/views/resource/outsideService/consumable/checkList.vue
+++ b/src/views/resource/outsideService/consumable/checkList.vue
@@ -248,7 +248,29 @@
 
 // 取消（撤回审批单）
 const revokeApprById = (row: IGoodsCheckRecord) => {
-  apprDial.value.initDialog('revoke', row.id, row.taskId, row.processId)
+  const params = {
+    processInstanceId: row.processId!,
+    comments: '',
+    id: row.id,
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      revokeApprovalCheck(params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '已取消',
+        })
+        fetchData(true)
+      })
+    })
 }
 
 // 流程操作之后刷新
@@ -256,22 +278,6 @@
   fetchData(true)
 }
 
-// 取消
-const revokeHandler = (param: any) => {
-  revokeApprovalCheck(param).then((res) => {
-    if (res.code === 200) {
-      ElMessage.success('流程取消成功')
-    }
-    else {
-      ElMessage.error(`流程取消失败：${res.message}`)
-    }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
-    fetchData(true)
-  })
-}
-
 // 拒绝
 const refuseHandler = (param: any) => {
   refuseApprovalCheck(param).then((res) => {
@@ -424,7 +430,6 @@
       ref="apprDial"
       @on-success="afterApprovalHandler"
       @on-refuse="refuseHandler"
-      @on-revoke="revokeHandler"
     />
 
     <!-- 右上角按钮集合 -->
diff --git a/src/views/resource/outsideService/consumable/consumable-interface.ts b/src/views/resource/outsideService/consumable/consumable-interface.ts
index e09cf3f..dc2ab2a 100644
--- a/src/views/resource/outsideService/consumable/consumable-interface.ts
+++ b/src/views/resource/outsideService/consumable/consumable-interface.ts
@@ -282,3 +282,15 @@
   createUserName?: string
   createTime?: string
 }
+
+// 物资验收记录-物资明细
+export interface IRecordDetail {
+  goodsAmount: string // 数量
+  goodsModel: string // 型号
+  goodsName: string // 名称
+  goodsSupplier: string // 生产厂家
+  goodsWorth: string // 价值
+  id: string
+  recordId: string
+  performance: string // 性能指标
+}

diff --git a/src/api/resource/questionnaire.ts b/src/api/resource/questionnaire.ts
index f40c875..9e55dc7 100644
--- a/src/api/resource/questionnaire.ts
+++ b/src/api/resource/questionnaire.ts
@@ -17,3 +17,22 @@
     data,
   })
 }
+
+// 发送
+export function send(data: { ids: string[] }) {
+  return request({
+    url: `${prefix}/questionnaire/send`,
+    method: 'post',
+    data,
+  })
+}
+
+remindWorker
+// 催办
+export function remindWorker(data: { id: string }) {
+  return request({
+    url: `${prefix}/questionnaire/remindWorker`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/resource/common/filterConsumableCheck.vue b/src/views/resource/common/filterConsumableCheck.vue
new file mode 100644
index 0000000..14f6d0a
--- /dev/null
+++ b/src/views/resource/common/filterConsumableCheck.vue
@@ -0,0 +1,198 @@
+<!-- 选择物资验收记录 -->
+<script lang="ts" setup name="FilterConsumableCheck">
+import { ElMessage } from 'element-plus'
+import type { Ref } from 'vue'
+import { ref } from 'vue'
+import dayjs from 'dayjs'
+import type { DateModelType } from 'element-plus'
+import { getLocationList } from '@/api/business/taskMeasure/measureData'
+import { getGoodsCheckList } from '@/api/resource/supplierConsumable'
+import { getStaffList } from '@/api/resource/register'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { getCustomerInfoList } from '@/api/resource/customer'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  recordNo: '', // 记录单编号
+  createDept: '',
+  createUserName: '', // 创建人
+  acceptTimeStart: '', // 创建时间-起始
+  acceptTimeEnd: '', // 创建时间-结束
+  approvalStatus: '0', // 审批状态
+  formId: SCHEDULE.CHECK_MATERIAL_RECORD_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
+  offset: 1,
+  limit: 20,
+})
+// 多选选中的内容
+const checkoutList = ref([])
+const loadingTable = ref(false)
+const list = ref([]) // 表格数据
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '文件编号', value: 'recordNo', align: 'center', width: '200' },
+  { text: '物资名称', value: 'goodsName', align: 'center' },
+  { text: '规格型号', value: 'goodsModel', align: 'center' },
+  { text: '验收部门', value: 'createDept', align: 'center', width: '160' },
+  { text: '验收人', value: 'createUserName', align: 'center', width: '120' },
+  { text: '验收时间', value: 'createTime', align: 'center', width: '120' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '100' },
+])
+const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
+
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getGoodsCheckList(listQuery.value).then((response) => {
+    if (response.code === 200) {
+      list.value = response.data.rows.map((item: any) => {
+        return {
+          ...item,
+          createTime: item.createTime!.length > 16 ? item.createTime!.substring(0, 10) : '',
+        }
+      })
+      total.value = parseInt(response.data.total)
+    }
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
+}
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    recordNo: '', // 记录单编号
+    createDept: '',
+    createUserName: '', // 创建人
+    acceptTimeStart: '', // 创建时间-起始
+    acceptTimeEnd: '', // 创建时间-结束
+    approvalStatus: '0', // 审批状态
+    formId: SCHEDULE.CHECK_MATERIAL_RECORD_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
+    offset: 1,
+    limit: 20,
+  }
+  dateRange.value = ['', '']
+  fetchData()
+}
+// 搜索
+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
+  }
+  search()
+}
+// 点击确定
+const confirmSelect = (row: any) => {
+  emits('confirm', [row])
+  dialogFormVisible.value = false
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData()
+}
+
+watch(dateRange, (val) => {
+  if (val) {
+    listQuery.value.acceptTimeStart = dayjs(val[0]).format('YYYY-MM-DD') === 'Invalid Date' ? '' : dayjs(val[0]).format('YYYY-MM-DD')
+    listQuery.value.acceptTimeEnd = dayjs(val[1]).format('YYYY-MM-DD') === 'Invalid Date' ? '' : dayjs(val[1]).format('YYYY-MM-DD')
+  }
+  else {
+    listQuery.value.acceptTimeStart = ''
+    listQuery.value.acceptTimeEnd = ''
+  }
+})
+
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择工作间" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input v-model="listQuery.recordNo" placeholder="文件编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.createDept" placeholder="验收部门" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.createUserName" placeholder="验收人" clearable />
+      </search-item>
+      <search-item>
+        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="验收时间（开始）" end-placeholder="验收时间（结束）" />
+      </search-item>
+    </search-area>
+
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        :height="520"
+        :is-show-single-select-button="true"
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column fixed="right" label="操作" align="center" width="130">
+            <template #default="{ row }">
+              <el-button size="small" type="primary" @click="confirmSelect(row)">
+                选定
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <!-- <el-button type="primary" @click="confirmSelect">确认</el-button> -->
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/resource/common/filterCustomerStaff.vue b/src/views/resource/common/filterCustomerStaff.vue
index 610bf51..fd40e61 100644
--- a/src/views/resource/common/filterCustomerStaff.vue
+++ b/src/views/resource/common/filterCustomerStaff.vue
@@ -1,5 +1,6 @@
 <!-- 筛选系统用户弹窗 -->
 <script name="FilterCustomerStaff" lang="ts" setup>
+import { ElMessage } from 'element-plus'
 import type { ICustomerFilter, ICustomerTree } from './common-interface'
 import type { ICustomerInfo } from '@/views/resource/customer/info/customer-info'
 import type { IlistQueryType } from '@/views/system/user/user-interface'
@@ -7,11 +8,15 @@
 import { getCustomerInfoList } from '@/api/resource/customer'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 
-defineProps({
+const props = defineProps({
   title: {
     type: String,
     default: '请选择',
   },
+  isMulti: { // 是否多选
+    type: Boolean,
+    default: false,
+  },
 })
 
 const emit = defineEmits(['recordSelected'])
@@ -20,9 +25,10 @@
   children: 'children',
   label: 'customerName',
 }
-
+const tableLoading = ref(false)
 // 定义变量
 const customerIdSelected = ref<string>('')
+const customerDeptIdSelected = ref<string>('')
 const customerNameSelected = ref<string>('')
 const disabledCustomerName = ref(false) // 委托方筛选是否禁用
 const getCustomerName = ref('') // 委托方
@@ -44,7 +50,9 @@
   endTime: '',
   deptType: '',
 })
+const tableRef = ref()
 const sysUserList = ref([])
+const checkoutList = ref([]) // 多选
 const total = ref<number>(0) // 数据总条数
 const columns = ref <Array<TableColumn>>([
   { text: '账号', value: 'account', align: 'center' },
@@ -53,9 +61,13 @@
 ]) // 表头
 
 const customerTree = ref<Array<ICustomerTree>>([])
-
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
 // 查询用户列表
 const getSysUserList = () => {
+  tableLoading.value = true
   getAllUserList(sysUserQuery.value).then((res) => {
     if (res.code === 200) {
       sysUserList.value = res.data.rows.map((item: any) => {
@@ -63,10 +75,12 @@
           ...item,
           customerId: customerIdSelected.value,
           customerName: customerNameSelected.value,
+          customerDeptId: customerDeptIdSelected,
         }
       })
       total.value = Number(res.data.total)
     }
+    tableLoading.value = false
   })
 }
 
@@ -101,17 +115,25 @@
 
   // 赋值选中的委托方
   customerIdSelected.value = data.id
+  customerDeptIdSelected.value = data.deptId
   customerNameSelected.value = data.customerName
 
   getSysUserList()
 }
 
-// 选中用户
+// 单选选定
 const selectSingleUser = (row: Object) => {
   emit('recordSelected', row)
 }
 
-const showOrHideFilterDialog = (show: boolean, customerName = '', disabledCustomerNameParam = false) => {
+/**
+ * 弹窗显隐
+ * @param show 控制弹窗显隐
+ * @param customerName 委托方名称
+ * @param disabledCustomerNameParam 禁止修改委托方名称
+ * @param writerNames 委托方意见登记表--[]则清空原有的多选
+ */
+const showOrHideFilterDialog = (show: boolean, customerName = '', disabledCustomerNameParam = false, writerNames = []) => {
   if (show === false) {
     customerQuery.value.customerName = ''
     customerQuery.value.approvalStatus = '0'
@@ -136,6 +158,21 @@
   }
 
   showFilterDialog.value = show
+
+  if (!writerNames.length && show && tableRef.value) {
+    console.log('清除多选')
+    tableRef.value.clearMulti()
+  }
+}
+
+// 多选确定
+const submitEquipmentSelected = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('至少选中一条数据')
+    return false
+  }
+  emit('recordSelected', checkoutList.value)
+  showOrHideFilterDialog(false)
 }
 
 defineExpose({
@@ -176,13 +213,18 @@
         </search-area>
 
         <!-- 表格数据展示 -->
-        <table-container :title-show="false">
+        <table-container v-loading="tableLoading" :title-show="false">
           <!-- 表格区域 -->
           <normal-table
             id="sysUserFilter"
+            ref="tableRef"
             :data="sysUserList" :total="total" :columns="columns"
             :query="{ limit: sysUserQuery.limit, offset: sysUserQuery.offset }"
+            is-showmulti-select
+            :is-multi="isMulti"
+            :height="520"
             @change="changePage"
+            @multi-select="handleSelectionChange"
           >
             <template #preColumns>
               <el-table-column label="序号" width="55" align="center">
@@ -191,7 +233,7 @@
                 </template>
               </el-table-column>
             </template>
-            <template #columns>
+            <template v-if="!props.isMulti" #columns>
               <el-table-column fixed="right" label="操作" align="center" width="130">
                 <template #default="{ row }">
                   <el-button size="small" type="primary" @click="selectSingleUser(row)">
@@ -204,6 +246,15 @@
         </table-container>
       </div>
     </div>
+    <!-- 多选 -->
+    <template v-if="props.isMulti" #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitEquipmentSelected">
+          确定
+        </el-button>
+        <el-button @click="showOrHideFilterDialog(false)">取消</el-button>
+      </span>
+    </template>
   </el-dialog>
 </template>
 
diff --git a/src/views/resource/common/filterSysUser.vue b/src/views/resource/common/filterSysUser.vue
index 71ec72d..4efa44f 100644
--- a/src/views/resource/common/filterSysUser.vue
+++ b/src/views/resource/common/filterSysUser.vue
@@ -1,7 +1,8 @@
 <!-- 筛选系统用户弹窗 -->
 <script name="FilterSysUser" lang="ts" setup>
+import { ElMessage } from 'element-plus'
 import type { IlistQueryType, addInfo } from '@/views/system/user/user-interface'
-import { getUserList } from '@/api/system/user'
+import { getAllUserList } from '@/api/system/user'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
 
@@ -11,6 +12,10 @@
     type: Boolean,
     default: true,
   },
+  isMulti: { // 是否多选
+    type: Boolean,
+    default: false,
+  },
 })
 const emit = defineEmits(['recordSelected'])
 const tableLoading = ref(false)
@@ -28,6 +33,7 @@
 })
 const pid = ref<string>('')
 const sysUserList = ref<Array<addInfo>>([])
+const checkoutList = ref<Array<addInfo>>([]) // 多选
 const total = ref<number>(0) // 数据总条数
 const columns = ref <Array<TableColumn>>([
   { text: '账号', value: 'account', align: 'center' },
@@ -35,7 +41,10 @@
   { text: '部门', value: 'deptName', align: 'center' },
   { text: '人员类别', value: 'avatarName', align: 'center' },
 ]) // 表头
-
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
 const staffTypeMap = ref({}) as any// 人员类别
 // 获取字典
 const fetchDict = async () => {
@@ -48,7 +57,7 @@
 
 const getSysUserList = () => {
   tableLoading.value = true
-  getUserList(searchQuery).then((res) => {
+  getAllUserList(searchQuery).then((res) => {
     if (res.code === 200) {
       sysUserList.value = res.data.rows.map((item: { avatar: string }) => {
         return {
@@ -62,6 +71,19 @@
   })
 }
 
+// 重置
+const reset = () => {
+  searchQuery.keywords = ''
+  searchQuery.deptId = ''
+  searchQuery.offset = 1
+  searchQuery.limit = 20
+  searchQuery.sort = ''
+  searchQuery.beginTime = ''
+  searchQuery.endTime = ''
+  searchQuery.deptType = ''
+  getSysUserList()
+}
+
 // 逻辑
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -73,10 +95,12 @@
   getSysUserList()
 }
 
+// 单选确定
 const selectSingleUser = (row: addInfo) => {
   emit('recordSelected', row)
 }
 
+// 取消
 const showOrHideFilterDialog = (show: boolean, deptId = '') => {
   if (show === false) {
     searchQuery.keywords = ''
@@ -95,6 +119,16 @@
   showFilterDialog.value = show
 }
 
+// 多选确定
+const submitEquipmentSelected = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('至少选中一条数据')
+    return false
+  }
+  emit('recordSelected', checkoutList.value)
+  showOrHideFilterDialog(false)
+}
+
 defineExpose({
   showOrHideFilterDialog,
 })
@@ -102,7 +136,7 @@
 
 <template>
   <el-dialog v-model="showFilterDialog" title="选择用户" :append-to-body="true" :close-on-click-modal="false" top="10vh">
-    <search-area :need-clear="false" @search="getSysUserList">
+    <search-area :need-clear="true" @search="getSysUserList" @clear="reset">
       <search-item>
         <el-input v-model="searchQuery.keywords" placeholder="姓名" clearable />
       </search-item>
@@ -119,7 +153,11 @@
         v-loading="tableLoading" :data="sysUserList" :total="total"
         :columns="columns"
         :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+        is-showmulti-select
+        :is-multi="isMulti"
+        :height="520"
         @change="changePage"
+        @multi-select="handleSelectionChange"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
@@ -128,7 +166,8 @@
             </template>
           </el-table-column>
         </template>
-        <template #columns>
+        <!-- 单选 -->
+        <template v-if="!props.isMulti" #columns>
           <el-table-column fixed="right" label="操作" align="center" width="130">
             <template #default="{ row }">
               <el-button size="small" type="primary" @click="selectSingleUser(row)">
@@ -139,5 +178,14 @@
         </template>
       </normal-table>
     </table-container>
+    <!-- 多选 -->
+    <template v-if="props.isMulti" #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitEquipmentSelected">
+          确定
+        </el-button>
+        <el-button @click="showOrHideFilterDialog(false)">取消</el-button>
+      </span>
+    </template>
   </el-dialog>
 </template>
diff --git a/src/views/resource/customer/questionnaire/customer-questionnaire.ts b/src/views/resource/customer/questionnaire/customer-questionnaire.ts
index 7391891..a3b40fc 100644
--- a/src/views/resource/customer/questionnaire/customer-questionnaire.ts
+++ b/src/views/resource/customer/questionnaire/customer-questionnaire.ts
@@ -39,6 +39,8 @@
   itemTen: string
   score?: string
   [key: string]: string | undefined
+  sendFlag: string // 是否已发送（1/2）
+  sendFlagName: string // 是否已发送（1/2）
 }
 
 export interface ICustomerRateColumn {
diff --git a/src/views/resource/customer/questionnaire/detail.vue b/src/views/resource/customer/questionnaire/detail.vue
index 6560afd..553ebb4 100644
--- a/src/views/resource/customer/questionnaire/detail.vue
+++ b/src/views/resource/customer/questionnaire/detail.vue
@@ -1,12 +1,14 @@
 <!-- 委托方满意度调查表详情 -->
 <script name="QuestionnaireDetail" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
-import type{ ICustomerQuestionnaireInfo, ICustomerRateColumn } from './customer-questionnaire'
+import type { ICustomerQuestionnaireInfo, ICustomerRateColumn } from './customer-questionnaire'
 import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
 import useUserStore from '@/store/modules/user'
-import { addQuestionnaire } from '@/api/resource/questionnaire'
+import FilterSysUser from '@/views/resource/common/filterSysUser.vue'
+import { addQuestionnaire, send } from '@/api/resource/questionnaire'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import { getDictByCode } from '@/api/system/dict'
+import { uniqueArray } from '@/utils/Array'
 
 // 从路由中传过来的参数
 const type = ref<string>('')
@@ -18,7 +20,7 @@
 
 const questionnaireFormRef = ref()
 const refFilterCustomer = ref()
-
+const sendIds = ref<string[]>([]) // 发送的参数
 const questionnaireInfo = ref<ICustomerQuestionnaireInfo>({
   id: '',
   customerId: '',
@@ -31,8 +33,8 @@
   senderId: '',
   senderName: '',
   sendTime: '',
-  writerId: '',
-  writerName: '',
+  writerId: '', // 填写人id（单选用-新建不让传）
+  writerName: '', // 填写人名字(多选时候-新建不让传)
   writeTime: '',
   writeStatus: '',
   itemOne: '',
@@ -45,12 +47,15 @@
   itemEight: '',
   itemNine: '',
   itemTen: '',
+
+  sendFlag: '', // 是否已发送（1/2）
+  sendFlagName: '', // 是否已发送（1/2）
 })
 
 const questionnaireFormRules = ref({
-  labCode: [{ required: true, message: '实验室不能为空，请选择', trigger: ['change', 'blur'] }],
-  customerId: [{ required: true, message: '填写单位不能为空，请选择', trigger: 'change' }],
-  writerId: [{ required: true, message: '填写人不能为空，请选择', trigger: 'change' }],
+  labCode: [{ required: true, message: '实验室不能为空', trigger: ['change', 'blur'] }],
+  customerId: [{ required: true, message: '填写单位不能为空', trigger: 'change' }],
+  writerName: [{ required: true, message: '填写人不能为空', trigger: 'change' }],
 }) // 表单验证规则
 
 // 字典值
@@ -71,28 +76,43 @@
   { index: 10, text: '10、对所提供的计量保障是否满意', value: 0, attributeName: 'itemTen' },
 ])
 
-// 逻辑
-
-// 显示筛选填写用户和单位的弹窗
+// ---------------------------------------------多选填写人----------------------------------------------
+const writerNames = ref<{ customerId: string; writerId: string }[]>([]) // 选择的填写人数组
+// 点击选择填写人
 const showFilterCustomerDialog = () => {
-  refFilterCustomer.value.showOrHideFilterDialog(true)
+  refFilterCustomer.value.showOrHideFilterDialog(true, '', false, writerNames.value)
 }
 
-// 返回选定结果
-const recordSelectedHandler = (row: any) => {
+// 选定填写人
+const recordSelectedHandler = (list: any) => {
   refFilterCustomer.value.showOrHideFilterDialog(false)
-
-  if (row.id !== '') {
-    questionnaireInfo.value.customerId = row.customerId
-    questionnaireInfo.value.customerName = row.customerName
-    questionnaireInfo.value.writerId = row.id
-    questionnaireInfo.value.writerName = row.name
+  if (list && list.length) {
+    writerNames.value = list.map((item: { customerDeptId: string; id: string }) => {
+      return {
+        customerId: item.customerDeptId,
+        writerId: item.id,
+      }
+    })
+    questionnaireInfo.value.writerName = list.map((item: { name: string }) => item.name).join(',')
+    // 填写单位
+    questionnaireInfo.value.customerName = uniqueArray(list.map((item: { customerName: string }) => item.customerName)).join(',')
+    questionnaireInfo.value.customerId = uniqueArray(list.map((item: { customerDeptId: string }) => item.customerDeptId)).join(',')
   }
   else {
     ElMessage.error('填写单位和填写人不能为空，请重新选择')
   }
 }
 
+// 清空填写人
+const clean = () => {
+  questionnaireInfo.value.writerName = ''
+  questionnaireInfo.value.customerName = ''
+  questionnaireInfo.value.customerId = ''
+  writerNames.value = []
+}
+
+// ---------------------------------------------------------------------------------------------------
+
 // 保存
 const saveQuestionnaireInfo = () => {
   let satisfactionStr = ''
@@ -109,19 +129,29 @@
     if (satisfactionStr.length === 10) {
       questionnaireInfo.value.writeTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 填写时间为当前时间
     }
-
+    const params = {
+      ...questionnaireInfo.value,
+      writerId: null, // 填写人id（单选用-多选时候新建不让传）
+      writerName: null, // 填写人名字(多选时候-新建不让传)
+      sendFlag: '2', // 是否已发送（1/2）
+      sendFlagName: '未发送', // 是否已发送（1/2）
+      customerName: null,
+      customerId: null,
+      sendDTOs: writerNames.value, // 填写人信息
+    }
     // 提交接口
-    addQuestionnaire(questionnaireInfo.value).then((res) => {
+    addQuestionnaire(params).then((res) => {
       if (res.code === 200) {
       // 提示保存成功
-        ElMessage.success('委托方满意度调查表创建并发送成功')
+        ElMessage.success('委托方满意度调查表创建成功')
 
         // 设置返回的委托方id和委托方编号
-        questionnaireInfo.value.questionnaireNo = res.data.questionnaireNo
-        questionnaireInfo.value.id = res.data.id
-        id.value = res.data.id
+        // questionnaireInfo.value.questionnaireNo = res.data.questionnaireNo
+        // questionnaireInfo.value.id = res.data.id
+        // id.value = res.data.id
 
         type.value = 'detail'
+        sendIds.value = res.data
       }
       else {
       // 提示失败信息
@@ -193,6 +223,18 @@
   router.go(-1)
 }
 
+// 点击发送
+const handleSend = () => {
+  if (sendIds && sendIds.value.length) {
+    send({ ids: sendIds.value }).then((res) => {
+      ElMessage.success('发送成功')
+    })
+  }
+  else {
+    ElMessage.warning('没有发送的单位或个人')
+  }
+}
+
 const initDialog = (params: any) => {
   // 从路由中获取参数
   type.value = params.type
@@ -205,7 +247,8 @@
       questionnaireInfo.value.senderId = userInfo.id
       questionnaireInfo.value.senderName = userInfo.name
       questionnaireInfo.value.sendTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
-
+      questionnaireInfo.value.labCode = userInfo.bizLabCode // 实验室代码
+      questionnaireInfo.value.labCodeName = userInfo.labCodeName // 实验室名称
       break
 
     case 'detail':
@@ -275,6 +318,9 @@
     <el-form ref="questionnaireFormRef" :model="questionnaireInfo" :rules="questionnaireFormRules" label-position="right" label-width="110px" border stripe>
       <detail-page title="委托方满意度调查表">
         <template #btns>
+          <el-button v-if="type === 'detail'" type="primary" @click="handleSend">
+            发送
+          </el-button>
           <el-button v-if="type !== 'detail'" type="primary" @click="saveButtonHandler">
             保存
           </el-button>
@@ -284,7 +330,6 @@
         </template>
 
         <el-row :gutter="24">
-          <!-- 第一行 第一列 -->
           <el-col :span="6">
             <el-form-item label="实验室" prop="labCode">
               <el-select v-model="questionnaireInfo.labCode" placeholder="请选择实验室" :disabled="type === 'detail'" style="width: 100%;">
@@ -292,46 +337,52 @@
               </el-select>
               <el-input v-model="questionnaireInfo.labCodeName" type="hidden" />
             </el-form-item>
-
-            <el-form-item label="填写单位" prop="customerId">
-              <el-input v-model="questionnaireInfo.customerName" :disabled="true" placeholder="选择填写人时自动填充" />
-              <el-input v-model="questionnaireInfo.customerId" type="hidden" />
-            </el-form-item>
           </el-col>
-
           <el-col :span="6">
             <el-form-item label="文件编号">
-              <el-input v-model="questionnaireInfo.questionnaireNo" placeholder="文件编号，保存后自动生成" :disabled="true" />
-            </el-form-item>
-
-            <el-form-item label="填写人" prop="writerId">
-              <el-input v-model="questionnaireInfo.writerName" :readonly="true" :disabled="true">
-                <template #append>
-                  <el-button size="small" :disabled="type === 'detail'" @click="showFilterCustomerDialog">
-                    选择
-                  </el-button>
-                </template>
-              </el-input>
-              <el-input v-model="questionnaireInfo.writerId" type="hidden" />
+              <el-input v-model="questionnaireInfo.questionnaireNo" placeholder="系统自动生成" :disabled="true" />
             </el-form-item>
           </el-col>
-
           <el-col :span="6">
             <el-form-item label="发送人">
               <el-input v-model="questionnaireInfo.senderName" :disabled="true" />
               <el-input v-model="questionnaireInfo.senderId" type="hidden" />
             </el-form-item>
-
-            <el-form-item label="填写时间">
-              <el-input v-model="questionnaireInfo.writeTime" :disabled="true" />
-            </el-form-item>
           </el-col>
-
           <el-col :span="6">
             <el-form-item label="发送时间">
               <el-input v-model="questionnaireInfo.sendTime" placeholder="保存后自动生成" :disabled="true" />
             </el-form-item>
           </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="填写人" prop="writerName" style="display: flex;">
+              <el-button size="small" type="primary" :disabled="type === 'detail'" @click="showFilterCustomerDialog">
+                {{ questionnaireInfo.writerName ? '继续添加' : '添加' }}
+              </el-button>
+              <el-button size="small" type="info" :disabled="type === 'detail'" @click="clean">
+                清空
+              </el-button>
+              <el-input v-model="questionnaireInfo.writerName" placeholder="请添加填写人" style="margin-top: 8px;" :readonly="true" :disabled="true" type="textarea" autosize>
+                <!-- <template #append>
+                  <el-button size="small" :disabled="type === 'detail'" @click="showFilterCustomerDialog">
+                    选择
+                  </el-button>
+                </template> -->
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="填写单位" prop="customerId">
+              <el-input v-model="questionnaireInfo.customerName" type="textarea" :autosize="{ minRows: 3 }" :disabled="true" placeholder="选择填写人时自动填充" />
+              <el-input v-model="questionnaireInfo.customerId" type="hidden" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="填写时间">
+              <el-input v-model="questionnaireInfo.writeTime" :disabled="true" />
+            </el-form-item>
+          </el-col>
         </el-row>
       </detail-page>
 
@@ -350,8 +401,8 @@
         </el-row>
       </table-container>
     </el-form>
-
-    <filter-customer-staff ref="refFilterCustomer" title="请选择填写单位和填写人" @record-selected="recordSelectedHandler" />
+    <!-- 单选填写人--先选委托方，再去选委托方下面的人 -->
+    <filter-customer-staff ref="refFilterCustomer" :is-multi="true" title="请选择填写单位和填写人" @record-selected="recordSelectedHandler" />
   </app-container>
 </template>
 
diff --git a/src/views/resource/customer/questionnaire/list.vue b/src/views/resource/customer/questionnaire/list.vue
index a2306ff..553e5f3 100644
--- a/src/views/resource/customer/questionnaire/list.vue
+++ b/src/views/resource/customer/questionnaire/list.vue
@@ -2,9 +2,9 @@
 <script name="QuestionnaireList" lang="ts" setup>
 import { ElMessage, dayjs } from 'element-plus'
 import type { DateModelType } from 'element-plus'
-import type{ ICustomerQuestionnaireInfo, IListQuery } from './customer-questionnaire'
+import type { ICustomerQuestionnaireInfo, IListQuery } from './customer-questionnaire'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getQuestionnaireList } from '@/api/resource/questionnaire'
+import { getQuestionnaireList, remindWorker } from '@/api/resource/questionnaire'
 
 const { proxy } = getCurrentInstance() as any
 const router = useRouter()
@@ -118,7 +118,9 @@
 }
 
 const urging = (row: ICustomerQuestionnaireInfo) => {
-  ElMessage.success(`满意度调查表 ${row.questionnaireNo} 填写消息已发送`)
+  remindWorker({ id: row.id }).then((res) => {
+    ElMessage.success(`满意度调查表 ${row.questionnaireNo} 填写消息已催办`)
+  })
 }
 
 watch(dateRangeSend, (val) => {
@@ -194,7 +196,8 @@
               <el-button size="small" type="primary" link @click="detail(row)">
                 详情
               </el-button>
-              <el-button v-if="row.writeStatus !== '已提交'" size="small" type="primary" link @click="urging(row)">
+              <!-- <el-button v-if="row.writeStatus !== '已提交'" size="small" type="primary" link @click="urging(row)"> -->
+              <el-button size="small" type="primary" link @click="urging(row)">
                 催办
               </el-button>
             </template>
diff --git a/src/views/resource/customer/situationReport/dialog/selectSuggestFormDialog.vue b/src/views/resource/customer/situationReport/dialog/selectSuggestFormDialog.vue
index 8fa636b..a491499 100644
--- a/src/views/resource/customer/situationReport/dialog/selectSuggestFormDialog.vue
+++ b/src/views/resource/customer/situationReport/dialog/selectSuggestFormDialog.vue
@@ -130,7 +130,7 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择委托方" width="65%">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择委托方意见登记表" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="clearList">
       <search-item width="162px">
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index a5508b4..9066757 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -456,7 +456,7 @@
     locationName: '', // 地点名称
     locationNo: '', // 地点编号
     labName: lab, // 所属实验室
-    limit: 20,
+    limit: 999999,
     offset: 1,
   }
   getLocationList(params).then((response) => {
diff --git a/src/views/resource/environment/voltage/edit.vue b/src/views/resource/environment/voltage/edit.vue
index b8a9290..ad03b80 100644
--- a/src/views/resource/environment/voltage/edit.vue
+++ b/src/views/resource/environment/voltage/edit.vue
@@ -58,6 +58,8 @@
 
   testUseEquipment: '', //	测试所用设备
   testUseEquipmentId: '', //		测试所用设备id
+  model: '', // 型号
+  manufactureNo: '', // 出厂编号
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
   groupCode: '', // 部门
@@ -417,6 +419,8 @@
   if (list && list.length) {
     recordForm.value.testUseEquipment = list[0].equipmentName //	测试所用设备
     recordForm.value.testUseEquipmentId = list[0].id //		测试所用设备id
+    recordForm.value.model = list[0].model //		型号
+    recordForm.value.manufactureNo = list[0].manufactureNo //		出厂编号
   }
 }
 
@@ -463,8 +467,7 @@
   // 从路由中获取参数
   type.value = params.type
   id.value = params.id !== undefined ? params.id : ''
-  status.value = params.status !== undefined ? params.status : ''
-
+  status.value = params.status
   // 默认显示第一个tab内容
   current.value = radioItems.value[0].value
   currentLabel.value = radioItems.value[0].name
@@ -517,7 +520,6 @@
     if (radioItems.value[radioItems.value.length - 1].value === 'voltage-approval') {
       radioItems.value.pop()
     }
-    console.log(radioItems.value)
   }
   else { // 非全部和草稿箱把审批详情加上
     if (radioItems.value[radioItems.value.length - 1].value !== 'voltage-approval') {
@@ -541,7 +543,7 @@
     locationName: '', // 地点名称
     locationNo: '', // 地点编号
     labName: lab, // 所属实验室
-    limit: 20,
+    limit: 999999,
     offset: 1,
   }
   getLocationList(params).then((response) => {
@@ -618,6 +620,20 @@
       <detail-block v-if="current === 'voltage-basic'">
         <el-row :gutter="24">
           <el-col :span="6">
+            <el-form-item label="实验室" prop="labCode">
+              <el-select v-model="recordForm.labCode" placeholder="请选择实验室" :disabled="type === 'detail'" style="width: 100%;" @change="changeLab">
+                <el-option v-for="dict in labCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="recordForm.groupCode" placeholder="请选择部门" :disabled="type === 'detail'" style="width: 100%;">
+                <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="记录编号">
               <el-input v-model="recordForm.recordNo" placeholder="系统自动生成" :disabled="true" />
             </el-form-item>
@@ -651,7 +667,7 @@
             <el-form-item label="测试地点" prop="testLocation">
               <!-- <el-input v-model="recordForm.testLocation" :placeholder="type === 'detail' ? ' ' : '请输入测试地点'" :disabled="type === 'detail'" /> -->
               <el-autocomplete
-                v-model="detailRequire.testLocation"
+                v-model="recordForm.testLocation"
                 :fetch-suggestions="querySearchTestLocation"
                 placeholder="工作间名称"
                 clearable
@@ -669,27 +685,22 @@
               </el-input>
             </el-form-item>
           </el-col>
-
           <el-col :span="6">
+            <el-form-item label="型号" prop="model">
+              <el-input v-model="recordForm.model" :placeholder="type === 'detail' ? ' ' : '型号'" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号" prop="manufactureNo">
+              <el-input v-model="recordForm.manufactureNo" :placeholder="type === 'detail' ? ' ' : '出厂编号'" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
             <el-form-item label="测试依据" prop="testBasis">
               <el-input v-model="recordForm.testBasis" :placeholder="type === 'detail' ? ' ' : '请输入测试依据'" :disabled="type === 'detail'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="实验室" prop="labCode">
-              <el-select v-model="recordForm.labCode" placeholder="请选择实验室" :disabled="type === 'detail'" style="width: 100%;" @change="changeLab">
-                <el-option v-for="dict in labCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="recordForm.groupCode" placeholder="请选择部门" :disabled="type === 'detail'" style="width: 100%;">
-                <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="电源电压空载(V)" prop="powerVoltageNoLoad">
               <el-input v-model="recordForm.powerVoltageNoLoad" :placeholder="type === 'detail' ? ' ' : '请输入电源电压空载'" :disabled="type === 'detail'" />
             </el-form-item>
diff --git a/src/views/resource/environment/voltage/list.vue b/src/views/resource/environment/voltage/list.vue
index 001a6d6..bce6ec9 100644
--- a/src/views/resource/environment/voltage/list.vue
+++ b/src/views/resource/environment/voltage/list.vue
@@ -52,33 +52,35 @@
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '测试时间', value: 'testTime', align: 'center', width: '120' },
-  { text: '测试地点', value: 'testLocation', align: 'center', width: '200' },
-  { text: '实验室', value: 'labCodeName', align: 'center' },
-  { text: '部门', value: 'groupCodeName', align: 'center' },
-  { text: '测试所用设备', value: 'testUseEquipment', align: 'center', width: '200' },
-  { text: '测试依据', value: 'testBasis', align: 'center' },
+  { text: '测试地点', value: 'testLocation', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '测试所用设备', value: 'testUseEquipment', align: 'center' },
+  { text: '型号', value: 'model', align: 'center' },
+  { text: '出厂编号', value: 'manufactureNo', align: 'center' },
+  { text: '测试依据', value: 'testBasis', align: 'center', width: '220' },
   {
     text: '电源电压(V)',
     value: '',
     align: 'center',
-    width: '120',
+    width: '220',
     children: [
-      { text: '空载', value: 'powerVoltageNoLoad', align: 'center', width: '60' },
-      { text: '加载', value: 'powerVoltageLoad', align: 'center', width: '60' },
+      { text: '空载', value: 'powerVoltageNoLoad', align: 'center', width: '120' },
+      { text: '加载', value: 'powerVoltageLoad', align: 'center', width: '120' },
     ],
   },
   {
     text: '零地电压(V)',
     value: '',
     align: 'center',
-    width: '120',
+    width: '220',
     children: [
-      { text: '空载', value: 'zeroVoltageNoLoad', align: 'center', width: '60' },
-      { text: '加载', value: 'zeroVoltageLoad', align: 'center', width: '60' },
+      { text: '空载', value: 'zeroVoltageNoLoad', align: 'center', width: '120' },
+      { text: '加载', value: 'zeroVoltageLoad', align: 'center', width: '120' },
     ],
   },
-  { text: '结论', value: 'conclusion', align: 'center', width: '160' },
-  { text: '测试人', value: 'createUserName', align: 'center', width: '120' },
+  { text: '结论', value: 'conclusion', align: 'center' },
+  { text: '测试人', value: 'createUserName', align: 'center' },
   { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '100' },
 ])
 const list = ref<Array<IVoltageRecord>>([]) // 表格数据
diff --git a/src/views/resource/environment/voltage/voltage-interface.ts b/src/views/resource/environment/voltage/voltage-interface.ts
index 5afb1fe..cd7c137 100644
--- a/src/views/resource/environment/voltage/voltage-interface.ts
+++ b/src/views/resource/environment/voltage/voltage-interface.ts
@@ -36,6 +36,8 @@
 
   testUseEquipment: string //	测试所用设备
   testUseEquipmentId: string //		测试所用设备id
+  model: string // 型号
+  manufactureNo: string // 出厂编号
   labCode: string // 实验室
   labCodeName: string // 实验室名称
   groupCode: string // 部门
diff --git a/src/views/resource/outsideService/consumable/applyDetail.vue b/src/views/resource/outsideService/consumable/applyDetail.vue
index 0950cc1..65d27dd 100644
--- a/src/views/resource/outsideService/consumable/applyDetail.vue
+++ b/src/views/resource/outsideService/consumable/applyDetail.vue
@@ -638,7 +638,7 @@
         <table-container title="物资明细">
           <template v-if="type !== 'detail'" #btns-right>
             <el-button type="primary" @click="addEditableRow">
-              增加行
+              批量增加
             </el-button>
             <el-button type="info" @click="delSupplierRecords">
               删除行
diff --git a/src/views/resource/outsideService/consumable/checkDetail.vue b/src/views/resource/outsideService/consumable/checkDetail.vue
index bbc7a1b..1caccd0 100644
--- a/src/views/resource/outsideService/consumable/checkDetail.vue
+++ b/src/views/resource/outsideService/consumable/checkDetail.vue
@@ -1,7 +1,7 @@
 <!-- 物资验收记录单详情 -->
 <script name="ConsumableCheckDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
-import type { IConsumableApply, IGoodsCheckRecord } from './consumable-interface'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import type { IConsumableApply, IGoodsCheckRecord, IRecordDetail } from './consumable-interface'
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import FilterConsumableApply from '@/views/resource/common/filterConsumableApply.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
@@ -10,6 +10,7 @@
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
+import { useCheckList } from '@/commonMethods/useCheckList'
 
 // 变量
 // 从路由中传过来的参数
@@ -62,17 +63,23 @@
 })
 
 const checkRules = ref({
-  labCode: [{ required: true, message: '实验室不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
-  acceptTime: [{ required: true, message: '验收时间不能为空，请选择', trigger: 'blur' }],
-  goodsApplyNo: [{ required: true, message: '易耗物资申请单不能为空，请选择', trigger: 'blur' }],
-  goodsName: [{ required: true, message: '物资名称不能为空', trigger: 'blur' }],
-  goodsModel: [{ required: true, message: '规格型号不能为空', trigger: 'blur' }],
-  goodsSupplier: [{ required: true, message: '生产厂家不能为空', trigger: 'blur' }],
-  goodsWorth: [{ required: true, message: '价值不能为空', trigger: 'blur' }],
-  performance: [{ required: true, message: '主要性能指标不能为空', trigger: 'blur' }],
+  labCode: [{ required: true, message: '实验室不能为空', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['change', 'blur'] }],
+  acceptTime: [{ required: true, message: '验收时间不能为空', trigger: 'blur' }],
+  goodsApplyNo: [{ required: true, message: '易耗物资申请单不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 
+const recordDetailList = ref<IRecordDetail[]>([]) // 验收详情表格
+const recordDetailCheckoutList = ref<IRecordDetail[]>([]) // 验收详情多选
+const goodsColumns = [
+  { text: '名称', value: 'goodsName', align: 'center', required: true },
+  { text: '规格型号', value: 'goodsModel', align: 'center', required: true },
+  { text: '生产厂家', value: 'goodsSupplier', align: 'center', required: true },
+  { text: '价值', value: 'goodsWorth', align: 'center', required: true },
+  { text: '数量', value: 'goodsAmount', align: 'center', required: true },
+  { text: '主要性能指标', value: 'performance', align: 'center', required: true },
+] // 表头
+
 // 是否显示相关按钮
 const saveButtVisable = ref<boolean>(false) // 是否显示 保存 按钮
 const submitButtVisable = ref<boolean>(false) // 是否显示 提交 按钮
@@ -165,7 +172,16 @@
 // 保存至草稿箱
 const saveDraftCheck = () => {
   goodsCheckForm.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 创建时间改为提交时间
-  saveGoodsCheck(goodsCheckForm.value).then((res) => {
+  const params = {
+    ...goodsCheckForm.value,
+    recordDetailList: recordDetailList.value,
+  }
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  saveGoodsCheck(params).then((res) => {
     if (res.code === 200) {
       // 提示保存成功
       ElMessage.success('保存成功')
@@ -176,15 +192,22 @@
 
       type.value = 'update'
       status.value = '1' // 保存成功后进入草稿箱 为了不显示审批详情
+      loading.close()
     }
     else {
       // 提示失败信息
       ElMessage.error(`保存失败：${res.message}`)
+      loading.close()
     }
   })
 }
 // 编辑草稿箱（不走流程审批）
 const updateDraftCheck = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
   updateGoodsCheck(goodsCheckForm.value).then((res) => {
     if (res.code === 200) {
       // 提示保存成功
@@ -194,6 +217,7 @@
       // 提示失败信息
       ElMessage.error(`保存失败：${res.message}`)
     }
+    loading.close()
   })
 }
 
@@ -210,7 +234,9 @@
 // 新建时保存后的处理 获取返回的id
 const saveButtonHandler = async () => {
   if (!goodsCheckRef) { return }
-
+  if (!useCheckList(recordDetailList.value, goodsColumns, '物资明细')) {
+    return false
+  }
   await goodsCheckRef.value.validate((valid: boolean) => {
     if (valid === true) {
       ElMessageBox.confirm(
@@ -242,6 +268,11 @@
       cancelButtonText: '取消',
       type: 'warning',
     }).then(() => {
+      const loading = ElLoading.service({
+        lock: true,
+        text: '加载中...',
+        background: 'rgba(255, 255, 255, 0.6)',
+      })
       submitGoodsCheck({
         formId: SCHEDULE.CHECK_MATERIAL_RECORD_APPROVAL,
         id: goodsCheckForm.value.id,
@@ -255,6 +286,7 @@
         else {
           ElMessage.error(`物资验收记录单 ${goodsCheckForm.value.recordNo} 提交失败：${res.message}`)
         }
+        loading.close()
       })
     })
   }
@@ -262,6 +294,11 @@
     // 之前已经在流程中的表单 保存提交
     await goodsCheckRef.value.validate((valid: boolean) => {
       if (valid === true) {
+        const loading = ElLoading.service({
+          lock: true,
+          text: '加载中...',
+          background: 'rgba(255, 255, 255, 0.6)',
+        })
         failUpdateGoodsCheck(goodsCheckForm.value).then((res) => {
           if (res.code === 200) {
           // 提示保存成功
@@ -274,6 +311,7 @@
           // 提示失败信息
             ElMessage.error(`物资验收记录单 ${goodsCheckForm.value.recordNo} 提交失败：${res.message}`)
           }
+          loading.close()
         })
       }
     })
@@ -282,17 +320,23 @@
 
 // 根据id查询详情
 const detailById = async (id: string) => {
-  await detailGoodsCheck({ id }).then((res) => {
-    if (res.code === 200) {
-      goodsCheckForm.value = res.data
-      if (goodsCheckForm.value.taskId === '') {
-        goodsCheckForm.value.taskId = sessionStorage.getItem('consumableCheckTaskId')!
-      }
-      detailConsumableApply({ id: goodsCheckForm.value.goodsApplyId }).then((response) => {
-        goodsCheckForm.value.goodsApplyNo = response.data.applyNo
-      })
-    }
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
   })
+  const res = await detailGoodsCheck({ id })
+  if (res.code === 200) {
+    goodsCheckForm.value = res.data
+    if (goodsCheckForm.value.taskId === '') {
+      goodsCheckForm.value.taskId = sessionStorage.getItem('consumableCheckTaskId')!
+    }
+    detailConsumableApply({ id: goodsCheckForm.value.goodsApplyId }).then((response) => {
+      goodsCheckForm.value.goodsApplyNo = response.data.applyNo
+    })
+    recordDetailList.value = res.data.recordDetailList // 物资明细
+    loading.close()
+  }
 }
 
 // 流程审批-拒绝
@@ -307,7 +351,35 @@
 
 // 取消流程
 const revokeClickedHandler = () => {
-  approvalDialog.value.initDialog('revoke', goodsCheckForm.value.id, goodsCheckForm.value.taskId || route.query.taskId, goodsCheckForm.value.processId || route.query.processId)
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      const loading = ElLoading.service({
+        lock: true,
+        text: '加载中...',
+        background: 'rgba(255, 255, 255, 0.6)',
+      })
+      const params = {
+        processInstanceId: goodsCheckForm.value.processId!,
+        comments: '',
+        id: id.value,
+      }
+      revokeApprovalCheck(params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '已取消',
+        })
+        cancelButtVisable.value = false
+        loading.close()
+      })
+    })
 }
 
 // 删除审批单
@@ -339,22 +411,6 @@
   }
 }
 
-// 取消
-const revokeHandler = (param: any) => {
-  revokeApprovalCheck(param).then((res) => {
-    if (res.code === 200) {
-      ElMessage.success('流程取消成功')
-    }
-    else {
-      ElMessage.error(`流程取消失败：${res.message}`)
-    }
-    // 关闭弹窗
-    approvalDialog.value.handleClose()
-
-    cancelButtVisable.value = false
-  })
-}
-
 // 拒绝
 const refuseHandler = (param: any) => {
   refuseApprovalCheck(param).then((res) => {
@@ -371,17 +427,71 @@
   })
 }
 
+// ------------------------------------物资明细表格-------------------------------------------------------------
+// 多选
+const multiSelect = (e: any) => {
+  recordDetailCheckoutList.value = e
+}
+
+// 增加行
+const addRow = () => {
+  if (!useCheckList(recordDetailList.value, goodsColumns, '物资明细')) {
+    return false
+  }
+  recordDetailList.value.push({
+    goodsAmount: '', // 数量
+    goodsModel: '', // 型号
+    goodsName: '', // 名称
+    goodsSupplier: '', // 生产厂家
+    goodsWorth: '', // 价值
+    id: '',
+    recordId: '',
+    performance: '', // 性能指标
+  })
+}
+
+// 删除行
+const delRow = () => {
+  if (recordDetailCheckoutList.value.length === 0) {
+    ElMessage.warning('请至少选择一行')
+    return
+  }
+
+  recordDetailList.value = recordDetailList.value.filter(item => recordDetailCheckoutList.value.includes(item) === false)
+}
+// ------------------------------------物资申请单------------------------------------------------------------------------
+// 点击选择物资申请单
 const showConsumableApplyFilter = () => {
   applyFilterRef.value.showOrHideFilterDialog(true)
 }
 
+// 选好物资申请单
 const applyFormSelectedHandler = (apply: IConsumableApply) => {
   goodsCheckForm.value.goodsApplyId = apply.id
   goodsCheckForm.value.goodsApplyNo = apply.applyNo
   goodsCheckForm.value.goodsApply = apply.applyName
 
   applyFilterRef.value.showOrHideFilterDialog(false)
+
+  // 查询物资申请单详情-获取物资列表
+  if (apply.id) {
+    detailConsumableApply({ id: apply.id }).then((res) => {
+      recordDetailList.value = res.data.goodsDetailList.map((item: any) => {
+        return {
+          goodsAmount: item.goodsQuantity, // 数量
+          goodsModel: item.goodsModel, // 型号
+          goodsName: item.goodsName, // 名称
+          goodsSupplier: item.supplierName, // 生产厂家
+          goodsWorth: '', // 价值
+          id: '',
+          recordId: item.id,
+          performance: '', // 性能指标
+        }
+      })
+    })
+  }
 }
+// ---------------------------------------------------------------------------------------------------------------------
 
 const getLabCodeDict = async () => {
   // 先从缓存中获取
@@ -439,6 +549,10 @@
       goodsCheckForm.value.createDeptId = userInfo.deptId
       goodsCheckForm.value.createDept = userInfo.deptName
       goodsCheckForm.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
+      goodsCheckForm.value.labCode = userInfo.bizLabCode // 实验室代码
+      goodsCheckForm.value.labCodeName = userInfo.labCodeName // 实验室名称
+      goodsCheckForm.value.groupCode = userInfo.groupNo // 部门代码
+      goodsCheckForm.value.groupCodeName = userInfo.groupName // 部门名称
 
       keyFieldsDisable.value = false
 
@@ -511,7 +625,7 @@
           <el-button v-if="submitButtVisable" :disabled="id === ''" type="primary" @click="submitButtonHandler">
             提交
           </el-button>
-          <el-button v-if="saveButtVisable" type="primary" @click="saveButtonHandler">
+          <el-button v-if="saveButtVisable" :disabled="type === 'create' && id !== ''" type="primary" @click="saveButtonHandler">
             保存
           </el-button>
 
@@ -536,7 +650,7 @@
           <!-- 第一行 第一列 -->
           <el-col :span="6">
             <el-form-item label="实验室" prop="labCode">
-              <el-select v-model="goodsCheckForm.labCode" placeholder="请选择实验室" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-select v-model="goodsCheckForm.labCode" placeholder="请选择实验室" :disabled="keyFieldsDisable || type === 'detail'" style="width: 100%;">
                 <el-option v-for="dict in labCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
@@ -548,7 +662,7 @@
 
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="goodsCheckForm.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-select v-model="goodsCheckForm.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable || type === 'detail'" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
@@ -560,10 +674,10 @@
 
           <el-col :span="6">
             <el-form-item label="文件编号">
-              <el-input v-model="goodsCheckForm.recordNo" placeholder="文件编号，保存后自动生成" :disabled="true" />
+              <el-input v-model="goodsCheckForm.recordNo" placeholder="系统自动生成" :disabled="true" />
             </el-form-item>
             <el-form-item label="验收时间" prop="acceptTime">
-              <el-date-picker v-model="goodsCheckForm.acceptTime" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="type === 'detail'" style="width: 100%;" />
+              <el-date-picker v-model="goodsCheckForm.acceptTime" :placeholder="type === 'detail' ? ' ' : '验收时间'" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="type === 'detail'" style="width: 100%;" />
             </el-form-item>
           </el-col>
 
@@ -575,7 +689,7 @@
             <el-form-item label="物资申请单" prop="goodsApplyNo">
               <el-input v-model="goodsCheckForm.goodsApplyId" type="hidden" />
               <el-input v-model="goodsCheckForm.goodsApplyNo" :disabled="true">
-                <template #append>
+                <template v-if="type !== 'detail'" #append>
                   <el-button size="small" :disabled="keyFieldsDisable" @click="showConsumableApplyFilter">
                     选择
                   </el-button>
@@ -585,48 +699,49 @@
           </el-col>
         </el-row>
       </detail-block>
-      <detail-block v-if="current === 'consumable-check-basic'" title="">
-        <table-container title="验收详情">
-          <el-row :gutter="24">
-            <el-col :span="6">
-              <el-form-item label="名称" prop="goodsName">
-                <el-input v-model="goodsCheckForm.goodsName" :disabled="type === 'detail'" />
-              </el-form-item>
-            </el-col>
+      <detail-block v-if="current === 'consumable-check-basic'" title="物资明细">
+        <template v-if="type !== 'detail'" #btns>
+          <el-button type="primary" @click="addRow">
+            增加行
+          </el-button>
+          <el-button type="info" @click="delRow">
+            删除行
+          </el-button>
+        </template>
 
-            <el-col :span="6">
-              <el-form-item label="规格型号" prop="goodsModel">
-                <el-input v-model="goodsCheckForm.goodsModel" :disabled="type === 'detail'" />
-              </el-form-item>
-            </el-col>
+        <!-- 表格区域 -->
+        <el-table :data="recordDetailList" border @selection-change="multiSelect">
+          <el-table-column v-if="type !== 'detail'" type="selection" align="center" width="38" />
+          <el-table-column align="center" label="序号" width="55" type="index" />
+          <el-table-column
+            v-for="item in goodsColumns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
 
-            <el-col :span="6">
-              <el-form-item label="生产厂家" prop="goodsSupplier">
-                <el-input v-model="goodsCheckForm.goodsSupplier" :disabled="type === 'detail'" />
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="6">
-              <el-form-item label="价值" prop="goodsWorth">
-                <el-input v-model="goodsCheckForm.goodsWorth" :disabled="type === 'detail'" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-          <el-row :gutter="24">
-            <el-col :span="18">
-              <el-form-item label="主要性能指标" prop="performance">
-                <el-input v-model="goodsCheckForm.performance" type="textarea" :rows="5" :disabled="type === 'detail'" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </table-container>
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required && type !== 'detail'" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-input
+                v-if="item.required === true && type !== 'detail'"
+                v-model="scope.row[item.value]"
+                :placeholder="item.text"
+                type="textarea"
+                autosize
+              />
+            </template>
+          </el-table-column>
+        </el-table>
       </detail-block>
     </el-form>
 
     <approval-dialog
       ref="approvalDialog"
-      @on-success="approvalSuccessHandler" @on-refuse="refuseHandler" @on-revoke="revokeHandler"
+      @on-success="approvalSuccessHandler" @on-refuse="refuseHandler"
     />
 
     <filter-consumable-apply ref="applyFilterRef" @record-selected="applyFormSelectedHandler" />
diff --git a/src/views/resource/outsideService/consumable/checkList.vue b/src/views/resource/outsideService/consumable/checkList.vue
index 2ef68f8..0da57fa 100644
--- a/src/views/resource/outsideService/consumable/checkList.vue
+++ b/src/views/resource/outsideService/consumable/checkList.vue
@@ -248,7 +248,29 @@
 
 // 取消（撤回审批单）
 const revokeApprById = (row: IGoodsCheckRecord) => {
-  apprDial.value.initDialog('revoke', row.id, row.taskId, row.processId)
+  const params = {
+    processInstanceId: row.processId!,
+    comments: '',
+    id: row.id,
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      revokeApprovalCheck(params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '已取消',
+        })
+        fetchData(true)
+      })
+    })
 }
 
 // 流程操作之后刷新
@@ -256,22 +278,6 @@
   fetchData(true)
 }
 
-// 取消
-const revokeHandler = (param: any) => {
-  revokeApprovalCheck(param).then((res) => {
-    if (res.code === 200) {
-      ElMessage.success('流程取消成功')
-    }
-    else {
-      ElMessage.error(`流程取消失败：${res.message}`)
-    }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
-    fetchData(true)
-  })
-}
-
 // 拒绝
 const refuseHandler = (param: any) => {
   refuseApprovalCheck(param).then((res) => {
@@ -424,7 +430,6 @@
       ref="apprDial"
       @on-success="afterApprovalHandler"
       @on-refuse="refuseHandler"
-      @on-revoke="revokeHandler"
     />
 
     <!-- 右上角按钮集合 -->
diff --git a/src/views/resource/outsideService/consumable/consumable-interface.ts b/src/views/resource/outsideService/consumable/consumable-interface.ts
index e09cf3f..dc2ab2a 100644
--- a/src/views/resource/outsideService/consumable/consumable-interface.ts
+++ b/src/views/resource/outsideService/consumable/consumable-interface.ts
@@ -282,3 +282,15 @@
   createUserName?: string
   createTime?: string
 }
+
+// 物资验收记录-物资明细
+export interface IRecordDetail {
+  goodsAmount: string // 数量
+  goodsModel: string // 型号
+  goodsName: string // 名称
+  goodsSupplier: string // 生产厂家
+  goodsWorth: string // 价值
+  id: string
+  recordId: string
+  performance: string // 性能指标
+}
diff --git a/src/views/resource/outsideService/consumable/storeDetail.vue b/src/views/resource/outsideService/consumable/storeDetail.vue
index 62bde9b..9129b3f 100644
--- a/src/views/resource/outsideService/consumable/storeDetail.vue
+++ b/src/views/resource/outsideService/consumable/storeDetail.vue
@@ -1,12 +1,13 @@
 <!-- 物资入库单 详情 -->
 <script name="ConsumableStoreDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import filterConsumableCheck from '../../common/filterConsumableCheck.vue'
 import type { IConsumableStore, IConsumableStoreGoods } from './consumable-interface'
 import StoreDetailDialog from './storeDetailDialog.vue'
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import { SCHEDULE } from '@/utils/scheduleDict'
-import { detailConsumableStore, draftDeleteStore, failUpdateConsumableStore, refuseApprovalStore, revokeApprovalStore, saveConsumableStore, submitConsumableStore, updateConsumableStore } from '@/api/resource/supplierConsumable'
+import { detailConsumableApply, detailConsumableStore, detailGoodsCheck, draftDeleteCheck, draftDeleteStore, failUpdateConsumableStore, failUpdateGoodsCheck, refuseApprovalCheck, refuseApprovalStore, revokeApprovalCheck, revokeApprovalStore, saveConsumableStore, saveGoodsCheck, submitConsumableStore, submitGoodsCheck, updateConsumableStore, updateGoodsCheck } from '@/api/resource/supplierConsumable'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
@@ -57,10 +58,10 @@
 
 const goodsList = ref<Array<IConsumableStoreGoods>>([])
 const goodsColumns = [
-  { text: '名称', value: 'goodsName', align: 'center', width: '240', required: true },
-  { text: '厂家信息', value: 'manufacturer', align: 'center', width: '240', required: true },
-  { text: '规格型号', value: 'goodsModel', align: 'center', width: '240', required: true },
-  { text: '数量及单位', value: 'amount', align: 'center', width: '240', required: true },
+  { text: '名称', value: 'goodsName', align: 'center', required: true },
+  { text: '厂家信息', value: 'manufacturer', align: 'center', required: true },
+  { text: '规格型号', value: 'goodsModel', align: 'center', required: true },
+  { text: '数量及单位', value: 'amount', align: 'center', required: true },
   { text: '单价', value: 'unitPrice', align: 'center', width: '180' },
   { text: '金额', value: 'price', align: 'center', width: '180', required: true },
   { text: '备注', value: 'remark', align: 'center' },
@@ -161,12 +162,28 @@
   sessionStorage.removeItem('consumableStoreTaskId') // 返回列表时 将缓存中的数据删除
   router.go(-1)
 }
-
-// 新增
+// ---------------------------入库单详情表格-------------------------------------------------------
+const filterConsumableCheckRef = ref() // 选择物资验收记录组件
+// 增加行
 const addEditableRow = () => {
-  refStoreDetailDialog.value.showRecordDialog(true)
+  // refStoreDetailDialog.value.showRecordDialog(true)
+  if (!useCheckList(goodsList.value, goodsColumns, '入库单详情')) {
+    return false
+  }
+  goodsList.value.push({
+    amount: '', //	数量
+    goodsModel: '', //	规格
+    goodsName: '', //	名称
+    id: '', //	id，更新/删除使用参数
+    manufacturer: '', //		厂家
+    price: '', //		金额
+    remark: '', //		备注
+    unitPrice: '', //		单价
+    warehouseId: '', //		物资入库单id
+  })
 }
 
+// 删除行
 const delGoodsStoreRecords = () => {
   if (recordSelected.value.length === 0) {
     ElMessage.warning('请至少选择一行')
@@ -175,11 +192,38 @@
 
   goodsList.value = goodsList.value.filter(item => recordSelected.value.includes(item) === false)
 }
-
+// 多选
 const storeMultiSelect = (e: any) => {
   recordSelected.value = e
 }
 
+// 点击选择物资验收记录
+const selectGoodsCheckRecord = () => {
+  filterConsumableCheckRef.value.initDialog()
+}
+
+// 确定选择物资验收记录
+const confirmFilterConsumableCheck = (val: any) => {
+  if (val && val.length) {
+    detailGoodsCheck({ id: val[0].id }).then((res) => {
+      goodsList.value = res.data.recordDetailList.map((item: any) => {
+        return {
+          amount: item.goodsAmount, //	数量
+          goodsModel: item.goodsModel, //	规格
+          goodsName: item.goodsName, //	名称
+          id: '', //	id，更新/删除使用参数
+          manufacturer: item.goodsSupplier, //		厂家
+          price: item.goodsWorth, //		金额
+          remark: '', //		备注
+          unitPrice: '', //		单价
+          warehouseId: '', //		物资入库单id
+        }
+      }) // 物资明细
+    })
+  }
+}
+// -----------------------------------------------------------------------------------------------------
+
 // 保存至草稿箱
 const saveDraftStore = () => {
   consumableStore.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 创建时间改为提交时间
@@ -230,9 +274,12 @@
   if (!consumableStoreRef) { return }
 
   if (goodsList.value.length === 0) {
-    ElMessage.error('物资明细不能为空，请选择易耗物资及供方')
+    ElMessage.warning('物资明细不能为空，请选择易耗物资及供方')
     return
   }
+  if (!useCheckList(goodsList.value, goodsColumns, '入库单详情')) {
+    return false
+  }
 
   if (useCheckList(goodsList.value, goodsColumns, '物资明细') === false) {
     return
@@ -343,7 +390,36 @@
 
 // 取消流程
 const revokeClickedHandler = () => {
-  approvalDialog.value.initDialog('revoke', consumableStore.value.id, consumableStore.value.taskId || route.query.taskId, consumableStore.value.processId || route.query.processId)
+  // approvalDialog.value.initDialog('revoke', consumableStore.value.id, consumableStore.value.taskId || route.query.taskId, consumableStore.value.processId || route.query.processId)
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      const loading = ElLoading.service({
+        lock: true,
+        text: '加载中...',
+        background: 'rgba(255, 255, 255, 0.6)',
+      })
+      const params = {
+        processInstanceId: consumableStore.value.processId! || route.query.processId,
+        comments: '',
+        id: consumableStore.value.id || id.value,
+      }
+      revokeApprovalStore(params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '已取消',
+        })
+        cancelButtVisable.value = false
+        loading.close()
+      })
+    })
 }
 
 // 删除审批单
@@ -375,22 +451,6 @@
   }
 }
 
-// 取消
-const revokeHandler = (param: any) => {
-  revokeApprovalStore(param).then((res) => {
-    if (res.code === 200) {
-      ElMessage.success('流程取消成功')
-    }
-    else {
-      ElMessage.error(`流程取消失败：${res.message}`)
-    }
-    // 关闭弹窗
-    approvalDialog.value.handleClose()
-
-    cancelButtVisable.value = false
-  })
-}
-
 // 拒绝
 const refuseHandler = (param: any) => {
   refuseApprovalStore(param).then((res) => {
@@ -475,6 +535,10 @@
       consumableStore.value.createUserName = userInfo.name
       consumableStore.value.createDeptId = userInfo.deptId
       consumableStore.value.createDept = userInfo.deptName
+      consumableStore.value.labCode = userInfo.bizLabCode // 实验室代码
+      consumableStore.value.labCodeName = userInfo.labCodeName // 实验室名称
+      consumableStore.value.groupCode = userInfo.groupNo // 部门代码
+      consumableStore.value.groupCodeName = userInfo.groupName // 部门名称
       consumableStore.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
       keyFieldsDisable.value = false
@@ -548,7 +612,7 @@
           <el-button v-if="submitButtVisable" :disabled="id === ''" type="primary" @click="submitButtonHandler">
             提交
           </el-button>
-          <el-button v-if="saveButtVisable" type="primary" @click="saveButtonHandler">
+          <el-button v-if="saveButtVisable" type="primary" :disabled="type === 'create' && id !== ''" @click="saveButtonHandler">
             保存
           </el-button>
 
@@ -612,41 +676,51 @@
           </el-col>
         </el-row>
       </detail-block>
-      <detail-block v-if="current === 'consumable-store-basic'" title="">
-        <table-container title="入库单详情">
-          <template v-if="type !== 'detail'" #btns-right>
-            <el-button type="primary" @click="addEditableRow">
-              增加行
-            </el-button>
-            <el-button type="info" @click="delGoodsStoreRecords">
-              删除行
-            </el-button>
-          </template>
+      <detail-block v-if="current === 'consumable-store-basic'" title="入库单详情">
+        <template v-if="type !== 'detail'" #btns>
+          <el-button type="primary" @click="selectGoodsCheckRecord">
+            选择物资验收记录
+          </el-button>
+          <el-button type="primary" @click="addEditableRow">
+            增加行
+          </el-button>
+          <el-button type="info" @click="delGoodsStoreRecords">
+            删除行
+          </el-button>
+        </template>
 
-          <!-- 表格区域 -->
-          <el-table :data="goodsList" border style="width: 100%;" @selection-change="storeMultiSelect">
-            <el-table-column v-if="type !== 'detail'" type="selection" align="center" width="38" />
-            <el-table-column align="center" label="序号" width="55" type="index" />
-            <el-table-column
-              v-for="item in goodsColumns"
-              :key="item.value"
-              :prop="item.value"
-              :label="item.text"
-              :width="item.width"
-              align="center"
-            >
-              <template #header>
-                <span v-show="item.required && type !== 'detail'" style="color: red;">*</span><span>{{ item.text }}</span>
-              </template>
-            </el-table-column>
-          </el-table>
-        </table-container>
+        <!-- 表格区域 -->
+        <el-table :data="goodsList" border style="width: 100%;" @selection-change="storeMultiSelect">
+          <el-table-column v-if="type !== 'detail'" type="selection" align="center" width="38" />
+          <el-table-column align="center" label="序号" width="55" type="index" />
+          <el-table-column
+            v-for="item in goodsColumns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required && type !== 'detail'" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-input
+                v-if="type !== 'detail'"
+                v-model="scope.row[item.value]"
+                :placeholder="item.text"
+                type="textarea"
+                autosize
+              />
+            </template>
+          </el-table-column>
+        </el-table>
       </detail-block>
     </el-form>
 
     <approval-dialog
       ref="approvalDialog"
-      @on-success="approvalSuccessHandler" @on-refuse="refuseHandler" @on-revoke="revokeHandler"
+      @on-success="approvalSuccessHandler" @on-refuse="refuseHandler"
     />
 
     <store-detail-dialog ref="refStoreDetailDialog" @record-saved="consumableStoreAddHandler" />
@@ -654,5 +728,8 @@
     <template v-if="current === 'consumable-store-approval' && status !== '1'">
       <approval-record-table :process-id="consumableStore.processId" />
     </template>
+
+    <!-- 选择物资验收记录 -->
+    <filter-consumable-check ref="filterConsumableCheckRef" @confirm="confirmFilterConsumableCheck" />
   </app-container>
 </template>

diff --git a/src/api/resource/questionnaire.ts b/src/api/resource/questionnaire.ts
index f40c875..9e55dc7 100644
--- a/src/api/resource/questionnaire.ts
+++ b/src/api/resource/questionnaire.ts
@@ -17,3 +17,22 @@
     data,
   })
 }
+
+// 发送
+export function send(data: { ids: string[] }) {
+  return request({
+    url: `${prefix}/questionnaire/send`,
+    method: 'post',
+    data,
+  })
+}
+
+remindWorker
+// 催办
+export function remindWorker(data: { id: string }) {
+  return request({
+    url: `${prefix}/questionnaire/remindWorker`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/resource/common/filterConsumableCheck.vue b/src/views/resource/common/filterConsumableCheck.vue
new file mode 100644
index 0000000..14f6d0a
--- /dev/null
+++ b/src/views/resource/common/filterConsumableCheck.vue
@@ -0,0 +1,198 @@
+<!-- 选择物资验收记录 -->
+<script lang="ts" setup name="FilterConsumableCheck">
+import { ElMessage } from 'element-plus'
+import type { Ref } from 'vue'
+import { ref } from 'vue'
+import dayjs from 'dayjs'
+import type { DateModelType } from 'element-plus'
+import { getLocationList } from '@/api/business/taskMeasure/measureData'
+import { getGoodsCheckList } from '@/api/resource/supplierConsumable'
+import { getStaffList } from '@/api/resource/register'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { getCustomerInfoList } from '@/api/resource/customer'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  recordNo: '', // 记录单编号
+  createDept: '',
+  createUserName: '', // 创建人
+  acceptTimeStart: '', // 创建时间-起始
+  acceptTimeEnd: '', // 创建时间-结束
+  approvalStatus: '0', // 审批状态
+  formId: SCHEDULE.CHECK_MATERIAL_RECORD_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
+  offset: 1,
+  limit: 20,
+})
+// 多选选中的内容
+const checkoutList = ref([])
+const loadingTable = ref(false)
+const list = ref([]) // 表格数据
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '文件编号', value: 'recordNo', align: 'center', width: '200' },
+  { text: '物资名称', value: 'goodsName', align: 'center' },
+  { text: '规格型号', value: 'goodsModel', align: 'center' },
+  { text: '验收部门', value: 'createDept', align: 'center', width: '160' },
+  { text: '验收人', value: 'createUserName', align: 'center', width: '120' },
+  { text: '验收时间', value: 'createTime', align: 'center', width: '120' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '100' },
+])
+const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
+
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getGoodsCheckList(listQuery.value).then((response) => {
+    if (response.code === 200) {
+      list.value = response.data.rows.map((item: any) => {
+        return {
+          ...item,
+          createTime: item.createTime!.length > 16 ? item.createTime!.substring(0, 10) : '',
+        }
+      })
+      total.value = parseInt(response.data.total)
+    }
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
+}
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    recordNo: '', // 记录单编号
+    createDept: '',
+    createUserName: '', // 创建人
+    acceptTimeStart: '', // 创建时间-起始
+    acceptTimeEnd: '', // 创建时间-结束
+    approvalStatus: '0', // 审批状态
+    formId: SCHEDULE.CHECK_MATERIAL_RECORD_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
+    offset: 1,
+    limit: 20,
+  }
+  dateRange.value = ['', '']
+  fetchData()
+}
+// 搜索
+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
+  }
+  search()
+}
+// 点击确定
+const confirmSelect = (row: any) => {
+  emits('confirm', [row])
+  dialogFormVisible.value = false
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData()
+}
+
+watch(dateRange, (val) => {
+  if (val) {
+    listQuery.value.acceptTimeStart = dayjs(val[0]).format('YYYY-MM-DD') === 'Invalid Date' ? '' : dayjs(val[0]).format('YYYY-MM-DD')
+    listQuery.value.acceptTimeEnd = dayjs(val[1]).format('YYYY-MM-DD') === 'Invalid Date' ? '' : dayjs(val[1]).format('YYYY-MM-DD')
+  }
+  else {
+    listQuery.value.acceptTimeStart = ''
+    listQuery.value.acceptTimeEnd = ''
+  }
+})
+
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择工作间" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input v-model="listQuery.recordNo" placeholder="文件编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.createDept" placeholder="验收部门" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.createUserName" placeholder="验收人" clearable />
+      </search-item>
+      <search-item>
+        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="验收时间（开始）" end-placeholder="验收时间（结束）" />
+      </search-item>
+    </search-area>
+
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        :height="520"
+        :is-show-single-select-button="true"
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column fixed="right" label="操作" align="center" width="130">
+            <template #default="{ row }">
+              <el-button size="small" type="primary" @click="confirmSelect(row)">
+                选定
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <!-- <el-button type="primary" @click="confirmSelect">确认</el-button> -->
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/resource/common/filterCustomerStaff.vue b/src/views/resource/common/filterCustomerStaff.vue
index 610bf51..fd40e61 100644
--- a/src/views/resource/common/filterCustomerStaff.vue
+++ b/src/views/resource/common/filterCustomerStaff.vue
@@ -1,5 +1,6 @@
 <!-- 筛选系统用户弹窗 -->
 <script name="FilterCustomerStaff" lang="ts" setup>
+import { ElMessage } from 'element-plus'
 import type { ICustomerFilter, ICustomerTree } from './common-interface'
 import type { ICustomerInfo } from '@/views/resource/customer/info/customer-info'
 import type { IlistQueryType } from '@/views/system/user/user-interface'
@@ -7,11 +8,15 @@
 import { getCustomerInfoList } from '@/api/resource/customer'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 
-defineProps({
+const props = defineProps({
   title: {
     type: String,
     default: '请选择',
   },
+  isMulti: { // 是否多选
+    type: Boolean,
+    default: false,
+  },
 })
 
 const emit = defineEmits(['recordSelected'])
@@ -20,9 +25,10 @@
   children: 'children',
   label: 'customerName',
 }
-
+const tableLoading = ref(false)
 // 定义变量
 const customerIdSelected = ref<string>('')
+const customerDeptIdSelected = ref<string>('')
 const customerNameSelected = ref<string>('')
 const disabledCustomerName = ref(false) // 委托方筛选是否禁用
 const getCustomerName = ref('') // 委托方
@@ -44,7 +50,9 @@
   endTime: '',
   deptType: '',
 })
+const tableRef = ref()
 const sysUserList = ref([])
+const checkoutList = ref([]) // 多选
 const total = ref<number>(0) // 数据总条数
 const columns = ref <Array<TableColumn>>([
   { text: '账号', value: 'account', align: 'center' },
@@ -53,9 +61,13 @@
 ]) // 表头
 
 const customerTree = ref<Array<ICustomerTree>>([])
-
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
 // 查询用户列表
 const getSysUserList = () => {
+  tableLoading.value = true
   getAllUserList(sysUserQuery.value).then((res) => {
     if (res.code === 200) {
       sysUserList.value = res.data.rows.map((item: any) => {
@@ -63,10 +75,12 @@
           ...item,
           customerId: customerIdSelected.value,
           customerName: customerNameSelected.value,
+          customerDeptId: customerDeptIdSelected,
         }
       })
       total.value = Number(res.data.total)
     }
+    tableLoading.value = false
   })
 }
 
@@ -101,17 +115,25 @@
 
   // 赋值选中的委托方
   customerIdSelected.value = data.id
+  customerDeptIdSelected.value = data.deptId
   customerNameSelected.value = data.customerName
 
   getSysUserList()
 }
 
-// 选中用户
+// 单选选定
 const selectSingleUser = (row: Object) => {
   emit('recordSelected', row)
 }
 
-const showOrHideFilterDialog = (show: boolean, customerName = '', disabledCustomerNameParam = false) => {
+/**
+ * 弹窗显隐
+ * @param show 控制弹窗显隐
+ * @param customerName 委托方名称
+ * @param disabledCustomerNameParam 禁止修改委托方名称
+ * @param writerNames 委托方意见登记表--[]则清空原有的多选
+ */
+const showOrHideFilterDialog = (show: boolean, customerName = '', disabledCustomerNameParam = false, writerNames = []) => {
   if (show === false) {
     customerQuery.value.customerName = ''
     customerQuery.value.approvalStatus = '0'
@@ -136,6 +158,21 @@
   }
 
   showFilterDialog.value = show
+
+  if (!writerNames.length && show && tableRef.value) {
+    console.log('清除多选')
+    tableRef.value.clearMulti()
+  }
+}
+
+// 多选确定
+const submitEquipmentSelected = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('至少选中一条数据')
+    return false
+  }
+  emit('recordSelected', checkoutList.value)
+  showOrHideFilterDialog(false)
 }
 
 defineExpose({
@@ -176,13 +213,18 @@
         </search-area>
 
         <!-- 表格数据展示 -->
-        <table-container :title-show="false">
+        <table-container v-loading="tableLoading" :title-show="false">
           <!-- 表格区域 -->
           <normal-table
             id="sysUserFilter"
+            ref="tableRef"
             :data="sysUserList" :total="total" :columns="columns"
             :query="{ limit: sysUserQuery.limit, offset: sysUserQuery.offset }"
+            is-showmulti-select
+            :is-multi="isMulti"
+            :height="520"
             @change="changePage"
+            @multi-select="handleSelectionChange"
           >
             <template #preColumns>
               <el-table-column label="序号" width="55" align="center">
@@ -191,7 +233,7 @@
                 </template>
               </el-table-column>
             </template>
-            <template #columns>
+            <template v-if="!props.isMulti" #columns>
               <el-table-column fixed="right" label="操作" align="center" width="130">
                 <template #default="{ row }">
                   <el-button size="small" type="primary" @click="selectSingleUser(row)">
@@ -204,6 +246,15 @@
         </table-container>
       </div>
     </div>
+    <!-- 多选 -->
+    <template v-if="props.isMulti" #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitEquipmentSelected">
+          确定
+        </el-button>
+        <el-button @click="showOrHideFilterDialog(false)">取消</el-button>
+      </span>
+    </template>
   </el-dialog>
 </template>
 
diff --git a/src/views/resource/common/filterSysUser.vue b/src/views/resource/common/filterSysUser.vue
index 71ec72d..4efa44f 100644
--- a/src/views/resource/common/filterSysUser.vue
+++ b/src/views/resource/common/filterSysUser.vue
@@ -1,7 +1,8 @@
 <!-- 筛选系统用户弹窗 -->
 <script name="FilterSysUser" lang="ts" setup>
+import { ElMessage } from 'element-plus'
 import type { IlistQueryType, addInfo } from '@/views/system/user/user-interface'
-import { getUserList } from '@/api/system/user'
+import { getAllUserList } from '@/api/system/user'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
 
@@ -11,6 +12,10 @@
     type: Boolean,
     default: true,
   },
+  isMulti: { // 是否多选
+    type: Boolean,
+    default: false,
+  },
 })
 const emit = defineEmits(['recordSelected'])
 const tableLoading = ref(false)
@@ -28,6 +33,7 @@
 })
 const pid = ref<string>('')
 const sysUserList = ref<Array<addInfo>>([])
+const checkoutList = ref<Array<addInfo>>([]) // 多选
 const total = ref<number>(0) // 数据总条数
 const columns = ref <Array<TableColumn>>([
   { text: '账号', value: 'account', align: 'center' },
@@ -35,7 +41,10 @@
   { text: '部门', value: 'deptName', align: 'center' },
   { text: '人员类别', value: 'avatarName', align: 'center' },
 ]) // 表头
-
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
 const staffTypeMap = ref({}) as any// 人员类别
 // 获取字典
 const fetchDict = async () => {
@@ -48,7 +57,7 @@
 
 const getSysUserList = () => {
   tableLoading.value = true
-  getUserList(searchQuery).then((res) => {
+  getAllUserList(searchQuery).then((res) => {
     if (res.code === 200) {
       sysUserList.value = res.data.rows.map((item: { avatar: string }) => {
         return {
@@ -62,6 +71,19 @@
   })
 }
 
+// 重置
+const reset = () => {
+  searchQuery.keywords = ''
+  searchQuery.deptId = ''
+  searchQuery.offset = 1
+  searchQuery.limit = 20
+  searchQuery.sort = ''
+  searchQuery.beginTime = ''
+  searchQuery.endTime = ''
+  searchQuery.deptType = ''
+  getSysUserList()
+}
+
 // 逻辑
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -73,10 +95,12 @@
   getSysUserList()
 }
 
+// 单选确定
 const selectSingleUser = (row: addInfo) => {
   emit('recordSelected', row)
 }
 
+// 取消
 const showOrHideFilterDialog = (show: boolean, deptId = '') => {
   if (show === false) {
     searchQuery.keywords = ''
@@ -95,6 +119,16 @@
   showFilterDialog.value = show
 }
 
+// 多选确定
+const submitEquipmentSelected = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('至少选中一条数据')
+    return false
+  }
+  emit('recordSelected', checkoutList.value)
+  showOrHideFilterDialog(false)
+}
+
 defineExpose({
   showOrHideFilterDialog,
 })
@@ -102,7 +136,7 @@
 
 <template>
   <el-dialog v-model="showFilterDialog" title="选择用户" :append-to-body="true" :close-on-click-modal="false" top="10vh">
-    <search-area :need-clear="false" @search="getSysUserList">
+    <search-area :need-clear="true" @search="getSysUserList" @clear="reset">
       <search-item>
         <el-input v-model="searchQuery.keywords" placeholder="姓名" clearable />
       </search-item>
@@ -119,7 +153,11 @@
         v-loading="tableLoading" :data="sysUserList" :total="total"
         :columns="columns"
         :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+        is-showmulti-select
+        :is-multi="isMulti"
+        :height="520"
         @change="changePage"
+        @multi-select="handleSelectionChange"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
@@ -128,7 +166,8 @@
             </template>
           </el-table-column>
         </template>
-        <template #columns>
+        <!-- 单选 -->
+        <template v-if="!props.isMulti" #columns>
           <el-table-column fixed="right" label="操作" align="center" width="130">
             <template #default="{ row }">
               <el-button size="small" type="primary" @click="selectSingleUser(row)">
@@ -139,5 +178,14 @@
         </template>
       </normal-table>
     </table-container>
+    <!-- 多选 -->
+    <template v-if="props.isMulti" #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitEquipmentSelected">
+          确定
+        </el-button>
+        <el-button @click="showOrHideFilterDialog(false)">取消</el-button>
+      </span>
+    </template>
   </el-dialog>
 </template>
diff --git a/src/views/resource/customer/questionnaire/customer-questionnaire.ts b/src/views/resource/customer/questionnaire/customer-questionnaire.ts
index 7391891..a3b40fc 100644
--- a/src/views/resource/customer/questionnaire/customer-questionnaire.ts
+++ b/src/views/resource/customer/questionnaire/customer-questionnaire.ts
@@ -39,6 +39,8 @@
   itemTen: string
   score?: string
   [key: string]: string | undefined
+  sendFlag: string // 是否已发送（1/2）
+  sendFlagName: string // 是否已发送（1/2）
 }
 
 export interface ICustomerRateColumn {
diff --git a/src/views/resource/customer/questionnaire/detail.vue b/src/views/resource/customer/questionnaire/detail.vue
index 6560afd..553ebb4 100644
--- a/src/views/resource/customer/questionnaire/detail.vue
+++ b/src/views/resource/customer/questionnaire/detail.vue
@@ -1,12 +1,14 @@
 <!-- 委托方满意度调查表详情 -->
 <script name="QuestionnaireDetail" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
-import type{ ICustomerQuestionnaireInfo, ICustomerRateColumn } from './customer-questionnaire'
+import type { ICustomerQuestionnaireInfo, ICustomerRateColumn } from './customer-questionnaire'
 import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
 import useUserStore from '@/store/modules/user'
-import { addQuestionnaire } from '@/api/resource/questionnaire'
+import FilterSysUser from '@/views/resource/common/filterSysUser.vue'
+import { addQuestionnaire, send } from '@/api/resource/questionnaire'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import { getDictByCode } from '@/api/system/dict'
+import { uniqueArray } from '@/utils/Array'
 
 // 从路由中传过来的参数
 const type = ref<string>('')
@@ -18,7 +20,7 @@
 
 const questionnaireFormRef = ref()
 const refFilterCustomer = ref()
-
+const sendIds = ref<string[]>([]) // 发送的参数
 const questionnaireInfo = ref<ICustomerQuestionnaireInfo>({
   id: '',
   customerId: '',
@@ -31,8 +33,8 @@
   senderId: '',
   senderName: '',
   sendTime: '',
-  writerId: '',
-  writerName: '',
+  writerId: '', // 填写人id（单选用-新建不让传）
+  writerName: '', // 填写人名字(多选时候-新建不让传)
   writeTime: '',
   writeStatus: '',
   itemOne: '',
@@ -45,12 +47,15 @@
   itemEight: '',
   itemNine: '',
   itemTen: '',
+
+  sendFlag: '', // 是否已发送（1/2）
+  sendFlagName: '', // 是否已发送（1/2）
 })
 
 const questionnaireFormRules = ref({
-  labCode: [{ required: true, message: '实验室不能为空，请选择', trigger: ['change', 'blur'] }],
-  customerId: [{ required: true, message: '填写单位不能为空，请选择', trigger: 'change' }],
-  writerId: [{ required: true, message: '填写人不能为空，请选择', trigger: 'change' }],
+  labCode: [{ required: true, message: '实验室不能为空', trigger: ['change', 'blur'] }],
+  customerId: [{ required: true, message: '填写单位不能为空', trigger: 'change' }],
+  writerName: [{ required: true, message: '填写人不能为空', trigger: 'change' }],
 }) // 表单验证规则
 
 // 字典值
@@ -71,28 +76,43 @@
   { index: 10, text: '10、对所提供的计量保障是否满意', value: 0, attributeName: 'itemTen' },
 ])
 
-// 逻辑
-
-// 显示筛选填写用户和单位的弹窗
+// ---------------------------------------------多选填写人----------------------------------------------
+const writerNames = ref<{ customerId: string; writerId: string }[]>([]) // 选择的填写人数组
+// 点击选择填写人
 const showFilterCustomerDialog = () => {
-  refFilterCustomer.value.showOrHideFilterDialog(true)
+  refFilterCustomer.value.showOrHideFilterDialog(true, '', false, writerNames.value)
 }
 
-// 返回选定结果
-const recordSelectedHandler = (row: any) => {
+// 选定填写人
+const recordSelectedHandler = (list: any) => {
   refFilterCustomer.value.showOrHideFilterDialog(false)
-
-  if (row.id !== '') {
-    questionnaireInfo.value.customerId = row.customerId
-    questionnaireInfo.value.customerName = row.customerName
-    questionnaireInfo.value.writerId = row.id
-    questionnaireInfo.value.writerName = row.name
+  if (list && list.length) {
+    writerNames.value = list.map((item: { customerDeptId: string; id: string }) => {
+      return {
+        customerId: item.customerDeptId,
+        writerId: item.id,
+      }
+    })
+    questionnaireInfo.value.writerName = list.map((item: { name: string }) => item.name).join(',')
+    // 填写单位
+    questionnaireInfo.value.customerName = uniqueArray(list.map((item: { customerName: string }) => item.customerName)).join(',')
+    questionnaireInfo.value.customerId = uniqueArray(list.map((item: { customerDeptId: string }) => item.customerDeptId)).join(',')
   }
   else {
     ElMessage.error('填写单位和填写人不能为空，请重新选择')
   }
 }
 
+// 清空填写人
+const clean = () => {
+  questionnaireInfo.value.writerName = ''
+  questionnaireInfo.value.customerName = ''
+  questionnaireInfo.value.customerId = ''
+  writerNames.value = []
+}
+
+// ---------------------------------------------------------------------------------------------------
+
 // 保存
 const saveQuestionnaireInfo = () => {
   let satisfactionStr = ''
@@ -109,19 +129,29 @@
     if (satisfactionStr.length === 10) {
       questionnaireInfo.value.writeTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 填写时间为当前时间
     }
-
+    const params = {
+      ...questionnaireInfo.value,
+      writerId: null, // 填写人id（单选用-多选时候新建不让传）
+      writerName: null, // 填写人名字(多选时候-新建不让传)
+      sendFlag: '2', // 是否已发送（1/2）
+      sendFlagName: '未发送', // 是否已发送（1/2）
+      customerName: null,
+      customerId: null,
+      sendDTOs: writerNames.value, // 填写人信息
+    }
     // 提交接口
-    addQuestionnaire(questionnaireInfo.value).then((res) => {
+    addQuestionnaire(params).then((res) => {
       if (res.code === 200) {
       // 提示保存成功
-        ElMessage.success('委托方满意度调查表创建并发送成功')
+        ElMessage.success('委托方满意度调查表创建成功')
 
         // 设置返回的委托方id和委托方编号
-        questionnaireInfo.value.questionnaireNo = res.data.questionnaireNo
-        questionnaireInfo.value.id = res.data.id
-        id.value = res.data.id
+        // questionnaireInfo.value.questionnaireNo = res.data.questionnaireNo
+        // questionnaireInfo.value.id = res.data.id
+        // id.value = res.data.id
 
         type.value = 'detail'
+        sendIds.value = res.data
       }
       else {
       // 提示失败信息
@@ -193,6 +223,18 @@
   router.go(-1)
 }
 
+// 点击发送
+const handleSend = () => {
+  if (sendIds && sendIds.value.length) {
+    send({ ids: sendIds.value }).then((res) => {
+      ElMessage.success('发送成功')
+    })
+  }
+  else {
+    ElMessage.warning('没有发送的单位或个人')
+  }
+}
+
 const initDialog = (params: any) => {
   // 从路由中获取参数
   type.value = params.type
@@ -205,7 +247,8 @@
       questionnaireInfo.value.senderId = userInfo.id
       questionnaireInfo.value.senderName = userInfo.name
       questionnaireInfo.value.sendTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
-
+      questionnaireInfo.value.labCode = userInfo.bizLabCode // 实验室代码
+      questionnaireInfo.value.labCodeName = userInfo.labCodeName // 实验室名称
       break
 
     case 'detail':
@@ -275,6 +318,9 @@
     <el-form ref="questionnaireFormRef" :model="questionnaireInfo" :rules="questionnaireFormRules" label-position="right" label-width="110px" border stripe>
       <detail-page title="委托方满意度调查表">
         <template #btns>
+          <el-button v-if="type === 'detail'" type="primary" @click="handleSend">
+            发送
+          </el-button>
           <el-button v-if="type !== 'detail'" type="primary" @click="saveButtonHandler">
             保存
           </el-button>
@@ -284,7 +330,6 @@
         </template>
 
         <el-row :gutter="24">
-          <!-- 第一行 第一列 -->
           <el-col :span="6">
             <el-form-item label="实验室" prop="labCode">
               <el-select v-model="questionnaireInfo.labCode" placeholder="请选择实验室" :disabled="type === 'detail'" style="width: 100%;">
@@ -292,46 +337,52 @@
               </el-select>
               <el-input v-model="questionnaireInfo.labCodeName" type="hidden" />
             </el-form-item>
-
-            <el-form-item label="填写单位" prop="customerId">
-              <el-input v-model="questionnaireInfo.customerName" :disabled="true" placeholder="选择填写人时自动填充" />
-              <el-input v-model="questionnaireInfo.customerId" type="hidden" />
-            </el-form-item>
           </el-col>
-
           <el-col :span="6">
             <el-form-item label="文件编号">
-              <el-input v-model="questionnaireInfo.questionnaireNo" placeholder="文件编号，保存后自动生成" :disabled="true" />
-            </el-form-item>
-
-            <el-form-item label="填写人" prop="writerId">
-              <el-input v-model="questionnaireInfo.writerName" :readonly="true" :disabled="true">
-                <template #append>
-                  <el-button size="small" :disabled="type === 'detail'" @click="showFilterCustomerDialog">
-                    选择
-                  </el-button>
-                </template>
-              </el-input>
-              <el-input v-model="questionnaireInfo.writerId" type="hidden" />
+              <el-input v-model="questionnaireInfo.questionnaireNo" placeholder="系统自动生成" :disabled="true" />
             </el-form-item>
           </el-col>
-
           <el-col :span="6">
             <el-form-item label="发送人">
               <el-input v-model="questionnaireInfo.senderName" :disabled="true" />
               <el-input v-model="questionnaireInfo.senderId" type="hidden" />
             </el-form-item>
-
-            <el-form-item label="填写时间">
-              <el-input v-model="questionnaireInfo.writeTime" :disabled="true" />
-            </el-form-item>
           </el-col>
-
           <el-col :span="6">
             <el-form-item label="发送时间">
               <el-input v-model="questionnaireInfo.sendTime" placeholder="保存后自动生成" :disabled="true" />
             </el-form-item>
           </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="填写人" prop="writerName" style="display: flex;">
+              <el-button size="small" type="primary" :disabled="type === 'detail'" @click="showFilterCustomerDialog">
+                {{ questionnaireInfo.writerName ? '继续添加' : '添加' }}
+              </el-button>
+              <el-button size="small" type="info" :disabled="type === 'detail'" @click="clean">
+                清空
+              </el-button>
+              <el-input v-model="questionnaireInfo.writerName" placeholder="请添加填写人" style="margin-top: 8px;" :readonly="true" :disabled="true" type="textarea" autosize>
+                <!-- <template #append>
+                  <el-button size="small" :disabled="type === 'detail'" @click="showFilterCustomerDialog">
+                    选择
+                  </el-button>
+                </template> -->
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="填写单位" prop="customerId">
+              <el-input v-model="questionnaireInfo.customerName" type="textarea" :autosize="{ minRows: 3 }" :disabled="true" placeholder="选择填写人时自动填充" />
+              <el-input v-model="questionnaireInfo.customerId" type="hidden" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="填写时间">
+              <el-input v-model="questionnaireInfo.writeTime" :disabled="true" />
+            </el-form-item>
+          </el-col>
         </el-row>
       </detail-page>
 
@@ -350,8 +401,8 @@
         </el-row>
       </table-container>
     </el-form>
-
-    <filter-customer-staff ref="refFilterCustomer" title="请选择填写单位和填写人" @record-selected="recordSelectedHandler" />
+    <!-- 单选填写人--先选委托方，再去选委托方下面的人 -->
+    <filter-customer-staff ref="refFilterCustomer" :is-multi="true" title="请选择填写单位和填写人" @record-selected="recordSelectedHandler" />
   </app-container>
 </template>
 
diff --git a/src/views/resource/customer/questionnaire/list.vue b/src/views/resource/customer/questionnaire/list.vue
index a2306ff..553e5f3 100644
--- a/src/views/resource/customer/questionnaire/list.vue
+++ b/src/views/resource/customer/questionnaire/list.vue
@@ -2,9 +2,9 @@
 <script name="QuestionnaireList" lang="ts" setup>
 import { ElMessage, dayjs } from 'element-plus'
 import type { DateModelType } from 'element-plus'
-import type{ ICustomerQuestionnaireInfo, IListQuery } from './customer-questionnaire'
+import type { ICustomerQuestionnaireInfo, IListQuery } from './customer-questionnaire'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getQuestionnaireList } from '@/api/resource/questionnaire'
+import { getQuestionnaireList, remindWorker } from '@/api/resource/questionnaire'
 
 const { proxy } = getCurrentInstance() as any
 const router = useRouter()
@@ -118,7 +118,9 @@
 }
 
 const urging = (row: ICustomerQuestionnaireInfo) => {
-  ElMessage.success(`满意度调查表 ${row.questionnaireNo} 填写消息已发送`)
+  remindWorker({ id: row.id }).then((res) => {
+    ElMessage.success(`满意度调查表 ${row.questionnaireNo} 填写消息已催办`)
+  })
 }
 
 watch(dateRangeSend, (val) => {
@@ -194,7 +196,8 @@
               <el-button size="small" type="primary" link @click="detail(row)">
                 详情
               </el-button>
-              <el-button v-if="row.writeStatus !== '已提交'" size="small" type="primary" link @click="urging(row)">
+              <!-- <el-button v-if="row.writeStatus !== '已提交'" size="small" type="primary" link @click="urging(row)"> -->
+              <el-button size="small" type="primary" link @click="urging(row)">
                 催办
               </el-button>
             </template>
diff --git a/src/views/resource/customer/situationReport/dialog/selectSuggestFormDialog.vue b/src/views/resource/customer/situationReport/dialog/selectSuggestFormDialog.vue
index 8fa636b..a491499 100644
--- a/src/views/resource/customer/situationReport/dialog/selectSuggestFormDialog.vue
+++ b/src/views/resource/customer/situationReport/dialog/selectSuggestFormDialog.vue
@@ -130,7 +130,7 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择委托方" width="65%">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择委托方意见登记表" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="clearList">
       <search-item width="162px">
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index a5508b4..9066757 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -456,7 +456,7 @@
     locationName: '', // 地点名称
     locationNo: '', // 地点编号
     labName: lab, // 所属实验室
-    limit: 20,
+    limit: 999999,
     offset: 1,
   }
   getLocationList(params).then((response) => {
diff --git a/src/views/resource/environment/voltage/edit.vue b/src/views/resource/environment/voltage/edit.vue
index b8a9290..ad03b80 100644
--- a/src/views/resource/environment/voltage/edit.vue
+++ b/src/views/resource/environment/voltage/edit.vue
@@ -58,6 +58,8 @@
 
   testUseEquipment: '', //	测试所用设备
   testUseEquipmentId: '', //		测试所用设备id
+  model: '', // 型号
+  manufactureNo: '', // 出厂编号
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
   groupCode: '', // 部门
@@ -417,6 +419,8 @@
   if (list && list.length) {
     recordForm.value.testUseEquipment = list[0].equipmentName //	测试所用设备
     recordForm.value.testUseEquipmentId = list[0].id //		测试所用设备id
+    recordForm.value.model = list[0].model //		型号
+    recordForm.value.manufactureNo = list[0].manufactureNo //		出厂编号
   }
 }
 
@@ -463,8 +467,7 @@
   // 从路由中获取参数
   type.value = params.type
   id.value = params.id !== undefined ? params.id : ''
-  status.value = params.status !== undefined ? params.status : ''
-
+  status.value = params.status
   // 默认显示第一个tab内容
   current.value = radioItems.value[0].value
   currentLabel.value = radioItems.value[0].name
@@ -517,7 +520,6 @@
     if (radioItems.value[radioItems.value.length - 1].value === 'voltage-approval') {
       radioItems.value.pop()
     }
-    console.log(radioItems.value)
   }
   else { // 非全部和草稿箱把审批详情加上
     if (radioItems.value[radioItems.value.length - 1].value !== 'voltage-approval') {
@@ -541,7 +543,7 @@
     locationName: '', // 地点名称
     locationNo: '', // 地点编号
     labName: lab, // 所属实验室
-    limit: 20,
+    limit: 999999,
     offset: 1,
   }
   getLocationList(params).then((response) => {
@@ -618,6 +620,20 @@
       <detail-block v-if="current === 'voltage-basic'">
         <el-row :gutter="24">
           <el-col :span="6">
+            <el-form-item label="实验室" prop="labCode">
+              <el-select v-model="recordForm.labCode" placeholder="请选择实验室" :disabled="type === 'detail'" style="width: 100%;" @change="changeLab">
+                <el-option v-for="dict in labCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="recordForm.groupCode" placeholder="请选择部门" :disabled="type === 'detail'" style="width: 100%;">
+                <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="记录编号">
               <el-input v-model="recordForm.recordNo" placeholder="系统自动生成" :disabled="true" />
             </el-form-item>
@@ -651,7 +667,7 @@
             <el-form-item label="测试地点" prop="testLocation">
               <!-- <el-input v-model="recordForm.testLocation" :placeholder="type === 'detail' ? ' ' : '请输入测试地点'" :disabled="type === 'detail'" /> -->
               <el-autocomplete
-                v-model="detailRequire.testLocation"
+                v-model="recordForm.testLocation"
                 :fetch-suggestions="querySearchTestLocation"
                 placeholder="工作间名称"
                 clearable
@@ -669,27 +685,22 @@
               </el-input>
             </el-form-item>
           </el-col>
-
           <el-col :span="6">
+            <el-form-item label="型号" prop="model">
+              <el-input v-model="recordForm.model" :placeholder="type === 'detail' ? ' ' : '型号'" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号" prop="manufactureNo">
+              <el-input v-model="recordForm.manufactureNo" :placeholder="type === 'detail' ? ' ' : '出厂编号'" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
             <el-form-item label="测试依据" prop="testBasis">
               <el-input v-model="recordForm.testBasis" :placeholder="type === 'detail' ? ' ' : '请输入测试依据'" :disabled="type === 'detail'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="实验室" prop="labCode">
-              <el-select v-model="recordForm.labCode" placeholder="请选择实验室" :disabled="type === 'detail'" style="width: 100%;" @change="changeLab">
-                <el-option v-for="dict in labCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="recordForm.groupCode" placeholder="请选择部门" :disabled="type === 'detail'" style="width: 100%;">
-                <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="电源电压空载(V)" prop="powerVoltageNoLoad">
               <el-input v-model="recordForm.powerVoltageNoLoad" :placeholder="type === 'detail' ? ' ' : '请输入电源电压空载'" :disabled="type === 'detail'" />
             </el-form-item>
diff --git a/src/views/resource/environment/voltage/list.vue b/src/views/resource/environment/voltage/list.vue
index 001a6d6..bce6ec9 100644
--- a/src/views/resource/environment/voltage/list.vue
+++ b/src/views/resource/environment/voltage/list.vue
@@ -52,33 +52,35 @@
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '测试时间', value: 'testTime', align: 'center', width: '120' },
-  { text: '测试地点', value: 'testLocation', align: 'center', width: '200' },
-  { text: '实验室', value: 'labCodeName', align: 'center' },
-  { text: '部门', value: 'groupCodeName', align: 'center' },
-  { text: '测试所用设备', value: 'testUseEquipment', align: 'center', width: '200' },
-  { text: '测试依据', value: 'testBasis', align: 'center' },
+  { text: '测试地点', value: 'testLocation', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '测试所用设备', value: 'testUseEquipment', align: 'center' },
+  { text: '型号', value: 'model', align: 'center' },
+  { text: '出厂编号', value: 'manufactureNo', align: 'center' },
+  { text: '测试依据', value: 'testBasis', align: 'center', width: '220' },
   {
     text: '电源电压(V)',
     value: '',
     align: 'center',
-    width: '120',
+    width: '220',
     children: [
-      { text: '空载', value: 'powerVoltageNoLoad', align: 'center', width: '60' },
-      { text: '加载', value: 'powerVoltageLoad', align: 'center', width: '60' },
+      { text: '空载', value: 'powerVoltageNoLoad', align: 'center', width: '120' },
+      { text: '加载', value: 'powerVoltageLoad', align: 'center', width: '120' },
     ],
   },
   {
     text: '零地电压(V)',
     value: '',
     align: 'center',
-    width: '120',
+    width: '220',
     children: [
-      { text: '空载', value: 'zeroVoltageNoLoad', align: 'center', width: '60' },
-      { text: '加载', value: 'zeroVoltageLoad', align: 'center', width: '60' },
+      { text: '空载', value: 'zeroVoltageNoLoad', align: 'center', width: '120' },
+      { text: '加载', value: 'zeroVoltageLoad', align: 'center', width: '120' },
     ],
   },
-  { text: '结论', value: 'conclusion', align: 'center', width: '160' },
-  { text: '测试人', value: 'createUserName', align: 'center', width: '120' },
+  { text: '结论', value: 'conclusion', align: 'center' },
+  { text: '测试人', value: 'createUserName', align: 'center' },
   { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '100' },
 ])
 const list = ref<Array<IVoltageRecord>>([]) // 表格数据
diff --git a/src/views/resource/environment/voltage/voltage-interface.ts b/src/views/resource/environment/voltage/voltage-interface.ts
index 5afb1fe..cd7c137 100644
--- a/src/views/resource/environment/voltage/voltage-interface.ts
+++ b/src/views/resource/environment/voltage/voltage-interface.ts
@@ -36,6 +36,8 @@
 
   testUseEquipment: string //	测试所用设备
   testUseEquipmentId: string //		测试所用设备id
+  model: string // 型号
+  manufactureNo: string // 出厂编号
   labCode: string // 实验室
   labCodeName: string // 实验室名称
   groupCode: string // 部门
diff --git a/src/views/resource/outsideService/consumable/applyDetail.vue b/src/views/resource/outsideService/consumable/applyDetail.vue
index 0950cc1..65d27dd 100644
--- a/src/views/resource/outsideService/consumable/applyDetail.vue
+++ b/src/views/resource/outsideService/consumable/applyDetail.vue
@@ -638,7 +638,7 @@
         <table-container title="物资明细">
           <template v-if="type !== 'detail'" #btns-right>
             <el-button type="primary" @click="addEditableRow">
-              增加行
+              批量增加
             </el-button>
             <el-button type="info" @click="delSupplierRecords">
               删除行
diff --git a/src/views/resource/outsideService/consumable/checkDetail.vue b/src/views/resource/outsideService/consumable/checkDetail.vue
index bbc7a1b..1caccd0 100644
--- a/src/views/resource/outsideService/consumable/checkDetail.vue
+++ b/src/views/resource/outsideService/consumable/checkDetail.vue
@@ -1,7 +1,7 @@
 <!-- 物资验收记录单详情 -->
 <script name="ConsumableCheckDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
-import type { IConsumableApply, IGoodsCheckRecord } from './consumable-interface'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import type { IConsumableApply, IGoodsCheckRecord, IRecordDetail } from './consumable-interface'
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import FilterConsumableApply from '@/views/resource/common/filterConsumableApply.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
@@ -10,6 +10,7 @@
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
+import { useCheckList } from '@/commonMethods/useCheckList'
 
 // 变量
 // 从路由中传过来的参数
@@ -62,17 +63,23 @@
 })
 
 const checkRules = ref({
-  labCode: [{ required: true, message: '实验室不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
-  acceptTime: [{ required: true, message: '验收时间不能为空，请选择', trigger: 'blur' }],
-  goodsApplyNo: [{ required: true, message: '易耗物资申请单不能为空，请选择', trigger: 'blur' }],
-  goodsName: [{ required: true, message: '物资名称不能为空', trigger: 'blur' }],
-  goodsModel: [{ required: true, message: '规格型号不能为空', trigger: 'blur' }],
-  goodsSupplier: [{ required: true, message: '生产厂家不能为空', trigger: 'blur' }],
-  goodsWorth: [{ required: true, message: '价值不能为空', trigger: 'blur' }],
-  performance: [{ required: true, message: '主要性能指标不能为空', trigger: 'blur' }],
+  labCode: [{ required: true, message: '实验室不能为空', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['change', 'blur'] }],
+  acceptTime: [{ required: true, message: '验收时间不能为空', trigger: 'blur' }],
+  goodsApplyNo: [{ required: true, message: '易耗物资申请单不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 
+const recordDetailList = ref<IRecordDetail[]>([]) // 验收详情表格
+const recordDetailCheckoutList = ref<IRecordDetail[]>([]) // 验收详情多选
+const goodsColumns = [
+  { text: '名称', value: 'goodsName', align: 'center', required: true },
+  { text: '规格型号', value: 'goodsModel', align: 'center', required: true },
+  { text: '生产厂家', value: 'goodsSupplier', align: 'center', required: true },
+  { text: '价值', value: 'goodsWorth', align: 'center', required: true },
+  { text: '数量', value: 'goodsAmount', align: 'center', required: true },
+  { text: '主要性能指标', value: 'performance', align: 'center', required: true },
+] // 表头
+
 // 是否显示相关按钮
 const saveButtVisable = ref<boolean>(false) // 是否显示 保存 按钮
 const submitButtVisable = ref<boolean>(false) // 是否显示 提交 按钮
@@ -165,7 +172,16 @@
 // 保存至草稿箱
 const saveDraftCheck = () => {
   goodsCheckForm.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 创建时间改为提交时间
-  saveGoodsCheck(goodsCheckForm.value).then((res) => {
+  const params = {
+    ...goodsCheckForm.value,
+    recordDetailList: recordDetailList.value,
+  }
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  saveGoodsCheck(params).then((res) => {
     if (res.code === 200) {
       // 提示保存成功
       ElMessage.success('保存成功')
@@ -176,15 +192,22 @@
 
       type.value = 'update'
       status.value = '1' // 保存成功后进入草稿箱 为了不显示审批详情
+      loading.close()
     }
     else {
       // 提示失败信息
       ElMessage.error(`保存失败：${res.message}`)
+      loading.close()
     }
   })
 }
 // 编辑草稿箱（不走流程审批）
 const updateDraftCheck = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
   updateGoodsCheck(goodsCheckForm.value).then((res) => {
     if (res.code === 200) {
       // 提示保存成功
@@ -194,6 +217,7 @@
       // 提示失败信息
       ElMessage.error(`保存失败：${res.message}`)
     }
+    loading.close()
   })
 }
 
@@ -210,7 +234,9 @@
 // 新建时保存后的处理 获取返回的id
 const saveButtonHandler = async () => {
   if (!goodsCheckRef) { return }
-
+  if (!useCheckList(recordDetailList.value, goodsColumns, '物资明细')) {
+    return false
+  }
   await goodsCheckRef.value.validate((valid: boolean) => {
     if (valid === true) {
       ElMessageBox.confirm(
@@ -242,6 +268,11 @@
       cancelButtonText: '取消',
       type: 'warning',
     }).then(() => {
+      const loading = ElLoading.service({
+        lock: true,
+        text: '加载中...',
+        background: 'rgba(255, 255, 255, 0.6)',
+      })
       submitGoodsCheck({
         formId: SCHEDULE.CHECK_MATERIAL_RECORD_APPROVAL,
         id: goodsCheckForm.value.id,
@@ -255,6 +286,7 @@
         else {
           ElMessage.error(`物资验收记录单 ${goodsCheckForm.value.recordNo} 提交失败：${res.message}`)
         }
+        loading.close()
       })
     })
   }
@@ -262,6 +294,11 @@
     // 之前已经在流程中的表单 保存提交
     await goodsCheckRef.value.validate((valid: boolean) => {
       if (valid === true) {
+        const loading = ElLoading.service({
+          lock: true,
+          text: '加载中...',
+          background: 'rgba(255, 255, 255, 0.6)',
+        })
         failUpdateGoodsCheck(goodsCheckForm.value).then((res) => {
           if (res.code === 200) {
           // 提示保存成功
@@ -274,6 +311,7 @@
           // 提示失败信息
             ElMessage.error(`物资验收记录单 ${goodsCheckForm.value.recordNo} 提交失败：${res.message}`)
           }
+          loading.close()
         })
       }
     })
@@ -282,17 +320,23 @@
 
 // 根据id查询详情
 const detailById = async (id: string) => {
-  await detailGoodsCheck({ id }).then((res) => {
-    if (res.code === 200) {
-      goodsCheckForm.value = res.data
-      if (goodsCheckForm.value.taskId === '') {
-        goodsCheckForm.value.taskId = sessionStorage.getItem('consumableCheckTaskId')!
-      }
-      detailConsumableApply({ id: goodsCheckForm.value.goodsApplyId }).then((response) => {
-        goodsCheckForm.value.goodsApplyNo = response.data.applyNo
-      })
-    }
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
   })
+  const res = await detailGoodsCheck({ id })
+  if (res.code === 200) {
+    goodsCheckForm.value = res.data
+    if (goodsCheckForm.value.taskId === '') {
+      goodsCheckForm.value.taskId = sessionStorage.getItem('consumableCheckTaskId')!
+    }
+    detailConsumableApply({ id: goodsCheckForm.value.goodsApplyId }).then((response) => {
+      goodsCheckForm.value.goodsApplyNo = response.data.applyNo
+    })
+    recordDetailList.value = res.data.recordDetailList // 物资明细
+    loading.close()
+  }
 }
 
 // 流程审批-拒绝
@@ -307,7 +351,35 @@
 
 // 取消流程
 const revokeClickedHandler = () => {
-  approvalDialog.value.initDialog('revoke', goodsCheckForm.value.id, goodsCheckForm.value.taskId || route.query.taskId, goodsCheckForm.value.processId || route.query.processId)
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      const loading = ElLoading.service({
+        lock: true,
+        text: '加载中...',
+        background: 'rgba(255, 255, 255, 0.6)',
+      })
+      const params = {
+        processInstanceId: goodsCheckForm.value.processId!,
+        comments: '',
+        id: id.value,
+      }
+      revokeApprovalCheck(params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '已取消',
+        })
+        cancelButtVisable.value = false
+        loading.close()
+      })
+    })
 }
 
 // 删除审批单
@@ -339,22 +411,6 @@
   }
 }
 
-// 取消
-const revokeHandler = (param: any) => {
-  revokeApprovalCheck(param).then((res) => {
-    if (res.code === 200) {
-      ElMessage.success('流程取消成功')
-    }
-    else {
-      ElMessage.error(`流程取消失败：${res.message}`)
-    }
-    // 关闭弹窗
-    approvalDialog.value.handleClose()
-
-    cancelButtVisable.value = false
-  })
-}
-
 // 拒绝
 const refuseHandler = (param: any) => {
   refuseApprovalCheck(param).then((res) => {
@@ -371,17 +427,71 @@
   })
 }
 
+// ------------------------------------物资明细表格-------------------------------------------------------------
+// 多选
+const multiSelect = (e: any) => {
+  recordDetailCheckoutList.value = e
+}
+
+// 增加行
+const addRow = () => {
+  if (!useCheckList(recordDetailList.value, goodsColumns, '物资明细')) {
+    return false
+  }
+  recordDetailList.value.push({
+    goodsAmount: '', // 数量
+    goodsModel: '', // 型号
+    goodsName: '', // 名称
+    goodsSupplier: '', // 生产厂家
+    goodsWorth: '', // 价值
+    id: '',
+    recordId: '',
+    performance: '', // 性能指标
+  })
+}
+
+// 删除行
+const delRow = () => {
+  if (recordDetailCheckoutList.value.length === 0) {
+    ElMessage.warning('请至少选择一行')
+    return
+  }
+
+  recordDetailList.value = recordDetailList.value.filter(item => recordDetailCheckoutList.value.includes(item) === false)
+}
+// ------------------------------------物资申请单------------------------------------------------------------------------
+// 点击选择物资申请单
 const showConsumableApplyFilter = () => {
   applyFilterRef.value.showOrHideFilterDialog(true)
 }
 
+// 选好物资申请单
 const applyFormSelectedHandler = (apply: IConsumableApply) => {
   goodsCheckForm.value.goodsApplyId = apply.id
   goodsCheckForm.value.goodsApplyNo = apply.applyNo
   goodsCheckForm.value.goodsApply = apply.applyName
 
   applyFilterRef.value.showOrHideFilterDialog(false)
+
+  // 查询物资申请单详情-获取物资列表
+  if (apply.id) {
+    detailConsumableApply({ id: apply.id }).then((res) => {
+      recordDetailList.value = res.data.goodsDetailList.map((item: any) => {
+        return {
+          goodsAmount: item.goodsQuantity, // 数量
+          goodsModel: item.goodsModel, // 型号
+          goodsName: item.goodsName, // 名称
+          goodsSupplier: item.supplierName, // 生产厂家
+          goodsWorth: '', // 价值
+          id: '',
+          recordId: item.id,
+          performance: '', // 性能指标
+        }
+      })
+    })
+  }
 }
+// ---------------------------------------------------------------------------------------------------------------------
 
 const getLabCodeDict = async () => {
   // 先从缓存中获取
@@ -439,6 +549,10 @@
       goodsCheckForm.value.createDeptId = userInfo.deptId
       goodsCheckForm.value.createDept = userInfo.deptName
       goodsCheckForm.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
+      goodsCheckForm.value.labCode = userInfo.bizLabCode // 实验室代码
+      goodsCheckForm.value.labCodeName = userInfo.labCodeName // 实验室名称
+      goodsCheckForm.value.groupCode = userInfo.groupNo // 部门代码
+      goodsCheckForm.value.groupCodeName = userInfo.groupName // 部门名称
 
       keyFieldsDisable.value = false
 
@@ -511,7 +625,7 @@
           <el-button v-if="submitButtVisable" :disabled="id === ''" type="primary" @click="submitButtonHandler">
             提交
           </el-button>
-          <el-button v-if="saveButtVisable" type="primary" @click="saveButtonHandler">
+          <el-button v-if="saveButtVisable" :disabled="type === 'create' && id !== ''" type="primary" @click="saveButtonHandler">
             保存
           </el-button>
 
@@ -536,7 +650,7 @@
           <!-- 第一行 第一列 -->
           <el-col :span="6">
             <el-form-item label="实验室" prop="labCode">
-              <el-select v-model="goodsCheckForm.labCode" placeholder="请选择实验室" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-select v-model="goodsCheckForm.labCode" placeholder="请选择实验室" :disabled="keyFieldsDisable || type === 'detail'" style="width: 100%;">
                 <el-option v-for="dict in labCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
@@ -548,7 +662,7 @@
 
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="goodsCheckForm.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-select v-model="goodsCheckForm.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable || type === 'detail'" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
@@ -560,10 +674,10 @@
 
           <el-col :span="6">
             <el-form-item label="文件编号">
-              <el-input v-model="goodsCheckForm.recordNo" placeholder="文件编号，保存后自动生成" :disabled="true" />
+              <el-input v-model="goodsCheckForm.recordNo" placeholder="系统自动生成" :disabled="true" />
             </el-form-item>
             <el-form-item label="验收时间" prop="acceptTime">
-              <el-date-picker v-model="goodsCheckForm.acceptTime" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="type === 'detail'" style="width: 100%;" />
+              <el-date-picker v-model="goodsCheckForm.acceptTime" :placeholder="type === 'detail' ? ' ' : '验收时间'" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="type === 'detail'" style="width: 100%;" />
             </el-form-item>
           </el-col>
 
@@ -575,7 +689,7 @@
             <el-form-item label="物资申请单" prop="goodsApplyNo">
               <el-input v-model="goodsCheckForm.goodsApplyId" type="hidden" />
               <el-input v-model="goodsCheckForm.goodsApplyNo" :disabled="true">
-                <template #append>
+                <template v-if="type !== 'detail'" #append>
                   <el-button size="small" :disabled="keyFieldsDisable" @click="showConsumableApplyFilter">
                     选择
                   </el-button>
@@ -585,48 +699,49 @@
           </el-col>
         </el-row>
       </detail-block>
-      <detail-block v-if="current === 'consumable-check-basic'" title="">
-        <table-container title="验收详情">
-          <el-row :gutter="24">
-            <el-col :span="6">
-              <el-form-item label="名称" prop="goodsName">
-                <el-input v-model="goodsCheckForm.goodsName" :disabled="type === 'detail'" />
-              </el-form-item>
-            </el-col>
+      <detail-block v-if="current === 'consumable-check-basic'" title="物资明细">
+        <template v-if="type !== 'detail'" #btns>
+          <el-button type="primary" @click="addRow">
+            增加行
+          </el-button>
+          <el-button type="info" @click="delRow">
+            删除行
+          </el-button>
+        </template>
 
-            <el-col :span="6">
-              <el-form-item label="规格型号" prop="goodsModel">
-                <el-input v-model="goodsCheckForm.goodsModel" :disabled="type === 'detail'" />
-              </el-form-item>
-            </el-col>
+        <!-- 表格区域 -->
+        <el-table :data="recordDetailList" border @selection-change="multiSelect">
+          <el-table-column v-if="type !== 'detail'" type="selection" align="center" width="38" />
+          <el-table-column align="center" label="序号" width="55" type="index" />
+          <el-table-column
+            v-for="item in goodsColumns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
 
-            <el-col :span="6">
-              <el-form-item label="生产厂家" prop="goodsSupplier">
-                <el-input v-model="goodsCheckForm.goodsSupplier" :disabled="type === 'detail'" />
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="6">
-              <el-form-item label="价值" prop="goodsWorth">
-                <el-input v-model="goodsCheckForm.goodsWorth" :disabled="type === 'detail'" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-          <el-row :gutter="24">
-            <el-col :span="18">
-              <el-form-item label="主要性能指标" prop="performance">
-                <el-input v-model="goodsCheckForm.performance" type="textarea" :rows="5" :disabled="type === 'detail'" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </table-container>
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required && type !== 'detail'" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-input
+                v-if="item.required === true && type !== 'detail'"
+                v-model="scope.row[item.value]"
+                :placeholder="item.text"
+                type="textarea"
+                autosize
+              />
+            </template>
+          </el-table-column>
+        </el-table>
       </detail-block>
     </el-form>
 
     <approval-dialog
       ref="approvalDialog"
-      @on-success="approvalSuccessHandler" @on-refuse="refuseHandler" @on-revoke="revokeHandler"
+      @on-success="approvalSuccessHandler" @on-refuse="refuseHandler"
     />
 
     <filter-consumable-apply ref="applyFilterRef" @record-selected="applyFormSelectedHandler" />
diff --git a/src/views/resource/outsideService/consumable/checkList.vue b/src/views/resource/outsideService/consumable/checkList.vue
index 2ef68f8..0da57fa 100644
--- a/src/views/resource/outsideService/consumable/checkList.vue
+++ b/src/views/resource/outsideService/consumable/checkList.vue
@@ -248,7 +248,29 @@
 
 // 取消（撤回审批单）
 const revokeApprById = (row: IGoodsCheckRecord) => {
-  apprDial.value.initDialog('revoke', row.id, row.taskId, row.processId)
+  const params = {
+    processInstanceId: row.processId!,
+    comments: '',
+    id: row.id,
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      revokeApprovalCheck(params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '已取消',
+        })
+        fetchData(true)
+      })
+    })
 }
 
 // 流程操作之后刷新
@@ -256,22 +278,6 @@
   fetchData(true)
 }
 
-// 取消
-const revokeHandler = (param: any) => {
-  revokeApprovalCheck(param).then((res) => {
-    if (res.code === 200) {
-      ElMessage.success('流程取消成功')
-    }
-    else {
-      ElMessage.error(`流程取消失败：${res.message}`)
-    }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
-    fetchData(true)
-  })
-}
-
 // 拒绝
 const refuseHandler = (param: any) => {
   refuseApprovalCheck(param).then((res) => {
@@ -424,7 +430,6 @@
       ref="apprDial"
       @on-success="afterApprovalHandler"
       @on-refuse="refuseHandler"
-      @on-revoke="revokeHandler"
     />
 
     <!-- 右上角按钮集合 -->
diff --git a/src/views/resource/outsideService/consumable/consumable-interface.ts b/src/views/resource/outsideService/consumable/consumable-interface.ts
index e09cf3f..dc2ab2a 100644
--- a/src/views/resource/outsideService/consumable/consumable-interface.ts
+++ b/src/views/resource/outsideService/consumable/consumable-interface.ts
@@ -282,3 +282,15 @@
   createUserName?: string
   createTime?: string
 }
+
+// 物资验收记录-物资明细
+export interface IRecordDetail {
+  goodsAmount: string // 数量
+  goodsModel: string // 型号
+  goodsName: string // 名称
+  goodsSupplier: string // 生产厂家
+  goodsWorth: string // 价值
+  id: string
+  recordId: string
+  performance: string // 性能指标
+}
diff --git a/src/views/resource/outsideService/consumable/storeDetail.vue b/src/views/resource/outsideService/consumable/storeDetail.vue
index 62bde9b..9129b3f 100644
--- a/src/views/resource/outsideService/consumable/storeDetail.vue
+++ b/src/views/resource/outsideService/consumable/storeDetail.vue
@@ -1,12 +1,13 @@
 <!-- 物资入库单 详情 -->
 <script name="ConsumableStoreDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import filterConsumableCheck from '../../common/filterConsumableCheck.vue'
 import type { IConsumableStore, IConsumableStoreGoods } from './consumable-interface'
 import StoreDetailDialog from './storeDetailDialog.vue'
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import { SCHEDULE } from '@/utils/scheduleDict'
-import { detailConsumableStore, draftDeleteStore, failUpdateConsumableStore, refuseApprovalStore, revokeApprovalStore, saveConsumableStore, submitConsumableStore, updateConsumableStore } from '@/api/resource/supplierConsumable'
+import { detailConsumableApply, detailConsumableStore, detailGoodsCheck, draftDeleteCheck, draftDeleteStore, failUpdateConsumableStore, failUpdateGoodsCheck, refuseApprovalCheck, refuseApprovalStore, revokeApprovalCheck, revokeApprovalStore, saveConsumableStore, saveGoodsCheck, submitConsumableStore, submitGoodsCheck, updateConsumableStore, updateGoodsCheck } from '@/api/resource/supplierConsumable'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
@@ -57,10 +58,10 @@
 
 const goodsList = ref<Array<IConsumableStoreGoods>>([])
 const goodsColumns = [
-  { text: '名称', value: 'goodsName', align: 'center', width: '240', required: true },
-  { text: '厂家信息', value: 'manufacturer', align: 'center', width: '240', required: true },
-  { text: '规格型号', value: 'goodsModel', align: 'center', width: '240', required: true },
-  { text: '数量及单位', value: 'amount', align: 'center', width: '240', required: true },
+  { text: '名称', value: 'goodsName', align: 'center', required: true },
+  { text: '厂家信息', value: 'manufacturer', align: 'center', required: true },
+  { text: '规格型号', value: 'goodsModel', align: 'center', required: true },
+  { text: '数量及单位', value: 'amount', align: 'center', required: true },
   { text: '单价', value: 'unitPrice', align: 'center', width: '180' },
   { text: '金额', value: 'price', align: 'center', width: '180', required: true },
   { text: '备注', value: 'remark', align: 'center' },
@@ -161,12 +162,28 @@
   sessionStorage.removeItem('consumableStoreTaskId') // 返回列表时 将缓存中的数据删除
   router.go(-1)
 }
-
-// 新增
+// ---------------------------入库单详情表格-------------------------------------------------------
+const filterConsumableCheckRef = ref() // 选择物资验收记录组件
+// 增加行
 const addEditableRow = () => {
-  refStoreDetailDialog.value.showRecordDialog(true)
+  // refStoreDetailDialog.value.showRecordDialog(true)
+  if (!useCheckList(goodsList.value, goodsColumns, '入库单详情')) {
+    return false
+  }
+  goodsList.value.push({
+    amount: '', //	数量
+    goodsModel: '', //	规格
+    goodsName: '', //	名称
+    id: '', //	id，更新/删除使用参数
+    manufacturer: '', //		厂家
+    price: '', //		金额
+    remark: '', //		备注
+    unitPrice: '', //		单价
+    warehouseId: '', //		物资入库单id
+  })
 }
 
+// 删除行
 const delGoodsStoreRecords = () => {
   if (recordSelected.value.length === 0) {
     ElMessage.warning('请至少选择一行')
@@ -175,11 +192,38 @@
 
   goodsList.value = goodsList.value.filter(item => recordSelected.value.includes(item) === false)
 }
-
+// 多选
 const storeMultiSelect = (e: any) => {
   recordSelected.value = e
 }
 
+// 点击选择物资验收记录
+const selectGoodsCheckRecord = () => {
+  filterConsumableCheckRef.value.initDialog()
+}
+
+// 确定选择物资验收记录
+const confirmFilterConsumableCheck = (val: any) => {
+  if (val && val.length) {
+    detailGoodsCheck({ id: val[0].id }).then((res) => {
+      goodsList.value = res.data.recordDetailList.map((item: any) => {
+        return {
+          amount: item.goodsAmount, //	数量
+          goodsModel: item.goodsModel, //	规格
+          goodsName: item.goodsName, //	名称
+          id: '', //	id，更新/删除使用参数
+          manufacturer: item.goodsSupplier, //		厂家
+          price: item.goodsWorth, //		金额
+          remark: '', //		备注
+          unitPrice: '', //		单价
+          warehouseId: '', //		物资入库单id
+        }
+      }) // 物资明细
+    })
+  }
+}
+// -----------------------------------------------------------------------------------------------------
+
 // 保存至草稿箱
 const saveDraftStore = () => {
   consumableStore.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 创建时间改为提交时间
@@ -230,9 +274,12 @@
   if (!consumableStoreRef) { return }
 
   if (goodsList.value.length === 0) {
-    ElMessage.error('物资明细不能为空，请选择易耗物资及供方')
+    ElMessage.warning('物资明细不能为空，请选择易耗物资及供方')
     return
   }
+  if (!useCheckList(goodsList.value, goodsColumns, '入库单详情')) {
+    return false
+  }
 
   if (useCheckList(goodsList.value, goodsColumns, '物资明细') === false) {
     return
@@ -343,7 +390,36 @@
 
 // 取消流程
 const revokeClickedHandler = () => {
-  approvalDialog.value.initDialog('revoke', consumableStore.value.id, consumableStore.value.taskId || route.query.taskId, consumableStore.value.processId || route.query.processId)
+  // approvalDialog.value.initDialog('revoke', consumableStore.value.id, consumableStore.value.taskId || route.query.taskId, consumableStore.value.processId || route.query.processId)
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      const loading = ElLoading.service({
+        lock: true,
+        text: '加载中...',
+        background: 'rgba(255, 255, 255, 0.6)',
+      })
+      const params = {
+        processInstanceId: consumableStore.value.processId! || route.query.processId,
+        comments: '',
+        id: consumableStore.value.id || id.value,
+      }
+      revokeApprovalStore(params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '已取消',
+        })
+        cancelButtVisable.value = false
+        loading.close()
+      })
+    })
 }
 
 // 删除审批单
@@ -375,22 +451,6 @@
   }
 }
 
-// 取消
-const revokeHandler = (param: any) => {
-  revokeApprovalStore(param).then((res) => {
-    if (res.code === 200) {
-      ElMessage.success('流程取消成功')
-    }
-    else {
-      ElMessage.error(`流程取消失败：${res.message}`)
-    }
-    // 关闭弹窗
-    approvalDialog.value.handleClose()
-
-    cancelButtVisable.value = false
-  })
-}
-
 // 拒绝
 const refuseHandler = (param: any) => {
   refuseApprovalStore(param).then((res) => {
@@ -475,6 +535,10 @@
       consumableStore.value.createUserName = userInfo.name
       consumableStore.value.createDeptId = userInfo.deptId
       consumableStore.value.createDept = userInfo.deptName
+      consumableStore.value.labCode = userInfo.bizLabCode // 实验室代码
+      consumableStore.value.labCodeName = userInfo.labCodeName // 实验室名称
+      consumableStore.value.groupCode = userInfo.groupNo // 部门代码
+      consumableStore.value.groupCodeName = userInfo.groupName // 部门名称
       consumableStore.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
       keyFieldsDisable.value = false
@@ -548,7 +612,7 @@
           <el-button v-if="submitButtVisable" :disabled="id === ''" type="primary" @click="submitButtonHandler">
             提交
           </el-button>
-          <el-button v-if="saveButtVisable" type="primary" @click="saveButtonHandler">
+          <el-button v-if="saveButtVisable" type="primary" :disabled="type === 'create' && id !== ''" @click="saveButtonHandler">
             保存
           </el-button>
 
@@ -612,41 +676,51 @@
           </el-col>
         </el-row>
       </detail-block>
-      <detail-block v-if="current === 'consumable-store-basic'" title="">
-        <table-container title="入库单详情">
-          <template v-if="type !== 'detail'" #btns-right>
-            <el-button type="primary" @click="addEditableRow">
-              增加行
-            </el-button>
-            <el-button type="info" @click="delGoodsStoreRecords">
-              删除行
-            </el-button>
-          </template>
+      <detail-block v-if="current === 'consumable-store-basic'" title="入库单详情">
+        <template v-if="type !== 'detail'" #btns>
+          <el-button type="primary" @click="selectGoodsCheckRecord">
+            选择物资验收记录
+          </el-button>
+          <el-button type="primary" @click="addEditableRow">
+            增加行
+          </el-button>
+          <el-button type="info" @click="delGoodsStoreRecords">
+            删除行
+          </el-button>
+        </template>
 
-          <!-- 表格区域 -->
-          <el-table :data="goodsList" border style="width: 100%;" @selection-change="storeMultiSelect">
-            <el-table-column v-if="type !== 'detail'" type="selection" align="center" width="38" />
-            <el-table-column align="center" label="序号" width="55" type="index" />
-            <el-table-column
-              v-for="item in goodsColumns"
-              :key="item.value"
-              :prop="item.value"
-              :label="item.text"
-              :width="item.width"
-              align="center"
-            >
-              <template #header>
-                <span v-show="item.required && type !== 'detail'" style="color: red;">*</span><span>{{ item.text }}</span>
-              </template>
-            </el-table-column>
-          </el-table>
-        </table-container>
+        <!-- 表格区域 -->
+        <el-table :data="goodsList" border style="width: 100%;" @selection-change="storeMultiSelect">
+          <el-table-column v-if="type !== 'detail'" type="selection" align="center" width="38" />
+          <el-table-column align="center" label="序号" width="55" type="index" />
+          <el-table-column
+            v-for="item in goodsColumns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required && type !== 'detail'" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-input
+                v-if="type !== 'detail'"
+                v-model="scope.row[item.value]"
+                :placeholder="item.text"
+                type="textarea"
+                autosize
+              />
+            </template>
+          </el-table-column>
+        </el-table>
       </detail-block>
     </el-form>
 
     <approval-dialog
       ref="approvalDialog"
-      @on-success="approvalSuccessHandler" @on-refuse="refuseHandler" @on-revoke="revokeHandler"
+      @on-success="approvalSuccessHandler" @on-refuse="refuseHandler"
     />
 
     <store-detail-dialog ref="refStoreDetailDialog" @record-saved="consumableStoreAddHandler" />
@@ -654,5 +728,8 @@
     <template v-if="current === 'consumable-store-approval' && status !== '1'">
       <approval-record-table :process-id="consumableStore.processId" />
     </template>
+
+    <!-- 选择物资验收记录 -->
+    <filter-consumable-check ref="filterConsumableCheckRef" @confirm="confirmFilterConsumableCheck" />
   </app-container>
 </template>
diff --git a/src/views/resource/outsideService/consumable/storeList.vue b/src/views/resource/outsideService/consumable/storeList.vue
index 8e4330d..b189b0b 100644
--- a/src/views/resource/outsideService/consumable/storeList.vue
+++ b/src/views/resource/outsideService/consumable/storeList.vue
@@ -302,7 +302,29 @@
 
 // 取消（撤回审批单）
 const revokeApprById = (row: IConsumableStore) => {
-  apprDial.value.initDialog('revoke', row.id, row.taskId, row.processId)
+  const params = {
+    processInstanceId: row.processId!,
+    comments: '',
+    id: row.id,
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      revokeApprovalStore(params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '已取消',
+        })
+        fetchData(true)
+      })
+    })
 }
 
 // 流程操作之后刷新
@@ -310,22 +332,6 @@
   fetchData(true)
 }
 
-// 取消
-const revokeHandler = (param: any) => {
-  revokeApprovalStore(param).then((res) => {
-    if (res.code === 200) {
-      ElMessage.success('流程取消成功')
-    }
-    else {
-      ElMessage.error(`流程取消失败：${res.message}`)
-    }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
-    fetchData(true)
-  })
-}
-
 // 拒绝
 const refuseHandler = (param: any) => {
   refuseApprovalStore(param).then((res) => {