diff --git a/src/api/eqpt/device/info.ts b/src/api/eqpt/device/info.ts
index f2a9176..e40366c 100644
--- a/src/api/eqpt/device/info.ts
+++ b/src/api/eqpt/device/info.ts
@@ -153,3 +153,11 @@
     method: 'get',
   })
 }
+// 绑定参试任务
+export function bindTaskHandler(data: object) {
+  return request({
+    url: '/equipment/bindTask',
+    method: 'post',
+    data,
+  })
+}

diff --git a/src/api/eqpt/device/info.ts b/src/api/eqpt/device/info.ts
index f2a9176..e40366c 100644
--- a/src/api/eqpt/device/info.ts
+++ b/src/api/eqpt/device/info.ts
@@ -153,3 +153,11 @@
     method: 'get',
   })
 }
+// 绑定参试任务
+export function bindTaskHandler(data: object) {
+  return request({
+    url: '/equipment/bindTask',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/expire.ts b/src/api/system/expire.ts
index 0720b82..834048e 100644
--- a/src/api/system/expire.ts
+++ b/src/api/system/expire.ts
@@ -18,8 +18,15 @@
     data,
   })
 }
+// 新建
+export function addRemind(data: object) {
+  return request({
+    url: '/system/remind/add',
+    method: 'post',
+    data,
+  })
+}
 // 删除
-
 export function delRemind(id: string) {
   return request({
     url: `/system/remind/remove?id=${id}`,

diff --git a/src/api/eqpt/device/info.ts b/src/api/eqpt/device/info.ts
index f2a9176..e40366c 100644
--- a/src/api/eqpt/device/info.ts
+++ b/src/api/eqpt/device/info.ts
@@ -153,3 +153,11 @@
     method: 'get',
   })
 }
+// 绑定参试任务
+export function bindTaskHandler(data: object) {
+  return request({
+    url: '/equipment/bindTask',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/expire.ts b/src/api/system/expire.ts
index 0720b82..834048e 100644
--- a/src/api/system/expire.ts
+++ b/src/api/system/expire.ts
@@ -18,8 +18,15 @@
     data,
   })
 }
+// 新建
+export function addRemind(data: object) {
+  return request({
+    url: '/system/remind/add',
+    method: 'post',
+    data,
+  })
+}
 // 删除
-
 export function delRemind(id: string) {
   return request({
     url: `/system/remind/remove?id=${id}`,
diff --git a/src/views/system/expire/device.vue b/src/views/system/expire/device.vue
index 470ca33..890d2ab 100644
--- a/src/views/system/expire/device.vue
+++ b/src/views/system/expire/device.vue
@@ -161,6 +161,7 @@
     emits('add', selectList.value)
     dialogFormVisible.value = false
     reset()
+    selectList.value = []
   }
   else {
     ElMessage.warning('请先选择设备')

diff --git a/src/api/eqpt/device/info.ts b/src/api/eqpt/device/info.ts
index f2a9176..e40366c 100644
--- a/src/api/eqpt/device/info.ts
+++ b/src/api/eqpt/device/info.ts
@@ -153,3 +153,11 @@
     method: 'get',
   })
 }
+// 绑定参试任务
+export function bindTaskHandler(data: object) {
+  return request({
+    url: '/equipment/bindTask',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/expire.ts b/src/api/system/expire.ts
index 0720b82..834048e 100644
--- a/src/api/system/expire.ts
+++ b/src/api/system/expire.ts
@@ -18,8 +18,15 @@
     data,
   })
 }
+// 新建
+export function addRemind(data: object) {
+  return request({
+    url: '/system/remind/add',
+    method: 'post',
+    data,
+  })
+}
 // 删除
-
 export function delRemind(id: string) {
   return request({
     url: `/system/remind/remove?id=${id}`,
diff --git a/src/views/system/expire/device.vue b/src/views/system/expire/device.vue
index 470ca33..890d2ab 100644
--- a/src/views/system/expire/device.vue
+++ b/src/views/system/expire/device.vue
@@ -161,6 +161,7 @@
     emits('add', selectList.value)
     dialogFormVisible.value = false
     reset()
+    selectList.value = []
   }
   else {
     ElMessage.warning('请先选择设备')
diff --git a/src/views/system/expire/edit.vue b/src/views/system/expire/edit.vue
index bfd1272..a7a0ccf 100644
--- a/src/views/system/expire/edit.vue
+++ b/src/views/system/expire/edit.vue
@@ -3,16 +3,20 @@
 import { nextTick, reactive } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
 import device from './device.vue'
 import task from './task.vue'
-import { getList, updateRemind } from '@/api/system/expire'
+import useUserStore from '@/store/modules/user'
+import { getUserDept } from '@/api/system/user'
+import { addRemind, getList, updateRemind } from '@/api/system/expire'
 // ----------------------- 以下是字段定义 emits props ---------------------
 const emits = defineEmits(['closeRefresh'])
 
 const dialogVisible = ref(false)
 const dialogStatus = ref('新建')
+const userStore = useUserStore()
 const data = ref({
-  createDeptId: 0,
+  createDeptId: '',
   createDeptName: '',
   createTime: '',
   createUserId: '',
@@ -30,6 +34,19 @@
   taskExt: [] as string[],
 
 })
+const resetForm = () => {
+  for (const i in data.value) {
+    data.value[i] = ''
+  }
+  data.value.remindTime = 30
+  data.value.remindType = '1'
+  data.value.taskIds = [] as string[]
+  data.value.taskNames = [] as string[]
+  data.value.equipmentNames = [] as string[]
+  data.value.modelIds = [] as string[]
+  data.value.equipmentExt = [] as string[]
+  data.value.taskExt = [] as string[]
+}
 // ---------------表单提交--------------------------------
 // 表单对象
 const dataFormRef = ref<FormInstance>()
@@ -42,15 +59,23 @@
 }) // 表单验证规则
 // 表单提交
 function submitForm() {
-  console.log(data.value, 'data.value')
   if (dataFormRef) {
     dataFormRef.value?.validate((valid: boolean) => {
       if (valid) {
-        updateRemind(data.value).then((res) => {
-          ElMessage.success('修改成功')
-          dialogVisible.value = false
-          emits('closeRefresh')
-        })
+        if (dialogStatus.value === '新建') {
+          addRemind(data.value).then((res) => {
+            ElMessage.success('修改成功')
+            dialogVisible.value = false
+            emits('closeRefresh')
+          })
+        }
+        else {
+          updateRemind(data.value).then((res) => {
+            ElMessage.success('修改成功')
+            dialogVisible.value = false
+            emits('closeRefresh')
+          })
+        }
       }
     })
   }
@@ -59,15 +84,28 @@
 // ----------初始化、关闭对话框相关-----------------
 function initDialog(row: any, status: string) {
   dialogVisible.value = true
+  resetForm()
   if (status === 'create') {
     dialogStatus.value = '新建'
     nextTick(() => {
       dataFormRef.value?.resetFields()
     })
+
+    data.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+    data.value.createUserId = userStore.id
+    data.value.createUserName = userStore.name
+    // 获取当前用户所在单位
+    getUserDept().then((res) => {
+      // fullName
+      data.value.createDeptId = res.data.id
+      data.value.createDeptName = res.data.fullName
+    })
   }
   else {
-    data.value = row
+    data.value = JSON.parse(JSON.stringify(row))
     dialogStatus.value = '编辑'
+    data.value.equipmentExt = JSON.parse(row.equipmentExt)
+    data.value.taskExt = JSON.parse(row.taskExt)
   }
 }
 
@@ -90,7 +128,6 @@
 }
 // 确认设备
 const confirmDevice = (list: any[]) => {
-  console.log(list, '选中的设备')
   list.forEach((item: any) => {
     if (!data.value.modelIds.includes(item.id)) {
       data.value.equipmentExt.push(`${item.equipmentName}/${item.model}/${item.helpInstruction}`)
@@ -119,17 +156,16 @@
 }
 // 确认设备
 const confirmTask = (list: any[]) => {
-  console.log(list, '选中的任务')
   list.forEach((item: any) => {
     if (!data.value.taskIds.includes(item.id)) {
-      data.value.taskExt.push(item)
+      data.value.taskExt.push(`${item.taskName}/${item.createTime}`)
       data.value.taskIds.push(item.id)
     }
   })
 }
 const removeTaskStr = ref()
-const removeTask = (device: string) => {
-  removeDeviceStr.value = device
+const removeTask = (task: string) => {
+  removeTaskStr.value = task
 }
 watch(() => data.value.taskExt, (newVal, oldVal) => {
   if (newVal && oldVal) {
@@ -168,7 +204,7 @@
         </el-col>
         <el-col :span="24" class="grid-cell">
           <el-form-item label="到期提醒类型" prop="remindType" class="required">
-            <el-radio-group v-model="data.remindType" class="ml-4">
+            <el-radio-group v-model="data.remindType" class="ml-4" :disabled="dialogStatus === '编辑'">
               <el-radio label="1" size="large">
                 设备到期提醒
               </el-radio>
@@ -184,9 +220,7 @@
               v-if="data.remindType === '1'"
               v-model="data.equipmentExt"
               multiple
-              collapse-tags
-              collapse-tags-tooltip
-              :max-collapse-tags="3"
+              :max-collapse-tags="10"
               placeholder="设备提醒名称"
               style="width: 100%;"
               @focus="selectDevice"
@@ -196,9 +230,7 @@
               v-if="data.remindType === '2'"
               v-model="data.taskExt"
               multiple
-              collapse-tags
-              collapse-tags-tooltip
-              :max-collapse-tags="3"
+              :max-collapse-tags="10"
               placeholder="任务提醒名称"
               style="width: 100%;"
               @focus="selectTask"
@@ -235,11 +267,13 @@
 
 <style lang="scss" scoped>
 ::v-deep(.el-popper) {
-  display: none;
+  display: none !important;
+  z-index: 10 !important;
 }
 
 ::v-deep(.el-select-dropdown) {
-  display: none;
+  display: none !important;
+  z-index: 10 !important;
 }
 
 .form-container {

diff --git a/src/api/eqpt/device/info.ts b/src/api/eqpt/device/info.ts
index f2a9176..e40366c 100644
--- a/src/api/eqpt/device/info.ts
+++ b/src/api/eqpt/device/info.ts
@@ -153,3 +153,11 @@
     method: 'get',
   })
 }
+// 绑定参试任务
+export function bindTaskHandler(data: object) {
+  return request({
+    url: '/equipment/bindTask',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/expire.ts b/src/api/system/expire.ts
index 0720b82..834048e 100644
--- a/src/api/system/expire.ts
+++ b/src/api/system/expire.ts
@@ -18,8 +18,15 @@
     data,
   })
 }
+// 新建
+export function addRemind(data: object) {
+  return request({
+    url: '/system/remind/add',
+    method: 'post',
+    data,
+  })
+}
 // 删除
-
 export function delRemind(id: string) {
   return request({
     url: `/system/remind/remove?id=${id}`,
diff --git a/src/views/system/expire/device.vue b/src/views/system/expire/device.vue
index 470ca33..890d2ab 100644
--- a/src/views/system/expire/device.vue
+++ b/src/views/system/expire/device.vue
@@ -161,6 +161,7 @@
     emits('add', selectList.value)
     dialogFormVisible.value = false
     reset()
+    selectList.value = []
   }
   else {
     ElMessage.warning('请先选择设备')
diff --git a/src/views/system/expire/edit.vue b/src/views/system/expire/edit.vue
index bfd1272..a7a0ccf 100644
--- a/src/views/system/expire/edit.vue
+++ b/src/views/system/expire/edit.vue
@@ -3,16 +3,20 @@
 import { nextTick, reactive } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
 import device from './device.vue'
 import task from './task.vue'
-import { getList, updateRemind } from '@/api/system/expire'
+import useUserStore from '@/store/modules/user'
+import { getUserDept } from '@/api/system/user'
+import { addRemind, getList, updateRemind } from '@/api/system/expire'
 // ----------------------- 以下是字段定义 emits props ---------------------
 const emits = defineEmits(['closeRefresh'])
 
 const dialogVisible = ref(false)
 const dialogStatus = ref('新建')
+const userStore = useUserStore()
 const data = ref({
-  createDeptId: 0,
+  createDeptId: '',
   createDeptName: '',
   createTime: '',
   createUserId: '',
@@ -30,6 +34,19 @@
   taskExt: [] as string[],
 
 })
+const resetForm = () => {
+  for (const i in data.value) {
+    data.value[i] = ''
+  }
+  data.value.remindTime = 30
+  data.value.remindType = '1'
+  data.value.taskIds = [] as string[]
+  data.value.taskNames = [] as string[]
+  data.value.equipmentNames = [] as string[]
+  data.value.modelIds = [] as string[]
+  data.value.equipmentExt = [] as string[]
+  data.value.taskExt = [] as string[]
+}
 // ---------------表单提交--------------------------------
 // 表单对象
 const dataFormRef = ref<FormInstance>()
@@ -42,15 +59,23 @@
 }) // 表单验证规则
 // 表单提交
 function submitForm() {
-  console.log(data.value, 'data.value')
   if (dataFormRef) {
     dataFormRef.value?.validate((valid: boolean) => {
       if (valid) {
-        updateRemind(data.value).then((res) => {
-          ElMessage.success('修改成功')
-          dialogVisible.value = false
-          emits('closeRefresh')
-        })
+        if (dialogStatus.value === '新建') {
+          addRemind(data.value).then((res) => {
+            ElMessage.success('修改成功')
+            dialogVisible.value = false
+            emits('closeRefresh')
+          })
+        }
+        else {
+          updateRemind(data.value).then((res) => {
+            ElMessage.success('修改成功')
+            dialogVisible.value = false
+            emits('closeRefresh')
+          })
+        }
       }
     })
   }
@@ -59,15 +84,28 @@
 // ----------初始化、关闭对话框相关-----------------
 function initDialog(row: any, status: string) {
   dialogVisible.value = true
+  resetForm()
   if (status === 'create') {
     dialogStatus.value = '新建'
     nextTick(() => {
       dataFormRef.value?.resetFields()
     })
+
+    data.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+    data.value.createUserId = userStore.id
+    data.value.createUserName = userStore.name
+    // 获取当前用户所在单位
+    getUserDept().then((res) => {
+      // fullName
+      data.value.createDeptId = res.data.id
+      data.value.createDeptName = res.data.fullName
+    })
   }
   else {
-    data.value = row
+    data.value = JSON.parse(JSON.stringify(row))
     dialogStatus.value = '编辑'
+    data.value.equipmentExt = JSON.parse(row.equipmentExt)
+    data.value.taskExt = JSON.parse(row.taskExt)
   }
 }
 
@@ -90,7 +128,6 @@
 }
 // 确认设备
 const confirmDevice = (list: any[]) => {
-  console.log(list, '选中的设备')
   list.forEach((item: any) => {
     if (!data.value.modelIds.includes(item.id)) {
       data.value.equipmentExt.push(`${item.equipmentName}/${item.model}/${item.helpInstruction}`)
@@ -119,17 +156,16 @@
 }
 // 确认设备
 const confirmTask = (list: any[]) => {
-  console.log(list, '选中的任务')
   list.forEach((item: any) => {
     if (!data.value.taskIds.includes(item.id)) {
-      data.value.taskExt.push(item)
+      data.value.taskExt.push(`${item.taskName}/${item.createTime}`)
       data.value.taskIds.push(item.id)
     }
   })
 }
 const removeTaskStr = ref()
-const removeTask = (device: string) => {
-  removeDeviceStr.value = device
+const removeTask = (task: string) => {
+  removeTaskStr.value = task
 }
 watch(() => data.value.taskExt, (newVal, oldVal) => {
   if (newVal && oldVal) {
@@ -168,7 +204,7 @@
         </el-col>
         <el-col :span="24" class="grid-cell">
           <el-form-item label="到期提醒类型" prop="remindType" class="required">
-            <el-radio-group v-model="data.remindType" class="ml-4">
+            <el-radio-group v-model="data.remindType" class="ml-4" :disabled="dialogStatus === '编辑'">
               <el-radio label="1" size="large">
                 设备到期提醒
               </el-radio>
@@ -184,9 +220,7 @@
               v-if="data.remindType === '1'"
               v-model="data.equipmentExt"
               multiple
-              collapse-tags
-              collapse-tags-tooltip
-              :max-collapse-tags="3"
+              :max-collapse-tags="10"
               placeholder="设备提醒名称"
               style="width: 100%;"
               @focus="selectDevice"
@@ -196,9 +230,7 @@
               v-if="data.remindType === '2'"
               v-model="data.taskExt"
               multiple
-              collapse-tags
-              collapse-tags-tooltip
-              :max-collapse-tags="3"
+              :max-collapse-tags="10"
               placeholder="任务提醒名称"
               style="width: 100%;"
               @focus="selectTask"
@@ -235,11 +267,13 @@
 
 <style lang="scss" scoped>
 ::v-deep(.el-popper) {
-  display: none;
+  display: none !important;
+  z-index: 10 !important;
 }
 
 ::v-deep(.el-select-dropdown) {
-  display: none;
+  display: none !important;
+  z-index: 10 !important;
 }
 
 .form-container {
diff --git a/src/views/system/expire/task.vue b/src/views/system/expire/task.vue
index e909dc1..49adda9 100644
--- a/src/views/system/expire/task.vue
+++ b/src/views/system/expire/task.vue
@@ -2,54 +2,32 @@
 <script lang="ts" setup name="DeviceModelList">
 import { reactive, ref, watch } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { deleteModel, exportModelList, getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
-import { exportFile } from '@/utils/exportUtils'
+import { getTaskList } from '@/api/eqpt/device/task'
 import { getDictByCode } from '@/api/system/dict'
 const emits = defineEmits(['add'])
 const { proxy } = getCurrentInstance() as any
 const dialogFormVisible = ref(false)
 const listQuery = reactive({
-  category: '',
-  equipmentName: '',
-  helpInstruction: '',
-  model: '',
+  endTime: '',
+  startTime: '',
+  taskName: '',
   offset: 1,
   limit: 20,
 })
 const columns = ref([
   {
-    text: '型号规格编号',
-    value: 'modelNo',
+    text: '任务名称',
+    value: 'taskName',
     align: 'center',
   },
   {
-    text: '设备名称',
-    value: 'equipmentName',
+    text: '开始时间',
+    value: 'startTime',
     align: 'center',
   },
   {
-    text: '型号规格',
-    value: 'model',
-    align: 'center',
-  },
-  {
-    text: '辅助字段',
-    value: 'helpInstruction',
-    align: 'center',
-  },
-  {
-    text: '设备分类',
-    value: 'categoryName',
-    align: 'center',
-  },
-  {
-    text: '检定周期',
-    value: 'checkCycle',
-    align: 'center',
-  },
-  {
-    text: '使用说明书',
-    value: 'instructionsFile',
+    text: '结束时间',
+    value: 'endTime',
     align: 'center',
   },
   {
@@ -69,7 +47,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
-  getModelList(listQuery).then((response) => {
+  getTaskList(listQuery).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     listLoading.value = false
@@ -80,12 +58,24 @@
 const search = () => {
   fetchData(false)
 }
+// 开始结束时间
+const datetimerange = ref()
+watch(() => datetimerange.value, (newVal) => {
+  if (newVal.length) {
+    listQuery.startTime = `${newVal[0]} 00:00:00`
+    listQuery.endTime = `${newVal[1]} 23:59:59`
+  }
+  else {
+    listQuery.startTime = ''
+    listQuery.endTime = ''
+  }
+})
 // 重置
 const reset = () => {
-  listQuery.category = ''
-  listQuery.equipmentName = ''
-  listQuery.helpInstruction = ''
-  listQuery.model = ''
+  datetimerange.value = []
+  listQuery.taskName = ''
+  listQuery.startTime = ''
+  listQuery.endTime = ''
   listQuery.offset = 1
   listQuery.limit = 20
   search()
@@ -107,53 +97,7 @@
 const multiSelect = (row: any[]) => {
   selectList.value = row
 }
-// 获取下拉列表相关
-// 设备名称
-const deviceNameList = ref<{ id: string; value: string; name: string }[]>([])
-// 设备分类
-const deviceTypeList = ref<{ id: string; value: string; name: string }[]>([])
-// 规格型号
-const modelList = ref<any[]>([])
-// 辅助字段
-const helpList = ref<any[]>([])
-const allList = ref<any[]>([])
-const fetchSelect = () => {
-  // 设备分类
-  getDictByCode('eqptDeviceType').then((res) => {
-    deviceTypeList.value = res.data
-  })
-  // 设备名称
-  getDeviceNameList().then((res) => {
-    deviceNameList.value = res.data
-  })
-  // 规格型号及辅助字段
-  getModelAllList({}).then((res) => {
-    allList.value = res.data
-    modelList.value = res.data
-    helpList.value = res.data.filter(item => item.helpInstruction)
-  })
-}
-fetchSelect()
-// 监听设备名称下拉框，修改规格型号和辅助字段
-watch(() => listQuery.equipmentName, (newVal) => {
-  if (newVal) {
-    listQuery.helpInstruction = ''
-    listQuery.model = ''
-    // 修改规格型号和辅助字段列表
-    const data = allList.value.filter(item => item.equipmentName === newVal)
-    modelList.value = data
-    helpList.value = data.filter(item => item.helpInstruction)
-  }
-})
-// 监听规格型号下拉框，修改辅助字段
-watch(() => listQuery.model, (newVal) => {
-  if (newVal) {
-    listQuery.helpInstruction = ''
-    // 修改规格型号和辅助字段列表
-    console.log(helpList.value, 'helpList.value')
-    helpList.value = helpList.value.filter(item => item.model === newVal)
-  }
-})
+
 // 点击保存
 const submitForm = () => {
   // 多选
@@ -161,6 +105,7 @@
     emits('add', selectList.value)
     dialogFormVisible.value = false
     reset()
+    selectList.value = []
   }
   else {
     ElMessage.warning('请先选择设备')
@@ -182,28 +127,18 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="65%" style="z-index: 999999;">
+  <el-dialog v-model="dialogFormVisible" title="" width="65%">
     <!-- 筛选条件 -->
+    <add-dialog ref="addRef" @reset-data="search" />
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-select v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable>
-          <el-option v-for="item in deviceNameList" :key="item" :label="item" :value="item" />
-        </el-select>
+        <el-input v-model.trim="listQuery.taskName" placeholder="参试任务名称" clearable />
       </search-item>
       <search-item>
-        <el-select v-model.trim="listQuery.model" placeholder="规格型号" clearable>
-          <el-option v-for="item in modelList" :key="item.id" :label="item.model" :value="item.model" />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-select v-model.trim="listQuery.helpInstruction" placeholder="辅助字段" clearable>
-          <el-option v-for="item in helpList" :key="item.id" :label="item.helpInstruction" :value="item.helpInstruction" />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-select v-model.trim="listQuery.category" placeholder="设备分类" clearable>
-          <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
-        </el-select>
+        <el-date-picker
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="参试开始时间" end-placeholder="参试结束时间"
+        />
       </search-item>
     </search-area>
     <table-container>

diff --git a/src/api/eqpt/device/info.ts b/src/api/eqpt/device/info.ts
index f2a9176..e40366c 100644
--- a/src/api/eqpt/device/info.ts
+++ b/src/api/eqpt/device/info.ts
@@ -153,3 +153,11 @@
     method: 'get',
   })
 }
+// 绑定参试任务
+export function bindTaskHandler(data: object) {
+  return request({
+    url: '/equipment/bindTask',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/expire.ts b/src/api/system/expire.ts
index 0720b82..834048e 100644
--- a/src/api/system/expire.ts
+++ b/src/api/system/expire.ts
@@ -18,8 +18,15 @@
     data,
   })
 }
+// 新建
+export function addRemind(data: object) {
+  return request({
+    url: '/system/remind/add',
+    method: 'post',
+    data,
+  })
+}
 // 删除
-
 export function delRemind(id: string) {
   return request({
     url: `/system/remind/remove?id=${id}`,
diff --git a/src/views/system/expire/device.vue b/src/views/system/expire/device.vue
index 470ca33..890d2ab 100644
--- a/src/views/system/expire/device.vue
+++ b/src/views/system/expire/device.vue
@@ -161,6 +161,7 @@
     emits('add', selectList.value)
     dialogFormVisible.value = false
     reset()
+    selectList.value = []
   }
   else {
     ElMessage.warning('请先选择设备')
diff --git a/src/views/system/expire/edit.vue b/src/views/system/expire/edit.vue
index bfd1272..a7a0ccf 100644
--- a/src/views/system/expire/edit.vue
+++ b/src/views/system/expire/edit.vue
@@ -3,16 +3,20 @@
 import { nextTick, reactive } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
 import device from './device.vue'
 import task from './task.vue'
-import { getList, updateRemind } from '@/api/system/expire'
+import useUserStore from '@/store/modules/user'
+import { getUserDept } from '@/api/system/user'
+import { addRemind, getList, updateRemind } from '@/api/system/expire'
 // ----------------------- 以下是字段定义 emits props ---------------------
 const emits = defineEmits(['closeRefresh'])
 
 const dialogVisible = ref(false)
 const dialogStatus = ref('新建')
+const userStore = useUserStore()
 const data = ref({
-  createDeptId: 0,
+  createDeptId: '',
   createDeptName: '',
   createTime: '',
   createUserId: '',
@@ -30,6 +34,19 @@
   taskExt: [] as string[],
 
 })
+const resetForm = () => {
+  for (const i in data.value) {
+    data.value[i] = ''
+  }
+  data.value.remindTime = 30
+  data.value.remindType = '1'
+  data.value.taskIds = [] as string[]
+  data.value.taskNames = [] as string[]
+  data.value.equipmentNames = [] as string[]
+  data.value.modelIds = [] as string[]
+  data.value.equipmentExt = [] as string[]
+  data.value.taskExt = [] as string[]
+}
 // ---------------表单提交--------------------------------
 // 表单对象
 const dataFormRef = ref<FormInstance>()
@@ -42,15 +59,23 @@
 }) // 表单验证规则
 // 表单提交
 function submitForm() {
-  console.log(data.value, 'data.value')
   if (dataFormRef) {
     dataFormRef.value?.validate((valid: boolean) => {
       if (valid) {
-        updateRemind(data.value).then((res) => {
-          ElMessage.success('修改成功')
-          dialogVisible.value = false
-          emits('closeRefresh')
-        })
+        if (dialogStatus.value === '新建') {
+          addRemind(data.value).then((res) => {
+            ElMessage.success('修改成功')
+            dialogVisible.value = false
+            emits('closeRefresh')
+          })
+        }
+        else {
+          updateRemind(data.value).then((res) => {
+            ElMessage.success('修改成功')
+            dialogVisible.value = false
+            emits('closeRefresh')
+          })
+        }
       }
     })
   }
@@ -59,15 +84,28 @@
 // ----------初始化、关闭对话框相关-----------------
 function initDialog(row: any, status: string) {
   dialogVisible.value = true
+  resetForm()
   if (status === 'create') {
     dialogStatus.value = '新建'
     nextTick(() => {
       dataFormRef.value?.resetFields()
     })
+
+    data.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+    data.value.createUserId = userStore.id
+    data.value.createUserName = userStore.name
+    // 获取当前用户所在单位
+    getUserDept().then((res) => {
+      // fullName
+      data.value.createDeptId = res.data.id
+      data.value.createDeptName = res.data.fullName
+    })
   }
   else {
-    data.value = row
+    data.value = JSON.parse(JSON.stringify(row))
     dialogStatus.value = '编辑'
+    data.value.equipmentExt = JSON.parse(row.equipmentExt)
+    data.value.taskExt = JSON.parse(row.taskExt)
   }
 }
 
@@ -90,7 +128,6 @@
 }
 // 确认设备
 const confirmDevice = (list: any[]) => {
-  console.log(list, '选中的设备')
   list.forEach((item: any) => {
     if (!data.value.modelIds.includes(item.id)) {
       data.value.equipmentExt.push(`${item.equipmentName}/${item.model}/${item.helpInstruction}`)
@@ -119,17 +156,16 @@
 }
 // 确认设备
 const confirmTask = (list: any[]) => {
-  console.log(list, '选中的任务')
   list.forEach((item: any) => {
     if (!data.value.taskIds.includes(item.id)) {
-      data.value.taskExt.push(item)
+      data.value.taskExt.push(`${item.taskName}/${item.createTime}`)
       data.value.taskIds.push(item.id)
     }
   })
 }
 const removeTaskStr = ref()
-const removeTask = (device: string) => {
-  removeDeviceStr.value = device
+const removeTask = (task: string) => {
+  removeTaskStr.value = task
 }
 watch(() => data.value.taskExt, (newVal, oldVal) => {
   if (newVal && oldVal) {
@@ -168,7 +204,7 @@
         </el-col>
         <el-col :span="24" class="grid-cell">
           <el-form-item label="到期提醒类型" prop="remindType" class="required">
-            <el-radio-group v-model="data.remindType" class="ml-4">
+            <el-radio-group v-model="data.remindType" class="ml-4" :disabled="dialogStatus === '编辑'">
               <el-radio label="1" size="large">
                 设备到期提醒
               </el-radio>
@@ -184,9 +220,7 @@
               v-if="data.remindType === '1'"
               v-model="data.equipmentExt"
               multiple
-              collapse-tags
-              collapse-tags-tooltip
-              :max-collapse-tags="3"
+              :max-collapse-tags="10"
               placeholder="设备提醒名称"
               style="width: 100%;"
               @focus="selectDevice"
@@ -196,9 +230,7 @@
               v-if="data.remindType === '2'"
               v-model="data.taskExt"
               multiple
-              collapse-tags
-              collapse-tags-tooltip
-              :max-collapse-tags="3"
+              :max-collapse-tags="10"
               placeholder="任务提醒名称"
               style="width: 100%;"
               @focus="selectTask"
@@ -235,11 +267,13 @@
 
 <style lang="scss" scoped>
 ::v-deep(.el-popper) {
-  display: none;
+  display: none !important;
+  z-index: 10 !important;
 }
 
 ::v-deep(.el-select-dropdown) {
-  display: none;
+  display: none !important;
+  z-index: 10 !important;
 }
 
 .form-container {
diff --git a/src/views/system/expire/task.vue b/src/views/system/expire/task.vue
index e909dc1..49adda9 100644
--- a/src/views/system/expire/task.vue
+++ b/src/views/system/expire/task.vue
@@ -2,54 +2,32 @@
 <script lang="ts" setup name="DeviceModelList">
 import { reactive, ref, watch } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { deleteModel, exportModelList, getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
-import { exportFile } from '@/utils/exportUtils'
+import { getTaskList } from '@/api/eqpt/device/task'
 import { getDictByCode } from '@/api/system/dict'
 const emits = defineEmits(['add'])
 const { proxy } = getCurrentInstance() as any
 const dialogFormVisible = ref(false)
 const listQuery = reactive({
-  category: '',
-  equipmentName: '',
-  helpInstruction: '',
-  model: '',
+  endTime: '',
+  startTime: '',
+  taskName: '',
   offset: 1,
   limit: 20,
 })
 const columns = ref([
   {
-    text: '型号规格编号',
-    value: 'modelNo',
+    text: '任务名称',
+    value: 'taskName',
     align: 'center',
   },
   {
-    text: '设备名称',
-    value: 'equipmentName',
+    text: '开始时间',
+    value: 'startTime',
     align: 'center',
   },
   {
-    text: '型号规格',
-    value: 'model',
-    align: 'center',
-  },
-  {
-    text: '辅助字段',
-    value: 'helpInstruction',
-    align: 'center',
-  },
-  {
-    text: '设备分类',
-    value: 'categoryName',
-    align: 'center',
-  },
-  {
-    text: '检定周期',
-    value: 'checkCycle',
-    align: 'center',
-  },
-  {
-    text: '使用说明书',
-    value: 'instructionsFile',
+    text: '结束时间',
+    value: 'endTime',
     align: 'center',
   },
   {
@@ -69,7 +47,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
-  getModelList(listQuery).then((response) => {
+  getTaskList(listQuery).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     listLoading.value = false
@@ -80,12 +58,24 @@
 const search = () => {
   fetchData(false)
 }
+// 开始结束时间
+const datetimerange = ref()
+watch(() => datetimerange.value, (newVal) => {
+  if (newVal.length) {
+    listQuery.startTime = `${newVal[0]} 00:00:00`
+    listQuery.endTime = `${newVal[1]} 23:59:59`
+  }
+  else {
+    listQuery.startTime = ''
+    listQuery.endTime = ''
+  }
+})
 // 重置
 const reset = () => {
-  listQuery.category = ''
-  listQuery.equipmentName = ''
-  listQuery.helpInstruction = ''
-  listQuery.model = ''
+  datetimerange.value = []
+  listQuery.taskName = ''
+  listQuery.startTime = ''
+  listQuery.endTime = ''
   listQuery.offset = 1
   listQuery.limit = 20
   search()
@@ -107,53 +97,7 @@
 const multiSelect = (row: any[]) => {
   selectList.value = row
 }
-// 获取下拉列表相关
-// 设备名称
-const deviceNameList = ref<{ id: string; value: string; name: string }[]>([])
-// 设备分类
-const deviceTypeList = ref<{ id: string; value: string; name: string }[]>([])
-// 规格型号
-const modelList = ref<any[]>([])
-// 辅助字段
-const helpList = ref<any[]>([])
-const allList = ref<any[]>([])
-const fetchSelect = () => {
-  // 设备分类
-  getDictByCode('eqptDeviceType').then((res) => {
-    deviceTypeList.value = res.data
-  })
-  // 设备名称
-  getDeviceNameList().then((res) => {
-    deviceNameList.value = res.data
-  })
-  // 规格型号及辅助字段
-  getModelAllList({}).then((res) => {
-    allList.value = res.data
-    modelList.value = res.data
-    helpList.value = res.data.filter(item => item.helpInstruction)
-  })
-}
-fetchSelect()
-// 监听设备名称下拉框，修改规格型号和辅助字段
-watch(() => listQuery.equipmentName, (newVal) => {
-  if (newVal) {
-    listQuery.helpInstruction = ''
-    listQuery.model = ''
-    // 修改规格型号和辅助字段列表
-    const data = allList.value.filter(item => item.equipmentName === newVal)
-    modelList.value = data
-    helpList.value = data.filter(item => item.helpInstruction)
-  }
-})
-// 监听规格型号下拉框，修改辅助字段
-watch(() => listQuery.model, (newVal) => {
-  if (newVal) {
-    listQuery.helpInstruction = ''
-    // 修改规格型号和辅助字段列表
-    console.log(helpList.value, 'helpList.value')
-    helpList.value = helpList.value.filter(item => item.model === newVal)
-  }
-})
+
 // 点击保存
 const submitForm = () => {
   // 多选
@@ -161,6 +105,7 @@
     emits('add', selectList.value)
     dialogFormVisible.value = false
     reset()
+    selectList.value = []
   }
   else {
     ElMessage.warning('请先选择设备')
@@ -182,28 +127,18 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="65%" style="z-index: 999999;">
+  <el-dialog v-model="dialogFormVisible" title="" width="65%">
     <!-- 筛选条件 -->
+    <add-dialog ref="addRef" @reset-data="search" />
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-select v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable>
-          <el-option v-for="item in deviceNameList" :key="item" :label="item" :value="item" />
-        </el-select>
+        <el-input v-model.trim="listQuery.taskName" placeholder="参试任务名称" clearable />
       </search-item>
       <search-item>
-        <el-select v-model.trim="listQuery.model" placeholder="规格型号" clearable>
-          <el-option v-for="item in modelList" :key="item.id" :label="item.model" :value="item.model" />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-select v-model.trim="listQuery.helpInstruction" placeholder="辅助字段" clearable>
-          <el-option v-for="item in helpList" :key="item.id" :label="item.helpInstruction" :value="item.helpInstruction" />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-select v-model.trim="listQuery.category" placeholder="设备分类" clearable>
-          <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
-        </el-select>
+        <el-date-picker
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="参试开始时间" end-placeholder="参试结束时间"
+        />
       </search-item>
     </search-area>
     <table-container>
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index 61957f8..2c0fc99 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -5,7 +5,7 @@
 import type { IlistObjType, IlistQueryType } from './interface'
 import { delTextBtn, editTextBtn } from '@/utils/applyBtns'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-import { cancelInfo, deleteInfo, editInfo, exportDevice, getInfoList, getInfoListPage, getInfoListTogether, importDevice, submitInfo } from '@/api/eqpt/device/info'
+import { bindTaskHandler, cancelInfo, deleteInfo, editInfo, exportDevice, getInfoList, getInfoListPage, getInfoListTogether, importDevice, submitInfo } from '@/api/eqpt/device/info'
 import { getDictByCode } from '@/api/system/dict'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import useTemplateDownload from '@/utils/useTemplateDownload'
@@ -138,6 +138,8 @@
     console.log('倒叙')
   }
 }
+// 切换表格标识   true:普通表格  false:聚合表格
+const tableFlage = ref(true)
 // 聚合表格实例
 const togetherTableRef = ref()
 // 展开表格实例
@@ -399,8 +401,32 @@
   taskRef.value.initDialog()
 }
 // 确认绑定
-const bind = (ids: string[]) => {
+const bindIds = (ids: string[]) => {
   console.log(ids, '参数任务ids')
+  // bindTaskHandler()
+  // 判断是 普通表格还是 聚合表格
+  if (tableFlage.value) {
+    // 普通表格
+    const data = {
+      equipmentIds: selectList.value.map(item => item.id),
+      taskIds: ids,
+    }
+    bindTaskHandler(data).then((res) => {
+      ElMessage.success('绑定成功')
+      fetchData()
+    })
+  }
+  else {
+    const data = {
+      equipmentNames: togetherTableRef.value.getSelectionRows().map((item: any) => item.equipmentName),
+      equipmentIds: expandTableRef.value.getSelectionRows().map((item: any) => item.id),
+      taskIds: ids,
+    }
+    bindTaskHandler(data).then((res) => {
+      ElMessage.success('绑定成功')
+      fetchTogetherData()
+    })
+  }
 }
 // 详情
 const detail = (row: IlistObjType) => {
@@ -517,8 +543,7 @@
 const approveHandler = (row: any, type: string) => {
   approvalDialogRef.value.initDialog(type, row.taskId, row.processId, row.id)
 }
-// 切换表格标识   true:普通表格  false:聚合表格
-const tableFlage = ref(true)
+
 const changeTable = () => {
   tableFlage.value = !tableFlage.value
   if (tableFlage.value) {
@@ -557,7 +582,7 @@
     <!-- 审批弹窗 -->
     <approval-dialog ref="approvalDialogRef" @on-success="search" />
     <!-- 参试任务弹窗 -->
-    <task ref="taskRef" @confirm="bind" />
+    <task ref="taskRef" @confirm="bindIds" />
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
@@ -673,7 +698,7 @@
         <!-- 展开行表格 -->
         <!-- 头部 -->
         <normal-table
-          v-show=" !tableFlage " class="nortable-header" :data=" [] " :total=" 0 " :columns=" columns " :options="
+          v-show=" !tableFlage " class="nortable-header" :data=" [] " :total=" 0 " :columns=" columns.map(item => ({ ...item, sortable: undefined })) " :options="
             {
               needIndex: false, // 是否需要序号列
               border: true, // 是否需要上方边框

diff --git a/src/api/eqpt/device/info.ts b/src/api/eqpt/device/info.ts
index f2a9176..e40366c 100644
--- a/src/api/eqpt/device/info.ts
+++ b/src/api/eqpt/device/info.ts
@@ -153,3 +153,11 @@
     method: 'get',
   })
 }
+// 绑定参试任务
+export function bindTaskHandler(data: object) {
+  return request({
+    url: '/equipment/bindTask',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/expire.ts b/src/api/system/expire.ts
index 0720b82..834048e 100644
--- a/src/api/system/expire.ts
+++ b/src/api/system/expire.ts
@@ -18,8 +18,15 @@
     data,
   })
 }
+// 新建
+export function addRemind(data: object) {
+  return request({
+    url: '/system/remind/add',
+    method: 'post',
+    data,
+  })
+}
 // 删除
-
 export function delRemind(id: string) {
   return request({
     url: `/system/remind/remove?id=${id}`,
diff --git a/src/views/system/expire/device.vue b/src/views/system/expire/device.vue
index 470ca33..890d2ab 100644
--- a/src/views/system/expire/device.vue
+++ b/src/views/system/expire/device.vue
@@ -161,6 +161,7 @@
     emits('add', selectList.value)
     dialogFormVisible.value = false
     reset()
+    selectList.value = []
   }
   else {
     ElMessage.warning('请先选择设备')
diff --git a/src/views/system/expire/edit.vue b/src/views/system/expire/edit.vue
index bfd1272..a7a0ccf 100644
--- a/src/views/system/expire/edit.vue
+++ b/src/views/system/expire/edit.vue
@@ -3,16 +3,20 @@
 import { nextTick, reactive } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
 import device from './device.vue'
 import task from './task.vue'
-import { getList, updateRemind } from '@/api/system/expire'
+import useUserStore from '@/store/modules/user'
+import { getUserDept } from '@/api/system/user'
+import { addRemind, getList, updateRemind } from '@/api/system/expire'
 // ----------------------- 以下是字段定义 emits props ---------------------
 const emits = defineEmits(['closeRefresh'])
 
 const dialogVisible = ref(false)
 const dialogStatus = ref('新建')
+const userStore = useUserStore()
 const data = ref({
-  createDeptId: 0,
+  createDeptId: '',
   createDeptName: '',
   createTime: '',
   createUserId: '',
@@ -30,6 +34,19 @@
   taskExt: [] as string[],
 
 })
+const resetForm = () => {
+  for (const i in data.value) {
+    data.value[i] = ''
+  }
+  data.value.remindTime = 30
+  data.value.remindType = '1'
+  data.value.taskIds = [] as string[]
+  data.value.taskNames = [] as string[]
+  data.value.equipmentNames = [] as string[]
+  data.value.modelIds = [] as string[]
+  data.value.equipmentExt = [] as string[]
+  data.value.taskExt = [] as string[]
+}
 // ---------------表单提交--------------------------------
 // 表单对象
 const dataFormRef = ref<FormInstance>()
@@ -42,15 +59,23 @@
 }) // 表单验证规则
 // 表单提交
 function submitForm() {
-  console.log(data.value, 'data.value')
   if (dataFormRef) {
     dataFormRef.value?.validate((valid: boolean) => {
       if (valid) {
-        updateRemind(data.value).then((res) => {
-          ElMessage.success('修改成功')
-          dialogVisible.value = false
-          emits('closeRefresh')
-        })
+        if (dialogStatus.value === '新建') {
+          addRemind(data.value).then((res) => {
+            ElMessage.success('修改成功')
+            dialogVisible.value = false
+            emits('closeRefresh')
+          })
+        }
+        else {
+          updateRemind(data.value).then((res) => {
+            ElMessage.success('修改成功')
+            dialogVisible.value = false
+            emits('closeRefresh')
+          })
+        }
       }
     })
   }
@@ -59,15 +84,28 @@
 // ----------初始化、关闭对话框相关-----------------
 function initDialog(row: any, status: string) {
   dialogVisible.value = true
+  resetForm()
   if (status === 'create') {
     dialogStatus.value = '新建'
     nextTick(() => {
       dataFormRef.value?.resetFields()
     })
+
+    data.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+    data.value.createUserId = userStore.id
+    data.value.createUserName = userStore.name
+    // 获取当前用户所在单位
+    getUserDept().then((res) => {
+      // fullName
+      data.value.createDeptId = res.data.id
+      data.value.createDeptName = res.data.fullName
+    })
   }
   else {
-    data.value = row
+    data.value = JSON.parse(JSON.stringify(row))
     dialogStatus.value = '编辑'
+    data.value.equipmentExt = JSON.parse(row.equipmentExt)
+    data.value.taskExt = JSON.parse(row.taskExt)
   }
 }
 
@@ -90,7 +128,6 @@
 }
 // 确认设备
 const confirmDevice = (list: any[]) => {
-  console.log(list, '选中的设备')
   list.forEach((item: any) => {
     if (!data.value.modelIds.includes(item.id)) {
       data.value.equipmentExt.push(`${item.equipmentName}/${item.model}/${item.helpInstruction}`)
@@ -119,17 +156,16 @@
 }
 // 确认设备
 const confirmTask = (list: any[]) => {
-  console.log(list, '选中的任务')
   list.forEach((item: any) => {
     if (!data.value.taskIds.includes(item.id)) {
-      data.value.taskExt.push(item)
+      data.value.taskExt.push(`${item.taskName}/${item.createTime}`)
       data.value.taskIds.push(item.id)
     }
   })
 }
 const removeTaskStr = ref()
-const removeTask = (device: string) => {
-  removeDeviceStr.value = device
+const removeTask = (task: string) => {
+  removeTaskStr.value = task
 }
 watch(() => data.value.taskExt, (newVal, oldVal) => {
   if (newVal && oldVal) {
@@ -168,7 +204,7 @@
         </el-col>
         <el-col :span="24" class="grid-cell">
           <el-form-item label="到期提醒类型" prop="remindType" class="required">
-            <el-radio-group v-model="data.remindType" class="ml-4">
+            <el-radio-group v-model="data.remindType" class="ml-4" :disabled="dialogStatus === '编辑'">
               <el-radio label="1" size="large">
                 设备到期提醒
               </el-radio>
@@ -184,9 +220,7 @@
               v-if="data.remindType === '1'"
               v-model="data.equipmentExt"
               multiple
-              collapse-tags
-              collapse-tags-tooltip
-              :max-collapse-tags="3"
+              :max-collapse-tags="10"
               placeholder="设备提醒名称"
               style="width: 100%;"
               @focus="selectDevice"
@@ -196,9 +230,7 @@
               v-if="data.remindType === '2'"
               v-model="data.taskExt"
               multiple
-              collapse-tags
-              collapse-tags-tooltip
-              :max-collapse-tags="3"
+              :max-collapse-tags="10"
               placeholder="任务提醒名称"
               style="width: 100%;"
               @focus="selectTask"
@@ -235,11 +267,13 @@
 
 <style lang="scss" scoped>
 ::v-deep(.el-popper) {
-  display: none;
+  display: none !important;
+  z-index: 10 !important;
 }
 
 ::v-deep(.el-select-dropdown) {
-  display: none;
+  display: none !important;
+  z-index: 10 !important;
 }
 
 .form-container {
diff --git a/src/views/system/expire/task.vue b/src/views/system/expire/task.vue
index e909dc1..49adda9 100644
--- a/src/views/system/expire/task.vue
+++ b/src/views/system/expire/task.vue
@@ -2,54 +2,32 @@
 <script lang="ts" setup name="DeviceModelList">
 import { reactive, ref, watch } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { deleteModel, exportModelList, getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
-import { exportFile } from '@/utils/exportUtils'
+import { getTaskList } from '@/api/eqpt/device/task'
 import { getDictByCode } from '@/api/system/dict'
 const emits = defineEmits(['add'])
 const { proxy } = getCurrentInstance() as any
 const dialogFormVisible = ref(false)
 const listQuery = reactive({
-  category: '',
-  equipmentName: '',
-  helpInstruction: '',
-  model: '',
+  endTime: '',
+  startTime: '',
+  taskName: '',
   offset: 1,
   limit: 20,
 })
 const columns = ref([
   {
-    text: '型号规格编号',
-    value: 'modelNo',
+    text: '任务名称',
+    value: 'taskName',
     align: 'center',
   },
   {
-    text: '设备名称',
-    value: 'equipmentName',
+    text: '开始时间',
+    value: 'startTime',
     align: 'center',
   },
   {
-    text: '型号规格',
-    value: 'model',
-    align: 'center',
-  },
-  {
-    text: '辅助字段',
-    value: 'helpInstruction',
-    align: 'center',
-  },
-  {
-    text: '设备分类',
-    value: 'categoryName',
-    align: 'center',
-  },
-  {
-    text: '检定周期',
-    value: 'checkCycle',
-    align: 'center',
-  },
-  {
-    text: '使用说明书',
-    value: 'instructionsFile',
+    text: '结束时间',
+    value: 'endTime',
     align: 'center',
   },
   {
@@ -69,7 +47,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
-  getModelList(listQuery).then((response) => {
+  getTaskList(listQuery).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     listLoading.value = false
@@ -80,12 +58,24 @@
 const search = () => {
   fetchData(false)
 }
+// 开始结束时间
+const datetimerange = ref()
+watch(() => datetimerange.value, (newVal) => {
+  if (newVal.length) {
+    listQuery.startTime = `${newVal[0]} 00:00:00`
+    listQuery.endTime = `${newVal[1]} 23:59:59`
+  }
+  else {
+    listQuery.startTime = ''
+    listQuery.endTime = ''
+  }
+})
 // 重置
 const reset = () => {
-  listQuery.category = ''
-  listQuery.equipmentName = ''
-  listQuery.helpInstruction = ''
-  listQuery.model = ''
+  datetimerange.value = []
+  listQuery.taskName = ''
+  listQuery.startTime = ''
+  listQuery.endTime = ''
   listQuery.offset = 1
   listQuery.limit = 20
   search()
@@ -107,53 +97,7 @@
 const multiSelect = (row: any[]) => {
   selectList.value = row
 }
-// 获取下拉列表相关
-// 设备名称
-const deviceNameList = ref<{ id: string; value: string; name: string }[]>([])
-// 设备分类
-const deviceTypeList = ref<{ id: string; value: string; name: string }[]>([])
-// 规格型号
-const modelList = ref<any[]>([])
-// 辅助字段
-const helpList = ref<any[]>([])
-const allList = ref<any[]>([])
-const fetchSelect = () => {
-  // 设备分类
-  getDictByCode('eqptDeviceType').then((res) => {
-    deviceTypeList.value = res.data
-  })
-  // 设备名称
-  getDeviceNameList().then((res) => {
-    deviceNameList.value = res.data
-  })
-  // 规格型号及辅助字段
-  getModelAllList({}).then((res) => {
-    allList.value = res.data
-    modelList.value = res.data
-    helpList.value = res.data.filter(item => item.helpInstruction)
-  })
-}
-fetchSelect()
-// 监听设备名称下拉框，修改规格型号和辅助字段
-watch(() => listQuery.equipmentName, (newVal) => {
-  if (newVal) {
-    listQuery.helpInstruction = ''
-    listQuery.model = ''
-    // 修改规格型号和辅助字段列表
-    const data = allList.value.filter(item => item.equipmentName === newVal)
-    modelList.value = data
-    helpList.value = data.filter(item => item.helpInstruction)
-  }
-})
-// 监听规格型号下拉框，修改辅助字段
-watch(() => listQuery.model, (newVal) => {
-  if (newVal) {
-    listQuery.helpInstruction = ''
-    // 修改规格型号和辅助字段列表
-    console.log(helpList.value, 'helpList.value')
-    helpList.value = helpList.value.filter(item => item.model === newVal)
-  }
-})
+
 // 点击保存
 const submitForm = () => {
   // 多选
@@ -161,6 +105,7 @@
     emits('add', selectList.value)
     dialogFormVisible.value = false
     reset()
+    selectList.value = []
   }
   else {
     ElMessage.warning('请先选择设备')
@@ -182,28 +127,18 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="65%" style="z-index: 999999;">
+  <el-dialog v-model="dialogFormVisible" title="" width="65%">
     <!-- 筛选条件 -->
+    <add-dialog ref="addRef" @reset-data="search" />
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-select v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable>
-          <el-option v-for="item in deviceNameList" :key="item" :label="item" :value="item" />
-        </el-select>
+        <el-input v-model.trim="listQuery.taskName" placeholder="参试任务名称" clearable />
       </search-item>
       <search-item>
-        <el-select v-model.trim="listQuery.model" placeholder="规格型号" clearable>
-          <el-option v-for="item in modelList" :key="item.id" :label="item.model" :value="item.model" />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-select v-model.trim="listQuery.helpInstruction" placeholder="辅助字段" clearable>
-          <el-option v-for="item in helpList" :key="item.id" :label="item.helpInstruction" :value="item.helpInstruction" />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-select v-model.trim="listQuery.category" placeholder="设备分类" clearable>
-          <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
-        </el-select>
+        <el-date-picker
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="参试开始时间" end-placeholder="参试结束时间"
+        />
       </search-item>
     </search-area>
     <table-container>
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index 61957f8..2c0fc99 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -5,7 +5,7 @@
 import type { IlistObjType, IlistQueryType } from './interface'
 import { delTextBtn, editTextBtn } from '@/utils/applyBtns'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-import { cancelInfo, deleteInfo, editInfo, exportDevice, getInfoList, getInfoListPage, getInfoListTogether, importDevice, submitInfo } from '@/api/eqpt/device/info'
+import { bindTaskHandler, cancelInfo, deleteInfo, editInfo, exportDevice, getInfoList, getInfoListPage, getInfoListTogether, importDevice, submitInfo } from '@/api/eqpt/device/info'
 import { getDictByCode } from '@/api/system/dict'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import useTemplateDownload from '@/utils/useTemplateDownload'
@@ -138,6 +138,8 @@
     console.log('倒叙')
   }
 }
+// 切换表格标识   true:普通表格  false:聚合表格
+const tableFlage = ref(true)
 // 聚合表格实例
 const togetherTableRef = ref()
 // 展开表格实例
@@ -399,8 +401,32 @@
   taskRef.value.initDialog()
 }
 // 确认绑定
-const bind = (ids: string[]) => {
+const bindIds = (ids: string[]) => {
   console.log(ids, '参数任务ids')
+  // bindTaskHandler()
+  // 判断是 普通表格还是 聚合表格
+  if (tableFlage.value) {
+    // 普通表格
+    const data = {
+      equipmentIds: selectList.value.map(item => item.id),
+      taskIds: ids,
+    }
+    bindTaskHandler(data).then((res) => {
+      ElMessage.success('绑定成功')
+      fetchData()
+    })
+  }
+  else {
+    const data = {
+      equipmentNames: togetherTableRef.value.getSelectionRows().map((item: any) => item.equipmentName),
+      equipmentIds: expandTableRef.value.getSelectionRows().map((item: any) => item.id),
+      taskIds: ids,
+    }
+    bindTaskHandler(data).then((res) => {
+      ElMessage.success('绑定成功')
+      fetchTogetherData()
+    })
+  }
 }
 // 详情
 const detail = (row: IlistObjType) => {
@@ -517,8 +543,7 @@
 const approveHandler = (row: any, type: string) => {
   approvalDialogRef.value.initDialog(type, row.taskId, row.processId, row.id)
 }
-// 切换表格标识   true:普通表格  false:聚合表格
-const tableFlage = ref(true)
+
 const changeTable = () => {
   tableFlage.value = !tableFlage.value
   if (tableFlage.value) {
@@ -557,7 +582,7 @@
     <!-- 审批弹窗 -->
     <approval-dialog ref="approvalDialogRef" @on-success="search" />
     <!-- 参试任务弹窗 -->
-    <task ref="taskRef" @confirm="bind" />
+    <task ref="taskRef" @confirm="bindIds" />
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
@@ -673,7 +698,7 @@
         <!-- 展开行表格 -->
         <!-- 头部 -->
         <normal-table
-          v-show=" !tableFlage " class="nortable-header" :data=" [] " :total=" 0 " :columns=" columns " :options="
+          v-show=" !tableFlage " class="nortable-header" :data=" [] " :total=" 0 " :columns=" columns.map(item => ({ ...item, sortable: undefined })) " :options="
             {
               needIndex: false, // 是否需要序号列
               border: true, // 是否需要上方边框
diff --git a/src/views/tested/device/model/components/edit.vue b/src/views/tested/device/model/components/edit.vue
index 9a622b8..154b6b4 100644
--- a/src/views/tested/device/model/components/edit.vue
+++ b/src/views/tested/device/model/components/edit.vue
@@ -204,7 +204,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="设备分类" prop="category">
-              <el-select v-model.trim="ruleForm.category" placeholder="设备名称" style="width: 100%;">
+              <el-select v-model.trim="ruleForm.category" placeholder="设备分类" style="width: 100%;">
                 <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>

diff --git a/src/api/eqpt/device/info.ts b/src/api/eqpt/device/info.ts
index f2a9176..e40366c 100644
--- a/src/api/eqpt/device/info.ts
+++ b/src/api/eqpt/device/info.ts
@@ -153,3 +153,11 @@
     method: 'get',
   })
 }
+// 绑定参试任务
+export function bindTaskHandler(data: object) {
+  return request({
+    url: '/equipment/bindTask',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/expire.ts b/src/api/system/expire.ts
index 0720b82..834048e 100644
--- a/src/api/system/expire.ts
+++ b/src/api/system/expire.ts
@@ -18,8 +18,15 @@
     data,
   })
 }
+// 新建
+export function addRemind(data: object) {
+  return request({
+    url: '/system/remind/add',
+    method: 'post',
+    data,
+  })
+}
 // 删除
-
 export function delRemind(id: string) {
   return request({
     url: `/system/remind/remove?id=${id}`,
diff --git a/src/views/system/expire/device.vue b/src/views/system/expire/device.vue
index 470ca33..890d2ab 100644
--- a/src/views/system/expire/device.vue
+++ b/src/views/system/expire/device.vue
@@ -161,6 +161,7 @@
     emits('add', selectList.value)
     dialogFormVisible.value = false
     reset()
+    selectList.value = []
   }
   else {
     ElMessage.warning('请先选择设备')
diff --git a/src/views/system/expire/edit.vue b/src/views/system/expire/edit.vue
index bfd1272..a7a0ccf 100644
--- a/src/views/system/expire/edit.vue
+++ b/src/views/system/expire/edit.vue
@@ -3,16 +3,20 @@
 import { nextTick, reactive } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
 import device from './device.vue'
 import task from './task.vue'
-import { getList, updateRemind } from '@/api/system/expire'
+import useUserStore from '@/store/modules/user'
+import { getUserDept } from '@/api/system/user'
+import { addRemind, getList, updateRemind } from '@/api/system/expire'
 // ----------------------- 以下是字段定义 emits props ---------------------
 const emits = defineEmits(['closeRefresh'])
 
 const dialogVisible = ref(false)
 const dialogStatus = ref('新建')
+const userStore = useUserStore()
 const data = ref({
-  createDeptId: 0,
+  createDeptId: '',
   createDeptName: '',
   createTime: '',
   createUserId: '',
@@ -30,6 +34,19 @@
   taskExt: [] as string[],
 
 })
+const resetForm = () => {
+  for (const i in data.value) {
+    data.value[i] = ''
+  }
+  data.value.remindTime = 30
+  data.value.remindType = '1'
+  data.value.taskIds = [] as string[]
+  data.value.taskNames = [] as string[]
+  data.value.equipmentNames = [] as string[]
+  data.value.modelIds = [] as string[]
+  data.value.equipmentExt = [] as string[]
+  data.value.taskExt = [] as string[]
+}
 // ---------------表单提交--------------------------------
 // 表单对象
 const dataFormRef = ref<FormInstance>()
@@ -42,15 +59,23 @@
 }) // 表单验证规则
 // 表单提交
 function submitForm() {
-  console.log(data.value, 'data.value')
   if (dataFormRef) {
     dataFormRef.value?.validate((valid: boolean) => {
       if (valid) {
-        updateRemind(data.value).then((res) => {
-          ElMessage.success('修改成功')
-          dialogVisible.value = false
-          emits('closeRefresh')
-        })
+        if (dialogStatus.value === '新建') {
+          addRemind(data.value).then((res) => {
+            ElMessage.success('修改成功')
+            dialogVisible.value = false
+            emits('closeRefresh')
+          })
+        }
+        else {
+          updateRemind(data.value).then((res) => {
+            ElMessage.success('修改成功')
+            dialogVisible.value = false
+            emits('closeRefresh')
+          })
+        }
       }
     })
   }
@@ -59,15 +84,28 @@
 // ----------初始化、关闭对话框相关-----------------
 function initDialog(row: any, status: string) {
   dialogVisible.value = true
+  resetForm()
   if (status === 'create') {
     dialogStatus.value = '新建'
     nextTick(() => {
       dataFormRef.value?.resetFields()
     })
+
+    data.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+    data.value.createUserId = userStore.id
+    data.value.createUserName = userStore.name
+    // 获取当前用户所在单位
+    getUserDept().then((res) => {
+      // fullName
+      data.value.createDeptId = res.data.id
+      data.value.createDeptName = res.data.fullName
+    })
   }
   else {
-    data.value = row
+    data.value = JSON.parse(JSON.stringify(row))
     dialogStatus.value = '编辑'
+    data.value.equipmentExt = JSON.parse(row.equipmentExt)
+    data.value.taskExt = JSON.parse(row.taskExt)
   }
 }
 
@@ -90,7 +128,6 @@
 }
 // 确认设备
 const confirmDevice = (list: any[]) => {
-  console.log(list, '选中的设备')
   list.forEach((item: any) => {
     if (!data.value.modelIds.includes(item.id)) {
       data.value.equipmentExt.push(`${item.equipmentName}/${item.model}/${item.helpInstruction}`)
@@ -119,17 +156,16 @@
 }
 // 确认设备
 const confirmTask = (list: any[]) => {
-  console.log(list, '选中的任务')
   list.forEach((item: any) => {
     if (!data.value.taskIds.includes(item.id)) {
-      data.value.taskExt.push(item)
+      data.value.taskExt.push(`${item.taskName}/${item.createTime}`)
       data.value.taskIds.push(item.id)
     }
   })
 }
 const removeTaskStr = ref()
-const removeTask = (device: string) => {
-  removeDeviceStr.value = device
+const removeTask = (task: string) => {
+  removeTaskStr.value = task
 }
 watch(() => data.value.taskExt, (newVal, oldVal) => {
   if (newVal && oldVal) {
@@ -168,7 +204,7 @@
         </el-col>
         <el-col :span="24" class="grid-cell">
           <el-form-item label="到期提醒类型" prop="remindType" class="required">
-            <el-radio-group v-model="data.remindType" class="ml-4">
+            <el-radio-group v-model="data.remindType" class="ml-4" :disabled="dialogStatus === '编辑'">
               <el-radio label="1" size="large">
                 设备到期提醒
               </el-radio>
@@ -184,9 +220,7 @@
               v-if="data.remindType === '1'"
               v-model="data.equipmentExt"
               multiple
-              collapse-tags
-              collapse-tags-tooltip
-              :max-collapse-tags="3"
+              :max-collapse-tags="10"
               placeholder="设备提醒名称"
               style="width: 100%;"
               @focus="selectDevice"
@@ -196,9 +230,7 @@
               v-if="data.remindType === '2'"
               v-model="data.taskExt"
               multiple
-              collapse-tags
-              collapse-tags-tooltip
-              :max-collapse-tags="3"
+              :max-collapse-tags="10"
               placeholder="任务提醒名称"
               style="width: 100%;"
               @focus="selectTask"
@@ -235,11 +267,13 @@
 
 <style lang="scss" scoped>
 ::v-deep(.el-popper) {
-  display: none;
+  display: none !important;
+  z-index: 10 !important;
 }
 
 ::v-deep(.el-select-dropdown) {
-  display: none;
+  display: none !important;
+  z-index: 10 !important;
 }
 
 .form-container {
diff --git a/src/views/system/expire/task.vue b/src/views/system/expire/task.vue
index e909dc1..49adda9 100644
--- a/src/views/system/expire/task.vue
+++ b/src/views/system/expire/task.vue
@@ -2,54 +2,32 @@
 <script lang="ts" setup name="DeviceModelList">
 import { reactive, ref, watch } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { deleteModel, exportModelList, getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
-import { exportFile } from '@/utils/exportUtils'
+import { getTaskList } from '@/api/eqpt/device/task'
 import { getDictByCode } from '@/api/system/dict'
 const emits = defineEmits(['add'])
 const { proxy } = getCurrentInstance() as any
 const dialogFormVisible = ref(false)
 const listQuery = reactive({
-  category: '',
-  equipmentName: '',
-  helpInstruction: '',
-  model: '',
+  endTime: '',
+  startTime: '',
+  taskName: '',
   offset: 1,
   limit: 20,
 })
 const columns = ref([
   {
-    text: '型号规格编号',
-    value: 'modelNo',
+    text: '任务名称',
+    value: 'taskName',
     align: 'center',
   },
   {
-    text: '设备名称',
-    value: 'equipmentName',
+    text: '开始时间',
+    value: 'startTime',
     align: 'center',
   },
   {
-    text: '型号规格',
-    value: 'model',
-    align: 'center',
-  },
-  {
-    text: '辅助字段',
-    value: 'helpInstruction',
-    align: 'center',
-  },
-  {
-    text: '设备分类',
-    value: 'categoryName',
-    align: 'center',
-  },
-  {
-    text: '检定周期',
-    value: 'checkCycle',
-    align: 'center',
-  },
-  {
-    text: '使用说明书',
-    value: 'instructionsFile',
+    text: '结束时间',
+    value: 'endTime',
     align: 'center',
   },
   {
@@ -69,7 +47,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
-  getModelList(listQuery).then((response) => {
+  getTaskList(listQuery).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     listLoading.value = false
@@ -80,12 +58,24 @@
 const search = () => {
   fetchData(false)
 }
+// 开始结束时间
+const datetimerange = ref()
+watch(() => datetimerange.value, (newVal) => {
+  if (newVal.length) {
+    listQuery.startTime = `${newVal[0]} 00:00:00`
+    listQuery.endTime = `${newVal[1]} 23:59:59`
+  }
+  else {
+    listQuery.startTime = ''
+    listQuery.endTime = ''
+  }
+})
 // 重置
 const reset = () => {
-  listQuery.category = ''
-  listQuery.equipmentName = ''
-  listQuery.helpInstruction = ''
-  listQuery.model = ''
+  datetimerange.value = []
+  listQuery.taskName = ''
+  listQuery.startTime = ''
+  listQuery.endTime = ''
   listQuery.offset = 1
   listQuery.limit = 20
   search()
@@ -107,53 +97,7 @@
 const multiSelect = (row: any[]) => {
   selectList.value = row
 }
-// 获取下拉列表相关
-// 设备名称
-const deviceNameList = ref<{ id: string; value: string; name: string }[]>([])
-// 设备分类
-const deviceTypeList = ref<{ id: string; value: string; name: string }[]>([])
-// 规格型号
-const modelList = ref<any[]>([])
-// 辅助字段
-const helpList = ref<any[]>([])
-const allList = ref<any[]>([])
-const fetchSelect = () => {
-  // 设备分类
-  getDictByCode('eqptDeviceType').then((res) => {
-    deviceTypeList.value = res.data
-  })
-  // 设备名称
-  getDeviceNameList().then((res) => {
-    deviceNameList.value = res.data
-  })
-  // 规格型号及辅助字段
-  getModelAllList({}).then((res) => {
-    allList.value = res.data
-    modelList.value = res.data
-    helpList.value = res.data.filter(item => item.helpInstruction)
-  })
-}
-fetchSelect()
-// 监听设备名称下拉框，修改规格型号和辅助字段
-watch(() => listQuery.equipmentName, (newVal) => {
-  if (newVal) {
-    listQuery.helpInstruction = ''
-    listQuery.model = ''
-    // 修改规格型号和辅助字段列表
-    const data = allList.value.filter(item => item.equipmentName === newVal)
-    modelList.value = data
-    helpList.value = data.filter(item => item.helpInstruction)
-  }
-})
-// 监听规格型号下拉框，修改辅助字段
-watch(() => listQuery.model, (newVal) => {
-  if (newVal) {
-    listQuery.helpInstruction = ''
-    // 修改规格型号和辅助字段列表
-    console.log(helpList.value, 'helpList.value')
-    helpList.value = helpList.value.filter(item => item.model === newVal)
-  }
-})
+
 // 点击保存
 const submitForm = () => {
   // 多选
@@ -161,6 +105,7 @@
     emits('add', selectList.value)
     dialogFormVisible.value = false
     reset()
+    selectList.value = []
   }
   else {
     ElMessage.warning('请先选择设备')
@@ -182,28 +127,18 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="65%" style="z-index: 999999;">
+  <el-dialog v-model="dialogFormVisible" title="" width="65%">
     <!-- 筛选条件 -->
+    <add-dialog ref="addRef" @reset-data="search" />
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-select v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable>
-          <el-option v-for="item in deviceNameList" :key="item" :label="item" :value="item" />
-        </el-select>
+        <el-input v-model.trim="listQuery.taskName" placeholder="参试任务名称" clearable />
       </search-item>
       <search-item>
-        <el-select v-model.trim="listQuery.model" placeholder="规格型号" clearable>
-          <el-option v-for="item in modelList" :key="item.id" :label="item.model" :value="item.model" />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-select v-model.trim="listQuery.helpInstruction" placeholder="辅助字段" clearable>
-          <el-option v-for="item in helpList" :key="item.id" :label="item.helpInstruction" :value="item.helpInstruction" />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-select v-model.trim="listQuery.category" placeholder="设备分类" clearable>
-          <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
-        </el-select>
+        <el-date-picker
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="参试开始时间" end-placeholder="参试结束时间"
+        />
       </search-item>
     </search-area>
     <table-container>
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index 61957f8..2c0fc99 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -5,7 +5,7 @@
 import type { IlistObjType, IlistQueryType } from './interface'
 import { delTextBtn, editTextBtn } from '@/utils/applyBtns'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-import { cancelInfo, deleteInfo, editInfo, exportDevice, getInfoList, getInfoListPage, getInfoListTogether, importDevice, submitInfo } from '@/api/eqpt/device/info'
+import { bindTaskHandler, cancelInfo, deleteInfo, editInfo, exportDevice, getInfoList, getInfoListPage, getInfoListTogether, importDevice, submitInfo } from '@/api/eqpt/device/info'
 import { getDictByCode } from '@/api/system/dict'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import useTemplateDownload from '@/utils/useTemplateDownload'
@@ -138,6 +138,8 @@
     console.log('倒叙')
   }
 }
+// 切换表格标识   true:普通表格  false:聚合表格
+const tableFlage = ref(true)
 // 聚合表格实例
 const togetherTableRef = ref()
 // 展开表格实例
@@ -399,8 +401,32 @@
   taskRef.value.initDialog()
 }
 // 确认绑定
-const bind = (ids: string[]) => {
+const bindIds = (ids: string[]) => {
   console.log(ids, '参数任务ids')
+  // bindTaskHandler()
+  // 判断是 普通表格还是 聚合表格
+  if (tableFlage.value) {
+    // 普通表格
+    const data = {
+      equipmentIds: selectList.value.map(item => item.id),
+      taskIds: ids,
+    }
+    bindTaskHandler(data).then((res) => {
+      ElMessage.success('绑定成功')
+      fetchData()
+    })
+  }
+  else {
+    const data = {
+      equipmentNames: togetherTableRef.value.getSelectionRows().map((item: any) => item.equipmentName),
+      equipmentIds: expandTableRef.value.getSelectionRows().map((item: any) => item.id),
+      taskIds: ids,
+    }
+    bindTaskHandler(data).then((res) => {
+      ElMessage.success('绑定成功')
+      fetchTogetherData()
+    })
+  }
 }
 // 详情
 const detail = (row: IlistObjType) => {
@@ -517,8 +543,7 @@
 const approveHandler = (row: any, type: string) => {
   approvalDialogRef.value.initDialog(type, row.taskId, row.processId, row.id)
 }
-// 切换表格标识   true:普通表格  false:聚合表格
-const tableFlage = ref(true)
+
 const changeTable = () => {
   tableFlage.value = !tableFlage.value
   if (tableFlage.value) {
@@ -557,7 +582,7 @@
     <!-- 审批弹窗 -->
     <approval-dialog ref="approvalDialogRef" @on-success="search" />
     <!-- 参试任务弹窗 -->
-    <task ref="taskRef" @confirm="bind" />
+    <task ref="taskRef" @confirm="bindIds" />
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
@@ -673,7 +698,7 @@
         <!-- 展开行表格 -->
         <!-- 头部 -->
         <normal-table
-          v-show=" !tableFlage " class="nortable-header" :data=" [] " :total=" 0 " :columns=" columns " :options="
+          v-show=" !tableFlage " class="nortable-header" :data=" [] " :total=" 0 " :columns=" columns.map(item => ({ ...item, sortable: undefined })) " :options="
             {
               needIndex: false, // 是否需要序号列
               border: true, // 是否需要上方边框
diff --git a/src/views/tested/device/model/components/edit.vue b/src/views/tested/device/model/components/edit.vue
index 9a622b8..154b6b4 100644
--- a/src/views/tested/device/model/components/edit.vue
+++ b/src/views/tested/device/model/components/edit.vue
@@ -204,7 +204,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="设备分类" prop="category">
-              <el-select v-model.trim="ruleForm.category" placeholder="设备名称" style="width: 100%;">
+              <el-select v-model.trim="ruleForm.category" placeholder="设备分类" style="width: 100%;">
                 <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/tested/device/task/addDialog.vue b/src/views/tested/device/task/addDialog.vue
index 620e689..e853254 100644
--- a/src/views/tested/device/task/addDialog.vue
+++ b/src/views/tested/device/task/addDialog.vue
@@ -2,16 +2,23 @@
 <script lang="ts" setup name="SystemUserAddDialog">
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
 import { addTask, delTask, getTaskList, updateTask } from '@/api/eqpt/device/task'
+import useUserStore from '@/store/modules/user'
+import { getUserDept } from '@/api/system/user'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>()
 const dialogFormVisible = ref<boolean>(false)// 对话框是否显示
 const dialogStatus = ref<string>('')// 对话框类型：create,update
+const userStore = useUserStore()
 const userForm = ref({
   endTime: '',
   startTime: '',
   taskName: '',
   remark: '',
+  createDeptId: '',
+  createTime: '',
+  createUserId: '',
 })// 表单
 const textMap: { [key: string]: string } = {
   update: '编辑',
@@ -30,6 +37,9 @@
   userForm.value.startTime = ''
   userForm.value.taskName = ''
   userForm.value.remark = ''
+  userForm.value.createDeptId = ''
+  userForm.value.createTime = ''
+  userForm.value.createUserId = ''
 }
 // 新增数据
 const createData = () => {
@@ -86,10 +96,14 @@
     nextTick(() => {
       ruleFormRef.value?.clearValidate()
     })
+    userForm.value.createUserId = userStore.id
+    userForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+    getUserDept().then((res) => {
+      userForm.value.createDeptId = res.data.id
+    })
   }
   else if (dialogStatus.value === 'update') { // 如果是修改，将row中数据填写到输入框中
-    console.log(row, 'row')
-    userForm.value = row
+    userForm.value = JSON.parse(JSON.stringify(row))
   }
 }
 defineExpose({ initDialog })

diff --git a/src/api/eqpt/device/info.ts b/src/api/eqpt/device/info.ts
index f2a9176..e40366c 100644
--- a/src/api/eqpt/device/info.ts
+++ b/src/api/eqpt/device/info.ts
@@ -153,3 +153,11 @@
     method: 'get',
   })
 }
+// 绑定参试任务
+export function bindTaskHandler(data: object) {
+  return request({
+    url: '/equipment/bindTask',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/expire.ts b/src/api/system/expire.ts
index 0720b82..834048e 100644
--- a/src/api/system/expire.ts
+++ b/src/api/system/expire.ts
@@ -18,8 +18,15 @@
     data,
   })
 }
+// 新建
+export function addRemind(data: object) {
+  return request({
+    url: '/system/remind/add',
+    method: 'post',
+    data,
+  })
+}
 // 删除
-
 export function delRemind(id: string) {
   return request({
     url: `/system/remind/remove?id=${id}`,
diff --git a/src/views/system/expire/device.vue b/src/views/system/expire/device.vue
index 470ca33..890d2ab 100644
--- a/src/views/system/expire/device.vue
+++ b/src/views/system/expire/device.vue
@@ -161,6 +161,7 @@
     emits('add', selectList.value)
     dialogFormVisible.value = false
     reset()
+    selectList.value = []
   }
   else {
     ElMessage.warning('请先选择设备')
diff --git a/src/views/system/expire/edit.vue b/src/views/system/expire/edit.vue
index bfd1272..a7a0ccf 100644
--- a/src/views/system/expire/edit.vue
+++ b/src/views/system/expire/edit.vue
@@ -3,16 +3,20 @@
 import { nextTick, reactive } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
 import device from './device.vue'
 import task from './task.vue'
-import { getList, updateRemind } from '@/api/system/expire'
+import useUserStore from '@/store/modules/user'
+import { getUserDept } from '@/api/system/user'
+import { addRemind, getList, updateRemind } from '@/api/system/expire'
 // ----------------------- 以下是字段定义 emits props ---------------------
 const emits = defineEmits(['closeRefresh'])
 
 const dialogVisible = ref(false)
 const dialogStatus = ref('新建')
+const userStore = useUserStore()
 const data = ref({
-  createDeptId: 0,
+  createDeptId: '',
   createDeptName: '',
   createTime: '',
   createUserId: '',
@@ -30,6 +34,19 @@
   taskExt: [] as string[],
 
 })
+const resetForm = () => {
+  for (const i in data.value) {
+    data.value[i] = ''
+  }
+  data.value.remindTime = 30
+  data.value.remindType = '1'
+  data.value.taskIds = [] as string[]
+  data.value.taskNames = [] as string[]
+  data.value.equipmentNames = [] as string[]
+  data.value.modelIds = [] as string[]
+  data.value.equipmentExt = [] as string[]
+  data.value.taskExt = [] as string[]
+}
 // ---------------表单提交--------------------------------
 // 表单对象
 const dataFormRef = ref<FormInstance>()
@@ -42,15 +59,23 @@
 }) // 表单验证规则
 // 表单提交
 function submitForm() {
-  console.log(data.value, 'data.value')
   if (dataFormRef) {
     dataFormRef.value?.validate((valid: boolean) => {
       if (valid) {
-        updateRemind(data.value).then((res) => {
-          ElMessage.success('修改成功')
-          dialogVisible.value = false
-          emits('closeRefresh')
-        })
+        if (dialogStatus.value === '新建') {
+          addRemind(data.value).then((res) => {
+            ElMessage.success('修改成功')
+            dialogVisible.value = false
+            emits('closeRefresh')
+          })
+        }
+        else {
+          updateRemind(data.value).then((res) => {
+            ElMessage.success('修改成功')
+            dialogVisible.value = false
+            emits('closeRefresh')
+          })
+        }
       }
     })
   }
@@ -59,15 +84,28 @@
 // ----------初始化、关闭对话框相关-----------------
 function initDialog(row: any, status: string) {
   dialogVisible.value = true
+  resetForm()
   if (status === 'create') {
     dialogStatus.value = '新建'
     nextTick(() => {
       dataFormRef.value?.resetFields()
     })
+
+    data.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+    data.value.createUserId = userStore.id
+    data.value.createUserName = userStore.name
+    // 获取当前用户所在单位
+    getUserDept().then((res) => {
+      // fullName
+      data.value.createDeptId = res.data.id
+      data.value.createDeptName = res.data.fullName
+    })
   }
   else {
-    data.value = row
+    data.value = JSON.parse(JSON.stringify(row))
     dialogStatus.value = '编辑'
+    data.value.equipmentExt = JSON.parse(row.equipmentExt)
+    data.value.taskExt = JSON.parse(row.taskExt)
   }
 }
 
@@ -90,7 +128,6 @@
 }
 // 确认设备
 const confirmDevice = (list: any[]) => {
-  console.log(list, '选中的设备')
   list.forEach((item: any) => {
     if (!data.value.modelIds.includes(item.id)) {
       data.value.equipmentExt.push(`${item.equipmentName}/${item.model}/${item.helpInstruction}`)
@@ -119,17 +156,16 @@
 }
 // 确认设备
 const confirmTask = (list: any[]) => {
-  console.log(list, '选中的任务')
   list.forEach((item: any) => {
     if (!data.value.taskIds.includes(item.id)) {
-      data.value.taskExt.push(item)
+      data.value.taskExt.push(`${item.taskName}/${item.createTime}`)
       data.value.taskIds.push(item.id)
     }
   })
 }
 const removeTaskStr = ref()
-const removeTask = (device: string) => {
-  removeDeviceStr.value = device
+const removeTask = (task: string) => {
+  removeTaskStr.value = task
 }
 watch(() => data.value.taskExt, (newVal, oldVal) => {
   if (newVal && oldVal) {
@@ -168,7 +204,7 @@
         </el-col>
         <el-col :span="24" class="grid-cell">
           <el-form-item label="到期提醒类型" prop="remindType" class="required">
-            <el-radio-group v-model="data.remindType" class="ml-4">
+            <el-radio-group v-model="data.remindType" class="ml-4" :disabled="dialogStatus === '编辑'">
               <el-radio label="1" size="large">
                 设备到期提醒
               </el-radio>
@@ -184,9 +220,7 @@
               v-if="data.remindType === '1'"
               v-model="data.equipmentExt"
               multiple
-              collapse-tags
-              collapse-tags-tooltip
-              :max-collapse-tags="3"
+              :max-collapse-tags="10"
               placeholder="设备提醒名称"
               style="width: 100%;"
               @focus="selectDevice"
@@ -196,9 +230,7 @@
               v-if="data.remindType === '2'"
               v-model="data.taskExt"
               multiple
-              collapse-tags
-              collapse-tags-tooltip
-              :max-collapse-tags="3"
+              :max-collapse-tags="10"
               placeholder="任务提醒名称"
               style="width: 100%;"
               @focus="selectTask"
@@ -235,11 +267,13 @@
 
 <style lang="scss" scoped>
 ::v-deep(.el-popper) {
-  display: none;
+  display: none !important;
+  z-index: 10 !important;
 }
 
 ::v-deep(.el-select-dropdown) {
-  display: none;
+  display: none !important;
+  z-index: 10 !important;
 }
 
 .form-container {
diff --git a/src/views/system/expire/task.vue b/src/views/system/expire/task.vue
index e909dc1..49adda9 100644
--- a/src/views/system/expire/task.vue
+++ b/src/views/system/expire/task.vue
@@ -2,54 +2,32 @@
 <script lang="ts" setup name="DeviceModelList">
 import { reactive, ref, watch } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { deleteModel, exportModelList, getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
-import { exportFile } from '@/utils/exportUtils'
+import { getTaskList } from '@/api/eqpt/device/task'
 import { getDictByCode } from '@/api/system/dict'
 const emits = defineEmits(['add'])
 const { proxy } = getCurrentInstance() as any
 const dialogFormVisible = ref(false)
 const listQuery = reactive({
-  category: '',
-  equipmentName: '',
-  helpInstruction: '',
-  model: '',
+  endTime: '',
+  startTime: '',
+  taskName: '',
   offset: 1,
   limit: 20,
 })
 const columns = ref([
   {
-    text: '型号规格编号',
-    value: 'modelNo',
+    text: '任务名称',
+    value: 'taskName',
     align: 'center',
   },
   {
-    text: '设备名称',
-    value: 'equipmentName',
+    text: '开始时间',
+    value: 'startTime',
     align: 'center',
   },
   {
-    text: '型号规格',
-    value: 'model',
-    align: 'center',
-  },
-  {
-    text: '辅助字段',
-    value: 'helpInstruction',
-    align: 'center',
-  },
-  {
-    text: '设备分类',
-    value: 'categoryName',
-    align: 'center',
-  },
-  {
-    text: '检定周期',
-    value: 'checkCycle',
-    align: 'center',
-  },
-  {
-    text: '使用说明书',
-    value: 'instructionsFile',
+    text: '结束时间',
+    value: 'endTime',
     align: 'center',
   },
   {
@@ -69,7 +47,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
-  getModelList(listQuery).then((response) => {
+  getTaskList(listQuery).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     listLoading.value = false
@@ -80,12 +58,24 @@
 const search = () => {
   fetchData(false)
 }
+// 开始结束时间
+const datetimerange = ref()
+watch(() => datetimerange.value, (newVal) => {
+  if (newVal.length) {
+    listQuery.startTime = `${newVal[0]} 00:00:00`
+    listQuery.endTime = `${newVal[1]} 23:59:59`
+  }
+  else {
+    listQuery.startTime = ''
+    listQuery.endTime = ''
+  }
+})
 // 重置
 const reset = () => {
-  listQuery.category = ''
-  listQuery.equipmentName = ''
-  listQuery.helpInstruction = ''
-  listQuery.model = ''
+  datetimerange.value = []
+  listQuery.taskName = ''
+  listQuery.startTime = ''
+  listQuery.endTime = ''
   listQuery.offset = 1
   listQuery.limit = 20
   search()
@@ -107,53 +97,7 @@
 const multiSelect = (row: any[]) => {
   selectList.value = row
 }
-// 获取下拉列表相关
-// 设备名称
-const deviceNameList = ref<{ id: string; value: string; name: string }[]>([])
-// 设备分类
-const deviceTypeList = ref<{ id: string; value: string; name: string }[]>([])
-// 规格型号
-const modelList = ref<any[]>([])
-// 辅助字段
-const helpList = ref<any[]>([])
-const allList = ref<any[]>([])
-const fetchSelect = () => {
-  // 设备分类
-  getDictByCode('eqptDeviceType').then((res) => {
-    deviceTypeList.value = res.data
-  })
-  // 设备名称
-  getDeviceNameList().then((res) => {
-    deviceNameList.value = res.data
-  })
-  // 规格型号及辅助字段
-  getModelAllList({}).then((res) => {
-    allList.value = res.data
-    modelList.value = res.data
-    helpList.value = res.data.filter(item => item.helpInstruction)
-  })
-}
-fetchSelect()
-// 监听设备名称下拉框，修改规格型号和辅助字段
-watch(() => listQuery.equipmentName, (newVal) => {
-  if (newVal) {
-    listQuery.helpInstruction = ''
-    listQuery.model = ''
-    // 修改规格型号和辅助字段列表
-    const data = allList.value.filter(item => item.equipmentName === newVal)
-    modelList.value = data
-    helpList.value = data.filter(item => item.helpInstruction)
-  }
-})
-// 监听规格型号下拉框，修改辅助字段
-watch(() => listQuery.model, (newVal) => {
-  if (newVal) {
-    listQuery.helpInstruction = ''
-    // 修改规格型号和辅助字段列表
-    console.log(helpList.value, 'helpList.value')
-    helpList.value = helpList.value.filter(item => item.model === newVal)
-  }
-})
+
 // 点击保存
 const submitForm = () => {
   // 多选
@@ -161,6 +105,7 @@
     emits('add', selectList.value)
     dialogFormVisible.value = false
     reset()
+    selectList.value = []
   }
   else {
     ElMessage.warning('请先选择设备')
@@ -182,28 +127,18 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="65%" style="z-index: 999999;">
+  <el-dialog v-model="dialogFormVisible" title="" width="65%">
     <!-- 筛选条件 -->
+    <add-dialog ref="addRef" @reset-data="search" />
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-select v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable>
-          <el-option v-for="item in deviceNameList" :key="item" :label="item" :value="item" />
-        </el-select>
+        <el-input v-model.trim="listQuery.taskName" placeholder="参试任务名称" clearable />
       </search-item>
       <search-item>
-        <el-select v-model.trim="listQuery.model" placeholder="规格型号" clearable>
-          <el-option v-for="item in modelList" :key="item.id" :label="item.model" :value="item.model" />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-select v-model.trim="listQuery.helpInstruction" placeholder="辅助字段" clearable>
-          <el-option v-for="item in helpList" :key="item.id" :label="item.helpInstruction" :value="item.helpInstruction" />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-select v-model.trim="listQuery.category" placeholder="设备分类" clearable>
-          <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
-        </el-select>
+        <el-date-picker
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="参试开始时间" end-placeholder="参试结束时间"
+        />
       </search-item>
     </search-area>
     <table-container>
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index 61957f8..2c0fc99 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -5,7 +5,7 @@
 import type { IlistObjType, IlistQueryType } from './interface'
 import { delTextBtn, editTextBtn } from '@/utils/applyBtns'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-import { cancelInfo, deleteInfo, editInfo, exportDevice, getInfoList, getInfoListPage, getInfoListTogether, importDevice, submitInfo } from '@/api/eqpt/device/info'
+import { bindTaskHandler, cancelInfo, deleteInfo, editInfo, exportDevice, getInfoList, getInfoListPage, getInfoListTogether, importDevice, submitInfo } from '@/api/eqpt/device/info'
 import { getDictByCode } from '@/api/system/dict'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import useTemplateDownload from '@/utils/useTemplateDownload'
@@ -138,6 +138,8 @@
     console.log('倒叙')
   }
 }
+// 切换表格标识   true:普通表格  false:聚合表格
+const tableFlage = ref(true)
 // 聚合表格实例
 const togetherTableRef = ref()
 // 展开表格实例
@@ -399,8 +401,32 @@
   taskRef.value.initDialog()
 }
 // 确认绑定
-const bind = (ids: string[]) => {
+const bindIds = (ids: string[]) => {
   console.log(ids, '参数任务ids')
+  // bindTaskHandler()
+  // 判断是 普通表格还是 聚合表格
+  if (tableFlage.value) {
+    // 普通表格
+    const data = {
+      equipmentIds: selectList.value.map(item => item.id),
+      taskIds: ids,
+    }
+    bindTaskHandler(data).then((res) => {
+      ElMessage.success('绑定成功')
+      fetchData()
+    })
+  }
+  else {
+    const data = {
+      equipmentNames: togetherTableRef.value.getSelectionRows().map((item: any) => item.equipmentName),
+      equipmentIds: expandTableRef.value.getSelectionRows().map((item: any) => item.id),
+      taskIds: ids,
+    }
+    bindTaskHandler(data).then((res) => {
+      ElMessage.success('绑定成功')
+      fetchTogetherData()
+    })
+  }
 }
 // 详情
 const detail = (row: IlistObjType) => {
@@ -517,8 +543,7 @@
 const approveHandler = (row: any, type: string) => {
   approvalDialogRef.value.initDialog(type, row.taskId, row.processId, row.id)
 }
-// 切换表格标识   true:普通表格  false:聚合表格
-const tableFlage = ref(true)
+
 const changeTable = () => {
   tableFlage.value = !tableFlage.value
   if (tableFlage.value) {
@@ -557,7 +582,7 @@
     <!-- 审批弹窗 -->
     <approval-dialog ref="approvalDialogRef" @on-success="search" />
     <!-- 参试任务弹窗 -->
-    <task ref="taskRef" @confirm="bind" />
+    <task ref="taskRef" @confirm="bindIds" />
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
@@ -673,7 +698,7 @@
         <!-- 展开行表格 -->
         <!-- 头部 -->
         <normal-table
-          v-show=" !tableFlage " class="nortable-header" :data=" [] " :total=" 0 " :columns=" columns " :options="
+          v-show=" !tableFlage " class="nortable-header" :data=" [] " :total=" 0 " :columns=" columns.map(item => ({ ...item, sortable: undefined })) " :options="
             {
               needIndex: false, // 是否需要序号列
               border: true, // 是否需要上方边框
diff --git a/src/views/tested/device/model/components/edit.vue b/src/views/tested/device/model/components/edit.vue
index 9a622b8..154b6b4 100644
--- a/src/views/tested/device/model/components/edit.vue
+++ b/src/views/tested/device/model/components/edit.vue
@@ -204,7 +204,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="设备分类" prop="category">
-              <el-select v-model.trim="ruleForm.category" placeholder="设备名称" style="width: 100%;">
+              <el-select v-model.trim="ruleForm.category" placeholder="设备分类" style="width: 100%;">
                 <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/tested/device/task/addDialog.vue b/src/views/tested/device/task/addDialog.vue
index 620e689..e853254 100644
--- a/src/views/tested/device/task/addDialog.vue
+++ b/src/views/tested/device/task/addDialog.vue
@@ -2,16 +2,23 @@
 <script lang="ts" setup name="SystemUserAddDialog">
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
 import { addTask, delTask, getTaskList, updateTask } from '@/api/eqpt/device/task'
+import useUserStore from '@/store/modules/user'
+import { getUserDept } from '@/api/system/user'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>()
 const dialogFormVisible = ref<boolean>(false)// 对话框是否显示
 const dialogStatus = ref<string>('')// 对话框类型：create,update
+const userStore = useUserStore()
 const userForm = ref({
   endTime: '',
   startTime: '',
   taskName: '',
   remark: '',
+  createDeptId: '',
+  createTime: '',
+  createUserId: '',
 })// 表单
 const textMap: { [key: string]: string } = {
   update: '编辑',
@@ -30,6 +37,9 @@
   userForm.value.startTime = ''
   userForm.value.taskName = ''
   userForm.value.remark = ''
+  userForm.value.createDeptId = ''
+  userForm.value.createTime = ''
+  userForm.value.createUserId = ''
 }
 // 新增数据
 const createData = () => {
@@ -86,10 +96,14 @@
     nextTick(() => {
       ruleFormRef.value?.clearValidate()
     })
+    userForm.value.createUserId = userStore.id
+    userForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+    getUserDept().then((res) => {
+      userForm.value.createDeptId = res.data.id
+    })
   }
   else if (dialogStatus.value === 'update') { // 如果是修改，将row中数据填写到输入框中
-    console.log(row, 'row')
-    userForm.value = row
+    userForm.value = JSON.parse(JSON.stringify(row))
   }
 }
 defineExpose({ initDialog })
diff --git a/src/views/tested/device/task/index.vue b/src/views/tested/device/task/index.vue
index b3f5981..48d4b1c 100644
--- a/src/views/tested/device/task/index.vue
+++ b/src/views/tested/device/task/index.vue
@@ -4,6 +4,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './addDialog.vue'
 import { addTask, delTask, getTaskList, updateTask } from '@/api/eqpt/device/task'
+const emits = defineEmits(['confirm'])
 const { proxy } = getCurrentInstance() as any
 const dialogFormVisible = ref(false)
 const listQuery = reactive({
@@ -57,7 +58,7 @@
 const search = () => {
   fetchData(false)
 }
-// 证书有效期开始结束时间
+// 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
   if (newVal.length) {
@@ -100,8 +101,9 @@
 const submitForm = () => {
   // 多选
   if (selectList.value.length) {
-    emits('add', selectList.value)
+    emits('confirm', selectList.value.map((item: any) => item.id))
     dialogFormVisible.value = false
+    selectList.value = []
     reset()
   }
   else {
@@ -131,6 +133,7 @@
 const handler = (row: any) => {
   addRef.value.initDialog('update', row)
 }
+
 // 批量删除
 const batchDel = () => {
   if (selectList.value.length) {