diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..9cf2b29 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -28,6 +28,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    DeptSelectByName: typeof import('./components/DeptSelectByName/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']

diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..9cf2b29 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -28,6 +28,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    DeptSelectByName: typeof import('./components/DeptSelectByName/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
diff --git a/src/views/business/board/standardReminder/list.vue b/src/views/business/board/standardReminder/list.vue
index 85efbb1..fd60743 100644
--- a/src/views/business/board/standardReminder/list.vue
+++ b/src/views/business/board/standardReminder/list.vue
@@ -94,12 +94,33 @@
 const preparation = ref<string>('')
 // 到期开始以及结束
 const validTime = ref<string>('')
+watch(preparation, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
+// 有效日期变更
+watch(validTime, (val) => {
+  if (val) {
+    listQuery.value.validStartTime = `${val[0]}`
+    listQuery.value.validEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.validStartTime = ''
+    listQuery.value.validEndTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.preparationStartDate = preparation.value[0] || ''
-  listQuery.value.preparationEndDate = preparation.value[1] || ''
-  listQuery.value.validStartTime = validTime.value[0] || ''
-  listQuery.value.validEndTime = validTime.value[1] || ''
+  // listQuery.value.preparationStartDate = preparation.value[0] || ''
+  // listQuery.value.preparationEndDate = preparation.value[1] || ''
+  // listQuery.value.validStartTime = validTime.value[0] || ''
+  // listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -223,16 +244,16 @@
   })
   if (list.value.length > 0) {
     const params = {
-      category: '', // 类别
-      id: '', // 主键id
-      managerState: '', // 管理状态
-      preparationEndDate: '', // 结束时间
-      preparationStartDate: '', // 开始时间
-      standardLaboratory: '', // 标准所在部门
-      standardName: '', // 标准名称
-      standardNo: '', // 标准编号
-      validEndTime: '', // 结束时间
-      validStartTime: '', // 开始时间
+      category: listQuery.value.category, // 类别
+      id: listQuery.value.id, // 主键id
+      managerState: listQuery.value.managerState, // 管理状态
+      preparationEndDate: listQuery.value.preparationEndDate, // 结束时间
+      preparationStartDate: listQuery.value.preparationStartDate, // 开始时间
+      standardLaboratory: listQuery.value.standardLaboratory, // 标准所在部门
+      standardName: listQuery.value.standardName, // 标准名称
+      standardNo: listQuery.value.standardNo, // 标准编号
+      validEndTime: listQuery.value.validEndTime, // 结束时间
+      validStartTime: listQuery.value.validStartTime, // 开始时间
       offset: 1, // 当前页
       limit: 20, // 每页多少条
       ids: checkoutList.value,

diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..9cf2b29 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -28,6 +28,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    DeptSelectByName: typeof import('./components/DeptSelectByName/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
diff --git a/src/views/business/board/standardReminder/list.vue b/src/views/business/board/standardReminder/list.vue
index 85efbb1..fd60743 100644
--- a/src/views/business/board/standardReminder/list.vue
+++ b/src/views/business/board/standardReminder/list.vue
@@ -94,12 +94,33 @@
 const preparation = ref<string>('')
 // 到期开始以及结束
 const validTime = ref<string>('')
+watch(preparation, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
+// 有效日期变更
+watch(validTime, (val) => {
+  if (val) {
+    listQuery.value.validStartTime = `${val[0]}`
+    listQuery.value.validEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.validStartTime = ''
+    listQuery.value.validEndTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.preparationStartDate = preparation.value[0] || ''
-  listQuery.value.preparationEndDate = preparation.value[1] || ''
-  listQuery.value.validStartTime = validTime.value[0] || ''
-  listQuery.value.validEndTime = validTime.value[1] || ''
+  // listQuery.value.preparationStartDate = preparation.value[0] || ''
+  // listQuery.value.preparationEndDate = preparation.value[1] || ''
+  // listQuery.value.validStartTime = validTime.value[0] || ''
+  // listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -223,16 +244,16 @@
   })
   if (list.value.length > 0) {
     const params = {
-      category: '', // 类别
-      id: '', // 主键id
-      managerState: '', // 管理状态
-      preparationEndDate: '', // 结束时间
-      preparationStartDate: '', // 开始时间
-      standardLaboratory: '', // 标准所在部门
-      standardName: '', // 标准名称
-      standardNo: '', // 标准编号
-      validEndTime: '', // 结束时间
-      validStartTime: '', // 开始时间
+      category: listQuery.value.category, // 类别
+      id: listQuery.value.id, // 主键id
+      managerState: listQuery.value.managerState, // 管理状态
+      preparationEndDate: listQuery.value.preparationEndDate, // 结束时间
+      preparationStartDate: listQuery.value.preparationStartDate, // 开始时间
+      standardLaboratory: listQuery.value.standardLaboratory, // 标准所在部门
+      standardName: listQuery.value.standardName, // 标准名称
+      standardNo: listQuery.value.standardNo, // 标准编号
+      validEndTime: listQuery.value.validEndTime, // 结束时间
+      validStartTime: listQuery.value.validStartTime, // 开始时间
       offset: 1, // 当前页
       limit: 20, // 每页多少条
       ids: checkoutList.value,
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 8666957..37ac73f 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -137,7 +137,7 @@
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  distributeDialogRef.value.initDialog(row.id, row.sampleId, row.orderId)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId, row.sampleStatus)
 }
 // 点击标签绑定
 const barCodeBind = ref()

diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..9cf2b29 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -28,6 +28,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    DeptSelectByName: typeof import('./components/DeptSelectByName/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
diff --git a/src/views/business/board/standardReminder/list.vue b/src/views/business/board/standardReminder/list.vue
index 85efbb1..fd60743 100644
--- a/src/views/business/board/standardReminder/list.vue
+++ b/src/views/business/board/standardReminder/list.vue
@@ -94,12 +94,33 @@
 const preparation = ref<string>('')
 // 到期开始以及结束
 const validTime = ref<string>('')
+watch(preparation, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
+// 有效日期变更
+watch(validTime, (val) => {
+  if (val) {
+    listQuery.value.validStartTime = `${val[0]}`
+    listQuery.value.validEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.validStartTime = ''
+    listQuery.value.validEndTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.preparationStartDate = preparation.value[0] || ''
-  listQuery.value.preparationEndDate = preparation.value[1] || ''
-  listQuery.value.validStartTime = validTime.value[0] || ''
-  listQuery.value.validEndTime = validTime.value[1] || ''
+  // listQuery.value.preparationStartDate = preparation.value[0] || ''
+  // listQuery.value.preparationEndDate = preparation.value[1] || ''
+  // listQuery.value.validStartTime = validTime.value[0] || ''
+  // listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -223,16 +244,16 @@
   })
   if (list.value.length > 0) {
     const params = {
-      category: '', // 类别
-      id: '', // 主键id
-      managerState: '', // 管理状态
-      preparationEndDate: '', // 结束时间
-      preparationStartDate: '', // 开始时间
-      standardLaboratory: '', // 标准所在部门
-      standardName: '', // 标准名称
-      standardNo: '', // 标准编号
-      validEndTime: '', // 结束时间
-      validStartTime: '', // 开始时间
+      category: listQuery.value.category, // 类别
+      id: listQuery.value.id, // 主键id
+      managerState: listQuery.value.managerState, // 管理状态
+      preparationEndDate: listQuery.value.preparationEndDate, // 结束时间
+      preparationStartDate: listQuery.value.preparationStartDate, // 开始时间
+      standardLaboratory: listQuery.value.standardLaboratory, // 标准所在部门
+      standardName: listQuery.value.standardName, // 标准名称
+      standardNo: listQuery.value.standardNo, // 标准编号
+      validEndTime: listQuery.value.validEndTime, // 结束时间
+      validStartTime: listQuery.value.validStartTime, // 开始时间
       offset: 1, // 当前页
       limit: 20, // 每页多少条
       ids: checkoutList.value,
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 8666957..37ac73f 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -137,7 +137,7 @@
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  distributeDialogRef.value.initDialog(row.id, row.sampleId, row.orderId)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId, row.sampleStatus)
 }
 // 点击标签绑定
 const barCodeBind = ref()
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 807ea30..4e4eb46 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -37,11 +37,21 @@
   { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
   { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
 ])
-
+// 时间变更
+watch(trainTime, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 查询列表
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.startTime = trainTime.value[0] || ''
-  listQuery.value.endTime = trainTime.value[1] || ''
+  // listQuery.value.startTime = trainTime.value[0] || ''
+  // listQuery.value.endTime = trainTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页

diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..9cf2b29 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -28,6 +28,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    DeptSelectByName: typeof import('./components/DeptSelectByName/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
diff --git a/src/views/business/board/standardReminder/list.vue b/src/views/business/board/standardReminder/list.vue
index 85efbb1..fd60743 100644
--- a/src/views/business/board/standardReminder/list.vue
+++ b/src/views/business/board/standardReminder/list.vue
@@ -94,12 +94,33 @@
 const preparation = ref<string>('')
 // 到期开始以及结束
 const validTime = ref<string>('')
+watch(preparation, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
+// 有效日期变更
+watch(validTime, (val) => {
+  if (val) {
+    listQuery.value.validStartTime = `${val[0]}`
+    listQuery.value.validEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.validStartTime = ''
+    listQuery.value.validEndTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.preparationStartDate = preparation.value[0] || ''
-  listQuery.value.preparationEndDate = preparation.value[1] || ''
-  listQuery.value.validStartTime = validTime.value[0] || ''
-  listQuery.value.validEndTime = validTime.value[1] || ''
+  // listQuery.value.preparationStartDate = preparation.value[0] || ''
+  // listQuery.value.preparationEndDate = preparation.value[1] || ''
+  // listQuery.value.validStartTime = validTime.value[0] || ''
+  // listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -223,16 +244,16 @@
   })
   if (list.value.length > 0) {
     const params = {
-      category: '', // 类别
-      id: '', // 主键id
-      managerState: '', // 管理状态
-      preparationEndDate: '', // 结束时间
-      preparationStartDate: '', // 开始时间
-      standardLaboratory: '', // 标准所在部门
-      standardName: '', // 标准名称
-      standardNo: '', // 标准编号
-      validEndTime: '', // 结束时间
-      validStartTime: '', // 开始时间
+      category: listQuery.value.category, // 类别
+      id: listQuery.value.id, // 主键id
+      managerState: listQuery.value.managerState, // 管理状态
+      preparationEndDate: listQuery.value.preparationEndDate, // 结束时间
+      preparationStartDate: listQuery.value.preparationStartDate, // 开始时间
+      standardLaboratory: listQuery.value.standardLaboratory, // 标准所在部门
+      standardName: listQuery.value.standardName, // 标准名称
+      standardNo: listQuery.value.standardNo, // 标准编号
+      validEndTime: listQuery.value.validEndTime, // 结束时间
+      validStartTime: listQuery.value.validStartTime, // 开始时间
       offset: 1, // 当前页
       limit: 20, // 每页多少条
       ids: checkoutList.value,
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 8666957..37ac73f 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -137,7 +137,7 @@
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  distributeDialogRef.value.initDialog(row.id, row.sampleId, row.orderId)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId, row.sampleStatus)
 }
 // 点击标签绑定
 const barCodeBind = ref()
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 807ea30..4e4eb46 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -37,11 +37,21 @@
   { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
   { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
 ])
-
+// 时间变更
+watch(trainTime, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 查询列表
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.startTime = trainTime.value[0] || ''
-  listQuery.value.endTime = trainTime.value[1] || ''
+  // listQuery.value.startTime = trainTime.value[0] || ''
+  // listQuery.value.endTime = trainTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2f7c1d0..bccde84 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -139,7 +139,17 @@
     id: '2', // 后端规定已收入传2
   })
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -147,8 +157,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.sampleStatus = active.value
   getInterChangeList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IinterchangeList) => {
@@ -280,7 +290,7 @@
       else if (type === 'delete') { // 无需检测
         interchangeStatusChange({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '7' }).then((res) => {
           if (res.code === 200) {
-            ElMessage.success(`已${title}`)
+            ElMessage.success('操作成功')
             fetchData(true)
           }
         })

diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..9cf2b29 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -28,6 +28,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    DeptSelectByName: typeof import('./components/DeptSelectByName/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
diff --git a/src/views/business/board/standardReminder/list.vue b/src/views/business/board/standardReminder/list.vue
index 85efbb1..fd60743 100644
--- a/src/views/business/board/standardReminder/list.vue
+++ b/src/views/business/board/standardReminder/list.vue
@@ -94,12 +94,33 @@
 const preparation = ref<string>('')
 // 到期开始以及结束
 const validTime = ref<string>('')
+watch(preparation, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
+// 有效日期变更
+watch(validTime, (val) => {
+  if (val) {
+    listQuery.value.validStartTime = `${val[0]}`
+    listQuery.value.validEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.validStartTime = ''
+    listQuery.value.validEndTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.preparationStartDate = preparation.value[0] || ''
-  listQuery.value.preparationEndDate = preparation.value[1] || ''
-  listQuery.value.validStartTime = validTime.value[0] || ''
-  listQuery.value.validEndTime = validTime.value[1] || ''
+  // listQuery.value.preparationStartDate = preparation.value[0] || ''
+  // listQuery.value.preparationEndDate = preparation.value[1] || ''
+  // listQuery.value.validStartTime = validTime.value[0] || ''
+  // listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -223,16 +244,16 @@
   })
   if (list.value.length > 0) {
     const params = {
-      category: '', // 类别
-      id: '', // 主键id
-      managerState: '', // 管理状态
-      preparationEndDate: '', // 结束时间
-      preparationStartDate: '', // 开始时间
-      standardLaboratory: '', // 标准所在部门
-      standardName: '', // 标准名称
-      standardNo: '', // 标准编号
-      validEndTime: '', // 结束时间
-      validStartTime: '', // 开始时间
+      category: listQuery.value.category, // 类别
+      id: listQuery.value.id, // 主键id
+      managerState: listQuery.value.managerState, // 管理状态
+      preparationEndDate: listQuery.value.preparationEndDate, // 结束时间
+      preparationStartDate: listQuery.value.preparationStartDate, // 开始时间
+      standardLaboratory: listQuery.value.standardLaboratory, // 标准所在部门
+      standardName: listQuery.value.standardName, // 标准名称
+      standardNo: listQuery.value.standardNo, // 标准编号
+      validEndTime: listQuery.value.validEndTime, // 结束时间
+      validStartTime: listQuery.value.validStartTime, // 开始时间
       offset: 1, // 当前页
       limit: 20, // 每页多少条
       ids: checkoutList.value,
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 8666957..37ac73f 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -137,7 +137,7 @@
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  distributeDialogRef.value.initDialog(row.id, row.sampleId, row.orderId)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId, row.sampleStatus)
 }
 // 点击标签绑定
 const barCodeBind = ref()
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 807ea30..4e4eb46 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -37,11 +37,21 @@
   { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
   { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
 ])
-
+// 时间变更
+watch(trainTime, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 查询列表
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.startTime = trainTime.value[0] || ''
-  listQuery.value.endTime = trainTime.value[1] || ''
+  // listQuery.value.startTime = trainTime.value[0] || ''
+  // listQuery.value.endTime = trainTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2f7c1d0..bccde84 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -139,7 +139,17 @@
     id: '2', // 后端规定已收入传2
   })
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -147,8 +157,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.sampleStatus = active.value
   getInterChangeList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IinterchangeList) => {
@@ -280,7 +290,7 @@
       else if (type === 'delete') { // 无需检测
         interchangeStatusChange({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '7' }).then((res) => {
           if (res.code === 200) {
-            ElMessage.success(`已${title}`)
+            ElMessage.success('操作成功')
             fetchData(true)
           }
         })
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList.vue b/src/views/business/schedule/interchangeReceipt/receiptList.vue
index 275a053..83d93f4 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptList.vue
@@ -42,7 +42,17 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -50,8 +60,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getReceiptList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -124,13 +134,13 @@
   })
   if (list.value.length > 0) {
     const params = {
-      interchangeCode: '', // 交接单编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      reciever: '', // 接收人
-      deliverer: '', // 送样人
-      startTime: '', // 交接开始时间
-      endTime: '', // 交接结束时间
+      interchangeCode: listQuery.value.interchangeCode, // 交接单编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      reciever: listQuery.value.reciever, // 接收人
+      deliverer: listQuery.value.deliverer, // 送样人
+      startTime: listQuery.value.startTime, // 交接开始时间
+      endTime: listQuery.value.endTime, // 交接结束时间
       offset: 1,
       limit: 20,
       ids: checkoutList.value,

diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..9cf2b29 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -28,6 +28,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    DeptSelectByName: typeof import('./components/DeptSelectByName/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
diff --git a/src/views/business/board/standardReminder/list.vue b/src/views/business/board/standardReminder/list.vue
index 85efbb1..fd60743 100644
--- a/src/views/business/board/standardReminder/list.vue
+++ b/src/views/business/board/standardReminder/list.vue
@@ -94,12 +94,33 @@
 const preparation = ref<string>('')
 // 到期开始以及结束
 const validTime = ref<string>('')
+watch(preparation, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
+// 有效日期变更
+watch(validTime, (val) => {
+  if (val) {
+    listQuery.value.validStartTime = `${val[0]}`
+    listQuery.value.validEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.validStartTime = ''
+    listQuery.value.validEndTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.preparationStartDate = preparation.value[0] || ''
-  listQuery.value.preparationEndDate = preparation.value[1] || ''
-  listQuery.value.validStartTime = validTime.value[0] || ''
-  listQuery.value.validEndTime = validTime.value[1] || ''
+  // listQuery.value.preparationStartDate = preparation.value[0] || ''
+  // listQuery.value.preparationEndDate = preparation.value[1] || ''
+  // listQuery.value.validStartTime = validTime.value[0] || ''
+  // listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -223,16 +244,16 @@
   })
   if (list.value.length > 0) {
     const params = {
-      category: '', // 类别
-      id: '', // 主键id
-      managerState: '', // 管理状态
-      preparationEndDate: '', // 结束时间
-      preparationStartDate: '', // 开始时间
-      standardLaboratory: '', // 标准所在部门
-      standardName: '', // 标准名称
-      standardNo: '', // 标准编号
-      validEndTime: '', // 结束时间
-      validStartTime: '', // 开始时间
+      category: listQuery.value.category, // 类别
+      id: listQuery.value.id, // 主键id
+      managerState: listQuery.value.managerState, // 管理状态
+      preparationEndDate: listQuery.value.preparationEndDate, // 结束时间
+      preparationStartDate: listQuery.value.preparationStartDate, // 开始时间
+      standardLaboratory: listQuery.value.standardLaboratory, // 标准所在部门
+      standardName: listQuery.value.standardName, // 标准名称
+      standardNo: listQuery.value.standardNo, // 标准编号
+      validEndTime: listQuery.value.validEndTime, // 结束时间
+      validStartTime: listQuery.value.validStartTime, // 开始时间
       offset: 1, // 当前页
       limit: 20, // 每页多少条
       ids: checkoutList.value,
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 8666957..37ac73f 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -137,7 +137,7 @@
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  distributeDialogRef.value.initDialog(row.id, row.sampleId, row.orderId)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId, row.sampleStatus)
 }
 // 点击标签绑定
 const barCodeBind = ref()
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 807ea30..4e4eb46 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -37,11 +37,21 @@
   { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
   { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
 ])
-
+// 时间变更
+watch(trainTime, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 查询列表
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.startTime = trainTime.value[0] || ''
-  listQuery.value.endTime = trainTime.value[1] || ''
+  // listQuery.value.startTime = trainTime.value[0] || ''
+  // listQuery.value.endTime = trainTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2f7c1d0..bccde84 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -139,7 +139,17 @@
     id: '2', // 后端规定已收入传2
   })
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -147,8 +157,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.sampleStatus = active.value
   getInterChangeList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IinterchangeList) => {
@@ -280,7 +290,7 @@
       else if (type === 'delete') { // 无需检测
         interchangeStatusChange({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '7' }).then((res) => {
           if (res.code === 200) {
-            ElMessage.success(`已${title}`)
+            ElMessage.success('操作成功')
             fetchData(true)
           }
         })
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList.vue b/src/views/business/schedule/interchangeReceipt/receiptList.vue
index 275a053..83d93f4 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptList.vue
@@ -42,7 +42,17 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -50,8 +60,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getReceiptList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -124,13 +134,13 @@
   })
   if (list.value.length > 0) {
     const params = {
-      interchangeCode: '', // 交接单编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      reciever: '', // 接收人
-      deliverer: '', // 送样人
-      startTime: '', // 交接开始时间
-      endTime: '', // 交接结束时间
+      interchangeCode: listQuery.value.interchangeCode, // 交接单编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      reciever: listQuery.value.reciever, // 接收人
+      deliverer: listQuery.value.deliverer, // 送样人
+      startTime: listQuery.value.startTime, // 交接开始时间
+      endTime: listQuery.value.endTime, // 交接结束时间
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index cf0b532..f2fc852 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -26,8 +26,8 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   deliverer: '', // 送样人
-  isUrgent: 2, // 是否加急 2全部 1是 0否
-  status: 0, // 接收状态
+  isUrgent: '', // 是否加急 2全部 1是 0否
+  status: '', // 接收状态
   offset: 1,
   limit: 20,
 })
@@ -70,11 +70,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    isUrgentMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 2, // 是否加急全部后端定为2
-    })
+    // isUrgentMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 2, // 是否加急全部后端定为2
+    // })
   })
   // 接收状态
   getDictByCode('orderStatus').then((response) => {
@@ -85,11 +85,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    statusMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 0,
-    })
+    // statusMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 0,
+    // })
     console.log(statusMap.value)
   })
 }
@@ -125,8 +125,8 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     deliverer: '', // 送样人
-    isUrgent: 2, // 是否加急
-    status: 0, // 接收状态
+    isUrgent: '', // 是否加急 2全部 1是 0否
+    status: '', // 接收状态
     offset: 1,
     limit: 20,
   }
@@ -191,12 +191,12 @@
   })
   if (list.value.length > 0) {
     const params = {
-      orderCode: '', // 委托书编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      deliverer: '', // 送样人
-      isUrgent: 2, // 是否加急
-      status: 0, // 接收状态
+      orderCode: listQuery.value.orderCode, // 委托书编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      deliverer: listQuery.value.deliverer, // 送样人
+      isUrgent: listQuery.value.isUrgent, // 是否加急
+      status: listQuery.value.status, // 接收状态
       offset: 1,
       limit: 20,
       ids: checkoutList.value,

diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..9cf2b29 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -28,6 +28,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    DeptSelectByName: typeof import('./components/DeptSelectByName/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
diff --git a/src/views/business/board/standardReminder/list.vue b/src/views/business/board/standardReminder/list.vue
index 85efbb1..fd60743 100644
--- a/src/views/business/board/standardReminder/list.vue
+++ b/src/views/business/board/standardReminder/list.vue
@@ -94,12 +94,33 @@
 const preparation = ref<string>('')
 // 到期开始以及结束
 const validTime = ref<string>('')
+watch(preparation, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
+// 有效日期变更
+watch(validTime, (val) => {
+  if (val) {
+    listQuery.value.validStartTime = `${val[0]}`
+    listQuery.value.validEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.validStartTime = ''
+    listQuery.value.validEndTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.preparationStartDate = preparation.value[0] || ''
-  listQuery.value.preparationEndDate = preparation.value[1] || ''
-  listQuery.value.validStartTime = validTime.value[0] || ''
-  listQuery.value.validEndTime = validTime.value[1] || ''
+  // listQuery.value.preparationStartDate = preparation.value[0] || ''
+  // listQuery.value.preparationEndDate = preparation.value[1] || ''
+  // listQuery.value.validStartTime = validTime.value[0] || ''
+  // listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -223,16 +244,16 @@
   })
   if (list.value.length > 0) {
     const params = {
-      category: '', // 类别
-      id: '', // 主键id
-      managerState: '', // 管理状态
-      preparationEndDate: '', // 结束时间
-      preparationStartDate: '', // 开始时间
-      standardLaboratory: '', // 标准所在部门
-      standardName: '', // 标准名称
-      standardNo: '', // 标准编号
-      validEndTime: '', // 结束时间
-      validStartTime: '', // 开始时间
+      category: listQuery.value.category, // 类别
+      id: listQuery.value.id, // 主键id
+      managerState: listQuery.value.managerState, // 管理状态
+      preparationEndDate: listQuery.value.preparationEndDate, // 结束时间
+      preparationStartDate: listQuery.value.preparationStartDate, // 开始时间
+      standardLaboratory: listQuery.value.standardLaboratory, // 标准所在部门
+      standardName: listQuery.value.standardName, // 标准名称
+      standardNo: listQuery.value.standardNo, // 标准编号
+      validEndTime: listQuery.value.validEndTime, // 结束时间
+      validStartTime: listQuery.value.validStartTime, // 开始时间
       offset: 1, // 当前页
       limit: 20, // 每页多少条
       ids: checkoutList.value,
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 8666957..37ac73f 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -137,7 +137,7 @@
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  distributeDialogRef.value.initDialog(row.id, row.sampleId, row.orderId)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId, row.sampleStatus)
 }
 // 点击标签绑定
 const barCodeBind = ref()
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 807ea30..4e4eb46 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -37,11 +37,21 @@
   { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
   { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
 ])
-
+// 时间变更
+watch(trainTime, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 查询列表
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.startTime = trainTime.value[0] || ''
-  listQuery.value.endTime = trainTime.value[1] || ''
+  // listQuery.value.startTime = trainTime.value[0] || ''
+  // listQuery.value.endTime = trainTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2f7c1d0..bccde84 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -139,7 +139,17 @@
     id: '2', // 后端规定已收入传2
   })
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -147,8 +157,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.sampleStatus = active.value
   getInterChangeList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IinterchangeList) => {
@@ -280,7 +290,7 @@
       else if (type === 'delete') { // 无需检测
         interchangeStatusChange({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '7' }).then((res) => {
           if (res.code === 200) {
-            ElMessage.success(`已${title}`)
+            ElMessage.success('操作成功')
             fetchData(true)
           }
         })
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList.vue b/src/views/business/schedule/interchangeReceipt/receiptList.vue
index 275a053..83d93f4 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptList.vue
@@ -42,7 +42,17 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -50,8 +60,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getReceiptList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -124,13 +134,13 @@
   })
   if (list.value.length > 0) {
     const params = {
-      interchangeCode: '', // 交接单编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      reciever: '', // 接收人
-      deliverer: '', // 送样人
-      startTime: '', // 交接开始时间
-      endTime: '', // 交接结束时间
+      interchangeCode: listQuery.value.interchangeCode, // 交接单编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      reciever: listQuery.value.reciever, // 接收人
+      deliverer: listQuery.value.deliverer, // 送样人
+      startTime: listQuery.value.startTime, // 交接开始时间
+      endTime: listQuery.value.endTime, // 交接结束时间
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index cf0b532..f2fc852 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -26,8 +26,8 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   deliverer: '', // 送样人
-  isUrgent: 2, // 是否加急 2全部 1是 0否
-  status: 0, // 接收状态
+  isUrgent: '', // 是否加急 2全部 1是 0否
+  status: '', // 接收状态
   offset: 1,
   limit: 20,
 })
@@ -70,11 +70,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    isUrgentMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 2, // 是否加急全部后端定为2
-    })
+    // isUrgentMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 2, // 是否加急全部后端定为2
+    // })
   })
   // 接收状态
   getDictByCode('orderStatus').then((response) => {
@@ -85,11 +85,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    statusMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 0,
-    })
+    // statusMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 0,
+    // })
     console.log(statusMap.value)
   })
 }
@@ -125,8 +125,8 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     deliverer: '', // 送样人
-    isUrgent: 2, // 是否加急
-    status: 0, // 接收状态
+    isUrgent: '', // 是否加急 2全部 1是 0否
+    status: '', // 接收状态
     offset: 1,
     limit: 20,
   }
@@ -191,12 +191,12 @@
   })
   if (list.value.length > 0) {
     const params = {
-      orderCode: '', // 委托书编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      deliverer: '', // 送样人
-      isUrgent: 2, // 是否加急
-      status: 0, // 接收状态
+      orderCode: listQuery.value.orderCode, // 委托书编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      deliverer: listQuery.value.deliverer, // 送样人
+      isUrgent: listQuery.value.isUrgent, // 是否加急
+      status: listQuery.value.status, // 接收状态
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 2d92da9..14cd1ce 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -6,7 +6,7 @@
   customerName: string // 委托方名称
   deliverer: string // 送样人
   isUrgent: number | string // 是否加急
-  status: number // 接收状态
+  status: number | string// 接收状态
   offset: number
   limit: number
 }

diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..9cf2b29 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -28,6 +28,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    DeptSelectByName: typeof import('./components/DeptSelectByName/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
diff --git a/src/views/business/board/standardReminder/list.vue b/src/views/business/board/standardReminder/list.vue
index 85efbb1..fd60743 100644
--- a/src/views/business/board/standardReminder/list.vue
+++ b/src/views/business/board/standardReminder/list.vue
@@ -94,12 +94,33 @@
 const preparation = ref<string>('')
 // 到期开始以及结束
 const validTime = ref<string>('')
+watch(preparation, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
+// 有效日期变更
+watch(validTime, (val) => {
+  if (val) {
+    listQuery.value.validStartTime = `${val[0]}`
+    listQuery.value.validEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.validStartTime = ''
+    listQuery.value.validEndTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.preparationStartDate = preparation.value[0] || ''
-  listQuery.value.preparationEndDate = preparation.value[1] || ''
-  listQuery.value.validStartTime = validTime.value[0] || ''
-  listQuery.value.validEndTime = validTime.value[1] || ''
+  // listQuery.value.preparationStartDate = preparation.value[0] || ''
+  // listQuery.value.preparationEndDate = preparation.value[1] || ''
+  // listQuery.value.validStartTime = validTime.value[0] || ''
+  // listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -223,16 +244,16 @@
   })
   if (list.value.length > 0) {
     const params = {
-      category: '', // 类别
-      id: '', // 主键id
-      managerState: '', // 管理状态
-      preparationEndDate: '', // 结束时间
-      preparationStartDate: '', // 开始时间
-      standardLaboratory: '', // 标准所在部门
-      standardName: '', // 标准名称
-      standardNo: '', // 标准编号
-      validEndTime: '', // 结束时间
-      validStartTime: '', // 开始时间
+      category: listQuery.value.category, // 类别
+      id: listQuery.value.id, // 主键id
+      managerState: listQuery.value.managerState, // 管理状态
+      preparationEndDate: listQuery.value.preparationEndDate, // 结束时间
+      preparationStartDate: listQuery.value.preparationStartDate, // 开始时间
+      standardLaboratory: listQuery.value.standardLaboratory, // 标准所在部门
+      standardName: listQuery.value.standardName, // 标准名称
+      standardNo: listQuery.value.standardNo, // 标准编号
+      validEndTime: listQuery.value.validEndTime, // 结束时间
+      validStartTime: listQuery.value.validStartTime, // 开始时间
       offset: 1, // 当前页
       limit: 20, // 每页多少条
       ids: checkoutList.value,
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 8666957..37ac73f 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -137,7 +137,7 @@
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  distributeDialogRef.value.initDialog(row.id, row.sampleId, row.orderId)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId, row.sampleStatus)
 }
 // 点击标签绑定
 const barCodeBind = ref()
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 807ea30..4e4eb46 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -37,11 +37,21 @@
   { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
   { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
 ])
-
+// 时间变更
+watch(trainTime, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 查询列表
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.startTime = trainTime.value[0] || ''
-  listQuery.value.endTime = trainTime.value[1] || ''
+  // listQuery.value.startTime = trainTime.value[0] || ''
+  // listQuery.value.endTime = trainTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2f7c1d0..bccde84 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -139,7 +139,17 @@
     id: '2', // 后端规定已收入传2
   })
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -147,8 +157,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.sampleStatus = active.value
   getInterChangeList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IinterchangeList) => {
@@ -280,7 +290,7 @@
       else if (type === 'delete') { // 无需检测
         interchangeStatusChange({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '7' }).then((res) => {
           if (res.code === 200) {
-            ElMessage.success(`已${title}`)
+            ElMessage.success('操作成功')
             fetchData(true)
           }
         })
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList.vue b/src/views/business/schedule/interchangeReceipt/receiptList.vue
index 275a053..83d93f4 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptList.vue
@@ -42,7 +42,17 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -50,8 +60,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getReceiptList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -124,13 +134,13 @@
   })
   if (list.value.length > 0) {
     const params = {
-      interchangeCode: '', // 交接单编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      reciever: '', // 接收人
-      deliverer: '', // 送样人
-      startTime: '', // 交接开始时间
-      endTime: '', // 交接结束时间
+      interchangeCode: listQuery.value.interchangeCode, // 交接单编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      reciever: listQuery.value.reciever, // 接收人
+      deliverer: listQuery.value.deliverer, // 送样人
+      startTime: listQuery.value.startTime, // 交接开始时间
+      endTime: listQuery.value.endTime, // 交接结束时间
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index cf0b532..f2fc852 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -26,8 +26,8 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   deliverer: '', // 送样人
-  isUrgent: 2, // 是否加急 2全部 1是 0否
-  status: 0, // 接收状态
+  isUrgent: '', // 是否加急 2全部 1是 0否
+  status: '', // 接收状态
   offset: 1,
   limit: 20,
 })
@@ -70,11 +70,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    isUrgentMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 2, // 是否加急全部后端定为2
-    })
+    // isUrgentMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 2, // 是否加急全部后端定为2
+    // })
   })
   // 接收状态
   getDictByCode('orderStatus').then((response) => {
@@ -85,11 +85,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    statusMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 0,
-    })
+    // statusMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 0,
+    // })
     console.log(statusMap.value)
   })
 }
@@ -125,8 +125,8 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     deliverer: '', // 送样人
-    isUrgent: 2, // 是否加急
-    status: 0, // 接收状态
+    isUrgent: '', // 是否加急 2全部 1是 0否
+    status: '', // 接收状态
     offset: 1,
     limit: 20,
   }
@@ -191,12 +191,12 @@
   })
   if (list.value.length > 0) {
     const params = {
-      orderCode: '', // 委托书编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      deliverer: '', // 送样人
-      isUrgent: 2, // 是否加急
-      status: 0, // 接收状态
+      orderCode: listQuery.value.orderCode, // 委托书编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      deliverer: listQuery.value.deliverer, // 送样人
+      isUrgent: listQuery.value.isUrgent, // 是否加急
+      status: listQuery.value.status, // 接收状态
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 2d92da9..14cd1ce 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -6,7 +6,7 @@
   customerName: string // 委托方名称
   deliverer: string // 送样人
   isUrgent: number | string // 是否加急
-  status: number // 接收状态
+  status: number | string// 接收状态
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 50308c7..25c5cf9 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -53,6 +53,7 @@
   handOutProperty: string // 分发性质-初次分发、退回分发
   id?: string // 实验室id
   customerId?: string // 客户id
+  certificationState?: string // 证书出具
 }
 
 // 实验室检测/我的检测列表

diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..9cf2b29 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -28,6 +28,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    DeptSelectByName: typeof import('./components/DeptSelectByName/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
diff --git a/src/views/business/board/standardReminder/list.vue b/src/views/business/board/standardReminder/list.vue
index 85efbb1..fd60743 100644
--- a/src/views/business/board/standardReminder/list.vue
+++ b/src/views/business/board/standardReminder/list.vue
@@ -94,12 +94,33 @@
 const preparation = ref<string>('')
 // 到期开始以及结束
 const validTime = ref<string>('')
+watch(preparation, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
+// 有效日期变更
+watch(validTime, (val) => {
+  if (val) {
+    listQuery.value.validStartTime = `${val[0]}`
+    listQuery.value.validEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.validStartTime = ''
+    listQuery.value.validEndTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.preparationStartDate = preparation.value[0] || ''
-  listQuery.value.preparationEndDate = preparation.value[1] || ''
-  listQuery.value.validStartTime = validTime.value[0] || ''
-  listQuery.value.validEndTime = validTime.value[1] || ''
+  // listQuery.value.preparationStartDate = preparation.value[0] || ''
+  // listQuery.value.preparationEndDate = preparation.value[1] || ''
+  // listQuery.value.validStartTime = validTime.value[0] || ''
+  // listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -223,16 +244,16 @@
   })
   if (list.value.length > 0) {
     const params = {
-      category: '', // 类别
-      id: '', // 主键id
-      managerState: '', // 管理状态
-      preparationEndDate: '', // 结束时间
-      preparationStartDate: '', // 开始时间
-      standardLaboratory: '', // 标准所在部门
-      standardName: '', // 标准名称
-      standardNo: '', // 标准编号
-      validEndTime: '', // 结束时间
-      validStartTime: '', // 开始时间
+      category: listQuery.value.category, // 类别
+      id: listQuery.value.id, // 主键id
+      managerState: listQuery.value.managerState, // 管理状态
+      preparationEndDate: listQuery.value.preparationEndDate, // 结束时间
+      preparationStartDate: listQuery.value.preparationStartDate, // 开始时间
+      standardLaboratory: listQuery.value.standardLaboratory, // 标准所在部门
+      standardName: listQuery.value.standardName, // 标准名称
+      standardNo: listQuery.value.standardNo, // 标准编号
+      validEndTime: listQuery.value.validEndTime, // 结束时间
+      validStartTime: listQuery.value.validStartTime, // 开始时间
       offset: 1, // 当前页
       limit: 20, // 每页多少条
       ids: checkoutList.value,
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 8666957..37ac73f 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -137,7 +137,7 @@
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  distributeDialogRef.value.initDialog(row.id, row.sampleId, row.orderId)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId, row.sampleStatus)
 }
 // 点击标签绑定
 const barCodeBind = ref()
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 807ea30..4e4eb46 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -37,11 +37,21 @@
   { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
   { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
 ])
-
+// 时间变更
+watch(trainTime, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 查询列表
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.startTime = trainTime.value[0] || ''
-  listQuery.value.endTime = trainTime.value[1] || ''
+  // listQuery.value.startTime = trainTime.value[0] || ''
+  // listQuery.value.endTime = trainTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2f7c1d0..bccde84 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -139,7 +139,17 @@
     id: '2', // 后端规定已收入传2
   })
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -147,8 +157,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.sampleStatus = active.value
   getInterChangeList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IinterchangeList) => {
@@ -280,7 +290,7 @@
       else if (type === 'delete') { // 无需检测
         interchangeStatusChange({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '7' }).then((res) => {
           if (res.code === 200) {
-            ElMessage.success(`已${title}`)
+            ElMessage.success('操作成功')
             fetchData(true)
           }
         })
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList.vue b/src/views/business/schedule/interchangeReceipt/receiptList.vue
index 275a053..83d93f4 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptList.vue
@@ -42,7 +42,17 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -50,8 +60,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getReceiptList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -124,13 +134,13 @@
   })
   if (list.value.length > 0) {
     const params = {
-      interchangeCode: '', // 交接单编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      reciever: '', // 接收人
-      deliverer: '', // 送样人
-      startTime: '', // 交接开始时间
-      endTime: '', // 交接结束时间
+      interchangeCode: listQuery.value.interchangeCode, // 交接单编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      reciever: listQuery.value.reciever, // 接收人
+      deliverer: listQuery.value.deliverer, // 送样人
+      startTime: listQuery.value.startTime, // 交接开始时间
+      endTime: listQuery.value.endTime, // 交接结束时间
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index cf0b532..f2fc852 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -26,8 +26,8 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   deliverer: '', // 送样人
-  isUrgent: 2, // 是否加急 2全部 1是 0否
-  status: 0, // 接收状态
+  isUrgent: '', // 是否加急 2全部 1是 0否
+  status: '', // 接收状态
   offset: 1,
   limit: 20,
 })
@@ -70,11 +70,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    isUrgentMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 2, // 是否加急全部后端定为2
-    })
+    // isUrgentMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 2, // 是否加急全部后端定为2
+    // })
   })
   // 接收状态
   getDictByCode('orderStatus').then((response) => {
@@ -85,11 +85,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    statusMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 0,
-    })
+    // statusMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 0,
+    // })
     console.log(statusMap.value)
   })
 }
@@ -125,8 +125,8 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     deliverer: '', // 送样人
-    isUrgent: 2, // 是否加急
-    status: 0, // 接收状态
+    isUrgent: '', // 是否加急 2全部 1是 0否
+    status: '', // 接收状态
     offset: 1,
     limit: 20,
   }
@@ -191,12 +191,12 @@
   })
   if (list.value.length > 0) {
     const params = {
-      orderCode: '', // 委托书编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      deliverer: '', // 送样人
-      isUrgent: 2, // 是否加急
-      status: 0, // 接收状态
+      orderCode: listQuery.value.orderCode, // 委托书编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      deliverer: listQuery.value.deliverer, // 送样人
+      isUrgent: listQuery.value.isUrgent, // 是否加急
+      status: listQuery.value.status, // 接收状态
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 2d92da9..14cd1ce 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -6,7 +6,7 @@
   customerName: string // 委托方名称
   deliverer: string // 送样人
   isUrgent: number | string // 是否加急
-  status: number // 接收状态
+  status: number | string// 接收状态
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 50308c7..25c5cf9 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -53,6 +53,7 @@
   handOutProperty: string // 分发性质-初次分发、退回分发
   id?: string // 实验室id
   customerId?: string // 客户id
+  certificationState?: string // 证书出具
 }
 
 // 实验室检测/我的检测列表
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index 7c17365..7159350 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -1,6 +1,6 @@
 <!-- 任务分发 -->
 <script lang="ts" setup name="TaskEdit">
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
 import ProcessConfig from './components/processConfig.vue'
@@ -11,6 +11,7 @@
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { UploadFile } from '@/api/measure/file'
 import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 interface dictType {
   id: string
@@ -251,16 +252,22 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    // UploadFile(fd).then((res) => {
-    //   if (res.code === 200) {
-    //     sampleForm.value.minioFileName = res.data[0]
-    //     // 重置当前验证
-    //     ElMessage.success('文件上传成功')
-    //   }
-    //   else {
-    //     ElMessage.error(res.message)
-    //   }
-    // })
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        sampleForm.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+        loading.close()
+      }
+      else {
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    })
   }
 }
 const upload = () => {
@@ -402,7 +409,7 @@
               <el-form-item label="校检类别:">
                 <el-select
                   v-model="sampleForm.measureCategory"
-                  :placeholder="roleType === 'detail' ? '' : '请选择校检类别'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择校检类别'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -424,7 +431,7 @@
               <el-form-item label="厂家国别:">
                 <el-select
                   v-model="sampleForm.manufacturerCountry"
-                  :placeholder="roleType === 'detail' ? '' : '请选择厂家国别'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择厂家国别'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -450,7 +457,7 @@
               <el-form-item label="ABC:">
                 <el-select
                   v-model="sampleForm.abc"
-                  :placeholder="roleType === 'detail' ? '' : '请选择ABC'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择ABC'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -504,8 +511,8 @@
               <el-form-item label="备注:">
                 <el-input
                   v-model="sampleForm.remark"
+                  autosize
                   type="textarea"
-                  :rows="2"
                   :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
                   :class="{ 'detail-input': roleType === 'detail' }"
@@ -516,7 +523,7 @@
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="sampleForm.measureType"
-                  :placeholder="roleType === 'detail' ? '' : '请选择检定方式'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择检定方式'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >

diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..9cf2b29 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -28,6 +28,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    DeptSelectByName: typeof import('./components/DeptSelectByName/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
diff --git a/src/views/business/board/standardReminder/list.vue b/src/views/business/board/standardReminder/list.vue
index 85efbb1..fd60743 100644
--- a/src/views/business/board/standardReminder/list.vue
+++ b/src/views/business/board/standardReminder/list.vue
@@ -94,12 +94,33 @@
 const preparation = ref<string>('')
 // 到期开始以及结束
 const validTime = ref<string>('')
+watch(preparation, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
+// 有效日期变更
+watch(validTime, (val) => {
+  if (val) {
+    listQuery.value.validStartTime = `${val[0]}`
+    listQuery.value.validEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.validStartTime = ''
+    listQuery.value.validEndTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.preparationStartDate = preparation.value[0] || ''
-  listQuery.value.preparationEndDate = preparation.value[1] || ''
-  listQuery.value.validStartTime = validTime.value[0] || ''
-  listQuery.value.validEndTime = validTime.value[1] || ''
+  // listQuery.value.preparationStartDate = preparation.value[0] || ''
+  // listQuery.value.preparationEndDate = preparation.value[1] || ''
+  // listQuery.value.validStartTime = validTime.value[0] || ''
+  // listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -223,16 +244,16 @@
   })
   if (list.value.length > 0) {
     const params = {
-      category: '', // 类别
-      id: '', // 主键id
-      managerState: '', // 管理状态
-      preparationEndDate: '', // 结束时间
-      preparationStartDate: '', // 开始时间
-      standardLaboratory: '', // 标准所在部门
-      standardName: '', // 标准名称
-      standardNo: '', // 标准编号
-      validEndTime: '', // 结束时间
-      validStartTime: '', // 开始时间
+      category: listQuery.value.category, // 类别
+      id: listQuery.value.id, // 主键id
+      managerState: listQuery.value.managerState, // 管理状态
+      preparationEndDate: listQuery.value.preparationEndDate, // 结束时间
+      preparationStartDate: listQuery.value.preparationStartDate, // 开始时间
+      standardLaboratory: listQuery.value.standardLaboratory, // 标准所在部门
+      standardName: listQuery.value.standardName, // 标准名称
+      standardNo: listQuery.value.standardNo, // 标准编号
+      validEndTime: listQuery.value.validEndTime, // 结束时间
+      validStartTime: listQuery.value.validStartTime, // 开始时间
       offset: 1, // 当前页
       limit: 20, // 每页多少条
       ids: checkoutList.value,
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 8666957..37ac73f 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -137,7 +137,7 @@
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  distributeDialogRef.value.initDialog(row.id, row.sampleId, row.orderId)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId, row.sampleStatus)
 }
 // 点击标签绑定
 const barCodeBind = ref()
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 807ea30..4e4eb46 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -37,11 +37,21 @@
   { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
   { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
 ])
-
+// 时间变更
+watch(trainTime, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 查询列表
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.startTime = trainTime.value[0] || ''
-  listQuery.value.endTime = trainTime.value[1] || ''
+  // listQuery.value.startTime = trainTime.value[0] || ''
+  // listQuery.value.endTime = trainTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2f7c1d0..bccde84 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -139,7 +139,17 @@
     id: '2', // 后端规定已收入传2
   })
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -147,8 +157,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.sampleStatus = active.value
   getInterChangeList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IinterchangeList) => {
@@ -280,7 +290,7 @@
       else if (type === 'delete') { // 无需检测
         interchangeStatusChange({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '7' }).then((res) => {
           if (res.code === 200) {
-            ElMessage.success(`已${title}`)
+            ElMessage.success('操作成功')
             fetchData(true)
           }
         })
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList.vue b/src/views/business/schedule/interchangeReceipt/receiptList.vue
index 275a053..83d93f4 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptList.vue
@@ -42,7 +42,17 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -50,8 +60,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getReceiptList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -124,13 +134,13 @@
   })
   if (list.value.length > 0) {
     const params = {
-      interchangeCode: '', // 交接单编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      reciever: '', // 接收人
-      deliverer: '', // 送样人
-      startTime: '', // 交接开始时间
-      endTime: '', // 交接结束时间
+      interchangeCode: listQuery.value.interchangeCode, // 交接单编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      reciever: listQuery.value.reciever, // 接收人
+      deliverer: listQuery.value.deliverer, // 送样人
+      startTime: listQuery.value.startTime, // 交接开始时间
+      endTime: listQuery.value.endTime, // 交接结束时间
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index cf0b532..f2fc852 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -26,8 +26,8 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   deliverer: '', // 送样人
-  isUrgent: 2, // 是否加急 2全部 1是 0否
-  status: 0, // 接收状态
+  isUrgent: '', // 是否加急 2全部 1是 0否
+  status: '', // 接收状态
   offset: 1,
   limit: 20,
 })
@@ -70,11 +70,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    isUrgentMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 2, // 是否加急全部后端定为2
-    })
+    // isUrgentMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 2, // 是否加急全部后端定为2
+    // })
   })
   // 接收状态
   getDictByCode('orderStatus').then((response) => {
@@ -85,11 +85,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    statusMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 0,
-    })
+    // statusMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 0,
+    // })
     console.log(statusMap.value)
   })
 }
@@ -125,8 +125,8 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     deliverer: '', // 送样人
-    isUrgent: 2, // 是否加急
-    status: 0, // 接收状态
+    isUrgent: '', // 是否加急 2全部 1是 0否
+    status: '', // 接收状态
     offset: 1,
     limit: 20,
   }
@@ -191,12 +191,12 @@
   })
   if (list.value.length > 0) {
     const params = {
-      orderCode: '', // 委托书编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      deliverer: '', // 送样人
-      isUrgent: 2, // 是否加急
-      status: 0, // 接收状态
+      orderCode: listQuery.value.orderCode, // 委托书编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      deliverer: listQuery.value.deliverer, // 送样人
+      isUrgent: listQuery.value.isUrgent, // 是否加急
+      status: listQuery.value.status, // 接收状态
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 2d92da9..14cd1ce 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -6,7 +6,7 @@
   customerName: string // 委托方名称
   deliverer: string // 送样人
   isUrgent: number | string // 是否加急
-  status: number // 接收状态
+  status: number | string// 接收状态
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 50308c7..25c5cf9 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -53,6 +53,7 @@
   handOutProperty: string // 分发性质-初次分发、退回分发
   id?: string // 实验室id
   customerId?: string // 客户id
+  certificationState?: string // 证书出具
 }
 
 // 实验室检测/我的检测列表
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index 7c17365..7159350 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -1,6 +1,6 @@
 <!-- 任务分发 -->
 <script lang="ts" setup name="TaskEdit">
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
 import ProcessConfig from './components/processConfig.vue'
@@ -11,6 +11,7 @@
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { UploadFile } from '@/api/measure/file'
 import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 interface dictType {
   id: string
@@ -251,16 +252,22 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    // UploadFile(fd).then((res) => {
-    //   if (res.code === 200) {
-    //     sampleForm.value.minioFileName = res.data[0]
-    //     // 重置当前验证
-    //     ElMessage.success('文件上传成功')
-    //   }
-    //   else {
-    //     ElMessage.error(res.message)
-    //   }
-    // })
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        sampleForm.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+        loading.close()
+      }
+      else {
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    })
   }
 }
 const upload = () => {
@@ -402,7 +409,7 @@
               <el-form-item label="校检类别:">
                 <el-select
                   v-model="sampleForm.measureCategory"
-                  :placeholder="roleType === 'detail' ? '' : '请选择校检类别'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择校检类别'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -424,7 +431,7 @@
               <el-form-item label="厂家国别:">
                 <el-select
                   v-model="sampleForm.manufacturerCountry"
-                  :placeholder="roleType === 'detail' ? '' : '请选择厂家国别'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择厂家国别'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -450,7 +457,7 @@
               <el-form-item label="ABC:">
                 <el-select
                   v-model="sampleForm.abc"
-                  :placeholder="roleType === 'detail' ? '' : '请选择ABC'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择ABC'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -504,8 +511,8 @@
               <el-form-item label="备注:">
                 <el-input
                   v-model="sampleForm.remark"
+                  autosize
                   type="textarea"
-                  :rows="2"
                   :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
                   :class="{ 'detail-input': roleType === 'detail' }"
@@ -516,7 +523,7 @@
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="sampleForm.measureType"
-                  :placeholder="roleType === 'detail' ? '' : '请选择检定方式'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择检定方式'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index dfbbf6a..6eeff55 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -81,7 +81,7 @@
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '165px' },
   { text: '样品属性', value: 'sampleBelongName', width: '100', align: 'center' },
   { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '90' },
-  { text: '证书出具', value: 'certificationState', align: 'center', width: '90', filter: (row: ITaskList) => { return `${row.alreadyCertifications}/${row.requireCertifications}` } },
+  { text: '证书出具', value: 'certificationState', align: 'center', width: '90' },
 ])
 // 表格数据
 const list = ref<ITaskList[]>([])
@@ -104,6 +104,7 @@
   getTaskList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: ITaskList) => {
       item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      item.certificationState = `${item.alreadyCertifications}/${item.requireCertifications}`
       return item
     })
     total.value = response.data.total

diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..9cf2b29 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -28,6 +28,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    DeptSelectByName: typeof import('./components/DeptSelectByName/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
diff --git a/src/views/business/board/standardReminder/list.vue b/src/views/business/board/standardReminder/list.vue
index 85efbb1..fd60743 100644
--- a/src/views/business/board/standardReminder/list.vue
+++ b/src/views/business/board/standardReminder/list.vue
@@ -94,12 +94,33 @@
 const preparation = ref<string>('')
 // 到期开始以及结束
 const validTime = ref<string>('')
+watch(preparation, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
+// 有效日期变更
+watch(validTime, (val) => {
+  if (val) {
+    listQuery.value.validStartTime = `${val[0]}`
+    listQuery.value.validEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.validStartTime = ''
+    listQuery.value.validEndTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.preparationStartDate = preparation.value[0] || ''
-  listQuery.value.preparationEndDate = preparation.value[1] || ''
-  listQuery.value.validStartTime = validTime.value[0] || ''
-  listQuery.value.validEndTime = validTime.value[1] || ''
+  // listQuery.value.preparationStartDate = preparation.value[0] || ''
+  // listQuery.value.preparationEndDate = preparation.value[1] || ''
+  // listQuery.value.validStartTime = validTime.value[0] || ''
+  // listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -223,16 +244,16 @@
   })
   if (list.value.length > 0) {
     const params = {
-      category: '', // 类别
-      id: '', // 主键id
-      managerState: '', // 管理状态
-      preparationEndDate: '', // 结束时间
-      preparationStartDate: '', // 开始时间
-      standardLaboratory: '', // 标准所在部门
-      standardName: '', // 标准名称
-      standardNo: '', // 标准编号
-      validEndTime: '', // 结束时间
-      validStartTime: '', // 开始时间
+      category: listQuery.value.category, // 类别
+      id: listQuery.value.id, // 主键id
+      managerState: listQuery.value.managerState, // 管理状态
+      preparationEndDate: listQuery.value.preparationEndDate, // 结束时间
+      preparationStartDate: listQuery.value.preparationStartDate, // 开始时间
+      standardLaboratory: listQuery.value.standardLaboratory, // 标准所在部门
+      standardName: listQuery.value.standardName, // 标准名称
+      standardNo: listQuery.value.standardNo, // 标准编号
+      validEndTime: listQuery.value.validEndTime, // 结束时间
+      validStartTime: listQuery.value.validStartTime, // 开始时间
       offset: 1, // 当前页
       limit: 20, // 每页多少条
       ids: checkoutList.value,
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 8666957..37ac73f 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -137,7 +137,7 @@
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  distributeDialogRef.value.initDialog(row.id, row.sampleId, row.orderId)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId, row.sampleStatus)
 }
 // 点击标签绑定
 const barCodeBind = ref()
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 807ea30..4e4eb46 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -37,11 +37,21 @@
   { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
   { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
 ])
-
+// 时间变更
+watch(trainTime, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 查询列表
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.startTime = trainTime.value[0] || ''
-  listQuery.value.endTime = trainTime.value[1] || ''
+  // listQuery.value.startTime = trainTime.value[0] || ''
+  // listQuery.value.endTime = trainTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2f7c1d0..bccde84 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -139,7 +139,17 @@
     id: '2', // 后端规定已收入传2
   })
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -147,8 +157,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.sampleStatus = active.value
   getInterChangeList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IinterchangeList) => {
@@ -280,7 +290,7 @@
       else if (type === 'delete') { // 无需检测
         interchangeStatusChange({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '7' }).then((res) => {
           if (res.code === 200) {
-            ElMessage.success(`已${title}`)
+            ElMessage.success('操作成功')
             fetchData(true)
           }
         })
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList.vue b/src/views/business/schedule/interchangeReceipt/receiptList.vue
index 275a053..83d93f4 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptList.vue
@@ -42,7 +42,17 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -50,8 +60,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getReceiptList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -124,13 +134,13 @@
   })
   if (list.value.length > 0) {
     const params = {
-      interchangeCode: '', // 交接单编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      reciever: '', // 接收人
-      deliverer: '', // 送样人
-      startTime: '', // 交接开始时间
-      endTime: '', // 交接结束时间
+      interchangeCode: listQuery.value.interchangeCode, // 交接单编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      reciever: listQuery.value.reciever, // 接收人
+      deliverer: listQuery.value.deliverer, // 送样人
+      startTime: listQuery.value.startTime, // 交接开始时间
+      endTime: listQuery.value.endTime, // 交接结束时间
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index cf0b532..f2fc852 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -26,8 +26,8 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   deliverer: '', // 送样人
-  isUrgent: 2, // 是否加急 2全部 1是 0否
-  status: 0, // 接收状态
+  isUrgent: '', // 是否加急 2全部 1是 0否
+  status: '', // 接收状态
   offset: 1,
   limit: 20,
 })
@@ -70,11 +70,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    isUrgentMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 2, // 是否加急全部后端定为2
-    })
+    // isUrgentMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 2, // 是否加急全部后端定为2
+    // })
   })
   // 接收状态
   getDictByCode('orderStatus').then((response) => {
@@ -85,11 +85,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    statusMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 0,
-    })
+    // statusMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 0,
+    // })
     console.log(statusMap.value)
   })
 }
@@ -125,8 +125,8 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     deliverer: '', // 送样人
-    isUrgent: 2, // 是否加急
-    status: 0, // 接收状态
+    isUrgent: '', // 是否加急 2全部 1是 0否
+    status: '', // 接收状态
     offset: 1,
     limit: 20,
   }
@@ -191,12 +191,12 @@
   })
   if (list.value.length > 0) {
     const params = {
-      orderCode: '', // 委托书编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      deliverer: '', // 送样人
-      isUrgent: 2, // 是否加急
-      status: 0, // 接收状态
+      orderCode: listQuery.value.orderCode, // 委托书编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      deliverer: listQuery.value.deliverer, // 送样人
+      isUrgent: listQuery.value.isUrgent, // 是否加急
+      status: listQuery.value.status, // 接收状态
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 2d92da9..14cd1ce 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -6,7 +6,7 @@
   customerName: string // 委托方名称
   deliverer: string // 送样人
   isUrgent: number | string // 是否加急
-  status: number // 接收状态
+  status: number | string// 接收状态
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 50308c7..25c5cf9 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -53,6 +53,7 @@
   handOutProperty: string // 分发性质-初次分发、退回分发
   id?: string // 实验室id
   customerId?: string // 客户id
+  certificationState?: string // 证书出具
 }
 
 // 实验室检测/我的检测列表
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index 7c17365..7159350 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -1,6 +1,6 @@
 <!-- 任务分发 -->
 <script lang="ts" setup name="TaskEdit">
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
 import ProcessConfig from './components/processConfig.vue'
@@ -11,6 +11,7 @@
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { UploadFile } from '@/api/measure/file'
 import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 interface dictType {
   id: string
@@ -251,16 +252,22 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    // UploadFile(fd).then((res) => {
-    //   if (res.code === 200) {
-    //     sampleForm.value.minioFileName = res.data[0]
-    //     // 重置当前验证
-    //     ElMessage.success('文件上传成功')
-    //   }
-    //   else {
-    //     ElMessage.error(res.message)
-    //   }
-    // })
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        sampleForm.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+        loading.close()
+      }
+      else {
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    })
   }
 }
 const upload = () => {
@@ -402,7 +409,7 @@
               <el-form-item label="校检类别:">
                 <el-select
                   v-model="sampleForm.measureCategory"
-                  :placeholder="roleType === 'detail' ? '' : '请选择校检类别'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择校检类别'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -424,7 +431,7 @@
               <el-form-item label="厂家国别:">
                 <el-select
                   v-model="sampleForm.manufacturerCountry"
-                  :placeholder="roleType === 'detail' ? '' : '请选择厂家国别'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择厂家国别'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -450,7 +457,7 @@
               <el-form-item label="ABC:">
                 <el-select
                   v-model="sampleForm.abc"
-                  :placeholder="roleType === 'detail' ? '' : '请选择ABC'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择ABC'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -504,8 +511,8 @@
               <el-form-item label="备注:">
                 <el-input
                   v-model="sampleForm.remark"
+                  autosize
                   type="textarea"
-                  :rows="2"
                   :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
                   :class="{ 'detail-input': roleType === 'detail' }"
@@ -516,7 +523,7 @@
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="sampleForm.measureType"
-                  :placeholder="roleType === 'detail' ? '' : '请选择检定方式'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择检定方式'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index dfbbf6a..6eeff55 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -81,7 +81,7 @@
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '165px' },
   { text: '样品属性', value: 'sampleBelongName', width: '100', align: 'center' },
   { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '90' },
-  { text: '证书出具', value: 'certificationState', align: 'center', width: '90', filter: (row: ITaskList) => { return `${row.alreadyCertifications}/${row.requireCertifications}` } },
+  { text: '证书出具', value: 'certificationState', align: 'center', width: '90' },
 ])
 // 表格数据
 const list = ref<ITaskList[]>([])
@@ -104,6 +104,7 @@
   getTaskList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: ITaskList) => {
       item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      item.certificationState = `${item.alreadyCertifications}/${item.requireCertifications}`
       return item
     })
     total.value = response.data.total
diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue
index e44dd67..194de53 100644
--- a/src/views/business/subpackage/apply/list.vue
+++ b/src/views/business/subpackage/apply/list.vue
@@ -302,7 +302,7 @@
         <search-item>
           <el-date-picker
             v-model="timeRange" type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="申请开始时间" end-placeholder="申请结束时间"
+            value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="申请开始时间" end-placeholder="申请结束时间" clearable
           />
         </search-item>
       </search-area>

diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..9cf2b29 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -28,6 +28,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    DeptSelectByName: typeof import('./components/DeptSelectByName/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
diff --git a/src/views/business/board/standardReminder/list.vue b/src/views/business/board/standardReminder/list.vue
index 85efbb1..fd60743 100644
--- a/src/views/business/board/standardReminder/list.vue
+++ b/src/views/business/board/standardReminder/list.vue
@@ -94,12 +94,33 @@
 const preparation = ref<string>('')
 // 到期开始以及结束
 const validTime = ref<string>('')
+watch(preparation, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
+// 有效日期变更
+watch(validTime, (val) => {
+  if (val) {
+    listQuery.value.validStartTime = `${val[0]}`
+    listQuery.value.validEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.validStartTime = ''
+    listQuery.value.validEndTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.preparationStartDate = preparation.value[0] || ''
-  listQuery.value.preparationEndDate = preparation.value[1] || ''
-  listQuery.value.validStartTime = validTime.value[0] || ''
-  listQuery.value.validEndTime = validTime.value[1] || ''
+  // listQuery.value.preparationStartDate = preparation.value[0] || ''
+  // listQuery.value.preparationEndDate = preparation.value[1] || ''
+  // listQuery.value.validStartTime = validTime.value[0] || ''
+  // listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -223,16 +244,16 @@
   })
   if (list.value.length > 0) {
     const params = {
-      category: '', // 类别
-      id: '', // 主键id
-      managerState: '', // 管理状态
-      preparationEndDate: '', // 结束时间
-      preparationStartDate: '', // 开始时间
-      standardLaboratory: '', // 标准所在部门
-      standardName: '', // 标准名称
-      standardNo: '', // 标准编号
-      validEndTime: '', // 结束时间
-      validStartTime: '', // 开始时间
+      category: listQuery.value.category, // 类别
+      id: listQuery.value.id, // 主键id
+      managerState: listQuery.value.managerState, // 管理状态
+      preparationEndDate: listQuery.value.preparationEndDate, // 结束时间
+      preparationStartDate: listQuery.value.preparationStartDate, // 开始时间
+      standardLaboratory: listQuery.value.standardLaboratory, // 标准所在部门
+      standardName: listQuery.value.standardName, // 标准名称
+      standardNo: listQuery.value.standardNo, // 标准编号
+      validEndTime: listQuery.value.validEndTime, // 结束时间
+      validStartTime: listQuery.value.validStartTime, // 开始时间
       offset: 1, // 当前页
       limit: 20, // 每页多少条
       ids: checkoutList.value,
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 8666957..37ac73f 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -137,7 +137,7 @@
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  distributeDialogRef.value.initDialog(row.id, row.sampleId, row.orderId)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId, row.sampleStatus)
 }
 // 点击标签绑定
 const barCodeBind = ref()
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 807ea30..4e4eb46 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -37,11 +37,21 @@
   { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
   { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
 ])
-
+// 时间变更
+watch(trainTime, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 查询列表
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.startTime = trainTime.value[0] || ''
-  listQuery.value.endTime = trainTime.value[1] || ''
+  // listQuery.value.startTime = trainTime.value[0] || ''
+  // listQuery.value.endTime = trainTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2f7c1d0..bccde84 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -139,7 +139,17 @@
     id: '2', // 后端规定已收入传2
   })
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -147,8 +157,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.sampleStatus = active.value
   getInterChangeList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IinterchangeList) => {
@@ -280,7 +290,7 @@
       else if (type === 'delete') { // 无需检测
         interchangeStatusChange({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '7' }).then((res) => {
           if (res.code === 200) {
-            ElMessage.success(`已${title}`)
+            ElMessage.success('操作成功')
             fetchData(true)
           }
         })
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList.vue b/src/views/business/schedule/interchangeReceipt/receiptList.vue
index 275a053..83d93f4 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptList.vue
@@ -42,7 +42,17 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -50,8 +60,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getReceiptList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -124,13 +134,13 @@
   })
   if (list.value.length > 0) {
     const params = {
-      interchangeCode: '', // 交接单编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      reciever: '', // 接收人
-      deliverer: '', // 送样人
-      startTime: '', // 交接开始时间
-      endTime: '', // 交接结束时间
+      interchangeCode: listQuery.value.interchangeCode, // 交接单编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      reciever: listQuery.value.reciever, // 接收人
+      deliverer: listQuery.value.deliverer, // 送样人
+      startTime: listQuery.value.startTime, // 交接开始时间
+      endTime: listQuery.value.endTime, // 交接结束时间
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index cf0b532..f2fc852 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -26,8 +26,8 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   deliverer: '', // 送样人
-  isUrgent: 2, // 是否加急 2全部 1是 0否
-  status: 0, // 接收状态
+  isUrgent: '', // 是否加急 2全部 1是 0否
+  status: '', // 接收状态
   offset: 1,
   limit: 20,
 })
@@ -70,11 +70,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    isUrgentMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 2, // 是否加急全部后端定为2
-    })
+    // isUrgentMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 2, // 是否加急全部后端定为2
+    // })
   })
   // 接收状态
   getDictByCode('orderStatus').then((response) => {
@@ -85,11 +85,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    statusMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 0,
-    })
+    // statusMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 0,
+    // })
     console.log(statusMap.value)
   })
 }
@@ -125,8 +125,8 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     deliverer: '', // 送样人
-    isUrgent: 2, // 是否加急
-    status: 0, // 接收状态
+    isUrgent: '', // 是否加急 2全部 1是 0否
+    status: '', // 接收状态
     offset: 1,
     limit: 20,
   }
@@ -191,12 +191,12 @@
   })
   if (list.value.length > 0) {
     const params = {
-      orderCode: '', // 委托书编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      deliverer: '', // 送样人
-      isUrgent: 2, // 是否加急
-      status: 0, // 接收状态
+      orderCode: listQuery.value.orderCode, // 委托书编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      deliverer: listQuery.value.deliverer, // 送样人
+      isUrgent: listQuery.value.isUrgent, // 是否加急
+      status: listQuery.value.status, // 接收状态
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 2d92da9..14cd1ce 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -6,7 +6,7 @@
   customerName: string // 委托方名称
   deliverer: string // 送样人
   isUrgent: number | string // 是否加急
-  status: number // 接收状态
+  status: number | string// 接收状态
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 50308c7..25c5cf9 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -53,6 +53,7 @@
   handOutProperty: string // 分发性质-初次分发、退回分发
   id?: string // 实验室id
   customerId?: string // 客户id
+  certificationState?: string // 证书出具
 }
 
 // 实验室检测/我的检测列表
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index 7c17365..7159350 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -1,6 +1,6 @@
 <!-- 任务分发 -->
 <script lang="ts" setup name="TaskEdit">
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
 import ProcessConfig from './components/processConfig.vue'
@@ -11,6 +11,7 @@
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { UploadFile } from '@/api/measure/file'
 import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 interface dictType {
   id: string
@@ -251,16 +252,22 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    // UploadFile(fd).then((res) => {
-    //   if (res.code === 200) {
-    //     sampleForm.value.minioFileName = res.data[0]
-    //     // 重置当前验证
-    //     ElMessage.success('文件上传成功')
-    //   }
-    //   else {
-    //     ElMessage.error(res.message)
-    //   }
-    // })
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        sampleForm.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+        loading.close()
+      }
+      else {
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    })
   }
 }
 const upload = () => {
@@ -402,7 +409,7 @@
               <el-form-item label="校检类别:">
                 <el-select
                   v-model="sampleForm.measureCategory"
-                  :placeholder="roleType === 'detail' ? '' : '请选择校检类别'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择校检类别'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -424,7 +431,7 @@
               <el-form-item label="厂家国别:">
                 <el-select
                   v-model="sampleForm.manufacturerCountry"
-                  :placeholder="roleType === 'detail' ? '' : '请选择厂家国别'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择厂家国别'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -450,7 +457,7 @@
               <el-form-item label="ABC:">
                 <el-select
                   v-model="sampleForm.abc"
-                  :placeholder="roleType === 'detail' ? '' : '请选择ABC'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择ABC'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -504,8 +511,8 @@
               <el-form-item label="备注:">
                 <el-input
                   v-model="sampleForm.remark"
+                  autosize
                   type="textarea"
-                  :rows="2"
                   :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
                   :class="{ 'detail-input': roleType === 'detail' }"
@@ -516,7 +523,7 @@
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="sampleForm.measureType"
-                  :placeholder="roleType === 'detail' ? '' : '请选择检定方式'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择检定方式'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index dfbbf6a..6eeff55 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -81,7 +81,7 @@
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '165px' },
   { text: '样品属性', value: 'sampleBelongName', width: '100', align: 'center' },
   { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '90' },
-  { text: '证书出具', value: 'certificationState', align: 'center', width: '90', filter: (row: ITaskList) => { return `${row.alreadyCertifications}/${row.requireCertifications}` } },
+  { text: '证书出具', value: 'certificationState', align: 'center', width: '90' },
 ])
 // 表格数据
 const list = ref<ITaskList[]>([])
@@ -104,6 +104,7 @@
   getTaskList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: ITaskList) => {
       item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      item.certificationState = `${item.alreadyCertifications}/${item.requireCertifications}`
       return item
     })
     total.value = response.data.total
diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue
index e44dd67..194de53 100644
--- a/src/views/business/subpackage/apply/list.vue
+++ b/src/views/business/subpackage/apply/list.vue
@@ -302,7 +302,7 @@
         <search-item>
           <el-date-picker
             v-model="timeRange" type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="申请开始时间" end-placeholder="申请结束时间"
+            value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="申请开始时间" end-placeholder="申请结束时间" clearable
           />
         </search-item>
       </search-area>
diff --git a/src/views/business/subpackage/check/list.vue b/src/views/business/subpackage/check/list.vue
index 51ea419..a8b6744 100644
--- a/src/views/business/subpackage/check/list.vue
+++ b/src/views/business/subpackage/check/list.vue
@@ -111,8 +111,6 @@
 
 // 时间变更
 watch(timeRange, (val) => {
-  console.log(val[0])
-
   if (val) {
     listQuery.value.checkStartTime = `${val[0]}`
     listQuery.value.checkEndTime = `${val[1]}`
@@ -345,7 +343,8 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="timeRange" type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
+            v-model="timeRange"
+            clearable type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="验收开始时间" end-placeholder="验收结束时间"
           />
         </search-item>

diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..9cf2b29 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -28,6 +28,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    DeptSelectByName: typeof import('./components/DeptSelectByName/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
diff --git a/src/views/business/board/standardReminder/list.vue b/src/views/business/board/standardReminder/list.vue
index 85efbb1..fd60743 100644
--- a/src/views/business/board/standardReminder/list.vue
+++ b/src/views/business/board/standardReminder/list.vue
@@ -94,12 +94,33 @@
 const preparation = ref<string>('')
 // 到期开始以及结束
 const validTime = ref<string>('')
+watch(preparation, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
+// 有效日期变更
+watch(validTime, (val) => {
+  if (val) {
+    listQuery.value.validStartTime = `${val[0]}`
+    listQuery.value.validEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.validStartTime = ''
+    listQuery.value.validEndTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.preparationStartDate = preparation.value[0] || ''
-  listQuery.value.preparationEndDate = preparation.value[1] || ''
-  listQuery.value.validStartTime = validTime.value[0] || ''
-  listQuery.value.validEndTime = validTime.value[1] || ''
+  // listQuery.value.preparationStartDate = preparation.value[0] || ''
+  // listQuery.value.preparationEndDate = preparation.value[1] || ''
+  // listQuery.value.validStartTime = validTime.value[0] || ''
+  // listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -223,16 +244,16 @@
   })
   if (list.value.length > 0) {
     const params = {
-      category: '', // 类别
-      id: '', // 主键id
-      managerState: '', // 管理状态
-      preparationEndDate: '', // 结束时间
-      preparationStartDate: '', // 开始时间
-      standardLaboratory: '', // 标准所在部门
-      standardName: '', // 标准名称
-      standardNo: '', // 标准编号
-      validEndTime: '', // 结束时间
-      validStartTime: '', // 开始时间
+      category: listQuery.value.category, // 类别
+      id: listQuery.value.id, // 主键id
+      managerState: listQuery.value.managerState, // 管理状态
+      preparationEndDate: listQuery.value.preparationEndDate, // 结束时间
+      preparationStartDate: listQuery.value.preparationStartDate, // 开始时间
+      standardLaboratory: listQuery.value.standardLaboratory, // 标准所在部门
+      standardName: listQuery.value.standardName, // 标准名称
+      standardNo: listQuery.value.standardNo, // 标准编号
+      validEndTime: listQuery.value.validEndTime, // 结束时间
+      validStartTime: listQuery.value.validStartTime, // 开始时间
       offset: 1, // 当前页
       limit: 20, // 每页多少条
       ids: checkoutList.value,
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 8666957..37ac73f 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -137,7 +137,7 @@
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  distributeDialogRef.value.initDialog(row.id, row.sampleId, row.orderId)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId, row.sampleStatus)
 }
 // 点击标签绑定
 const barCodeBind = ref()
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 807ea30..4e4eb46 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -37,11 +37,21 @@
   { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
   { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
 ])
-
+// 时间变更
+watch(trainTime, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 查询列表
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.startTime = trainTime.value[0] || ''
-  listQuery.value.endTime = trainTime.value[1] || ''
+  // listQuery.value.startTime = trainTime.value[0] || ''
+  // listQuery.value.endTime = trainTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2f7c1d0..bccde84 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -139,7 +139,17 @@
     id: '2', // 后端规定已收入传2
   })
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -147,8 +157,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.sampleStatus = active.value
   getInterChangeList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IinterchangeList) => {
@@ -280,7 +290,7 @@
       else if (type === 'delete') { // 无需检测
         interchangeStatusChange({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '7' }).then((res) => {
           if (res.code === 200) {
-            ElMessage.success(`已${title}`)
+            ElMessage.success('操作成功')
             fetchData(true)
           }
         })
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList.vue b/src/views/business/schedule/interchangeReceipt/receiptList.vue
index 275a053..83d93f4 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptList.vue
@@ -42,7 +42,17 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -50,8 +60,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getReceiptList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -124,13 +134,13 @@
   })
   if (list.value.length > 0) {
     const params = {
-      interchangeCode: '', // 交接单编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      reciever: '', // 接收人
-      deliverer: '', // 送样人
-      startTime: '', // 交接开始时间
-      endTime: '', // 交接结束时间
+      interchangeCode: listQuery.value.interchangeCode, // 交接单编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      reciever: listQuery.value.reciever, // 接收人
+      deliverer: listQuery.value.deliverer, // 送样人
+      startTime: listQuery.value.startTime, // 交接开始时间
+      endTime: listQuery.value.endTime, // 交接结束时间
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index cf0b532..f2fc852 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -26,8 +26,8 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   deliverer: '', // 送样人
-  isUrgent: 2, // 是否加急 2全部 1是 0否
-  status: 0, // 接收状态
+  isUrgent: '', // 是否加急 2全部 1是 0否
+  status: '', // 接收状态
   offset: 1,
   limit: 20,
 })
@@ -70,11 +70,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    isUrgentMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 2, // 是否加急全部后端定为2
-    })
+    // isUrgentMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 2, // 是否加急全部后端定为2
+    // })
   })
   // 接收状态
   getDictByCode('orderStatus').then((response) => {
@@ -85,11 +85,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    statusMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 0,
-    })
+    // statusMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 0,
+    // })
     console.log(statusMap.value)
   })
 }
@@ -125,8 +125,8 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     deliverer: '', // 送样人
-    isUrgent: 2, // 是否加急
-    status: 0, // 接收状态
+    isUrgent: '', // 是否加急 2全部 1是 0否
+    status: '', // 接收状态
     offset: 1,
     limit: 20,
   }
@@ -191,12 +191,12 @@
   })
   if (list.value.length > 0) {
     const params = {
-      orderCode: '', // 委托书编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      deliverer: '', // 送样人
-      isUrgent: 2, // 是否加急
-      status: 0, // 接收状态
+      orderCode: listQuery.value.orderCode, // 委托书编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      deliverer: listQuery.value.deliverer, // 送样人
+      isUrgent: listQuery.value.isUrgent, // 是否加急
+      status: listQuery.value.status, // 接收状态
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 2d92da9..14cd1ce 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -6,7 +6,7 @@
   customerName: string // 委托方名称
   deliverer: string // 送样人
   isUrgent: number | string // 是否加急
-  status: number // 接收状态
+  status: number | string// 接收状态
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 50308c7..25c5cf9 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -53,6 +53,7 @@
   handOutProperty: string // 分发性质-初次分发、退回分发
   id?: string // 实验室id
   customerId?: string // 客户id
+  certificationState?: string // 证书出具
 }
 
 // 实验室检测/我的检测列表
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index 7c17365..7159350 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -1,6 +1,6 @@
 <!-- 任务分发 -->
 <script lang="ts" setup name="TaskEdit">
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
 import ProcessConfig from './components/processConfig.vue'
@@ -11,6 +11,7 @@
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { UploadFile } from '@/api/measure/file'
 import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 interface dictType {
   id: string
@@ -251,16 +252,22 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    // UploadFile(fd).then((res) => {
-    //   if (res.code === 200) {
-    //     sampleForm.value.minioFileName = res.data[0]
-    //     // 重置当前验证
-    //     ElMessage.success('文件上传成功')
-    //   }
-    //   else {
-    //     ElMessage.error(res.message)
-    //   }
-    // })
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        sampleForm.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+        loading.close()
+      }
+      else {
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    })
   }
 }
 const upload = () => {
@@ -402,7 +409,7 @@
               <el-form-item label="校检类别:">
                 <el-select
                   v-model="sampleForm.measureCategory"
-                  :placeholder="roleType === 'detail' ? '' : '请选择校检类别'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择校检类别'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -424,7 +431,7 @@
               <el-form-item label="厂家国别:">
                 <el-select
                   v-model="sampleForm.manufacturerCountry"
-                  :placeholder="roleType === 'detail' ? '' : '请选择厂家国别'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择厂家国别'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -450,7 +457,7 @@
               <el-form-item label="ABC:">
                 <el-select
                   v-model="sampleForm.abc"
-                  :placeholder="roleType === 'detail' ? '' : '请选择ABC'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择ABC'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -504,8 +511,8 @@
               <el-form-item label="备注:">
                 <el-input
                   v-model="sampleForm.remark"
+                  autosize
                   type="textarea"
-                  :rows="2"
                   :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
                   :class="{ 'detail-input': roleType === 'detail' }"
@@ -516,7 +523,7 @@
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="sampleForm.measureType"
-                  :placeholder="roleType === 'detail' ? '' : '请选择检定方式'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择检定方式'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index dfbbf6a..6eeff55 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -81,7 +81,7 @@
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '165px' },
   { text: '样品属性', value: 'sampleBelongName', width: '100', align: 'center' },
   { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '90' },
-  { text: '证书出具', value: 'certificationState', align: 'center', width: '90', filter: (row: ITaskList) => { return `${row.alreadyCertifications}/${row.requireCertifications}` } },
+  { text: '证书出具', value: 'certificationState', align: 'center', width: '90' },
 ])
 // 表格数据
 const list = ref<ITaskList[]>([])
@@ -104,6 +104,7 @@
   getTaskList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: ITaskList) => {
       item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      item.certificationState = `${item.alreadyCertifications}/${item.requireCertifications}`
       return item
     })
     total.value = response.data.total
diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue
index e44dd67..194de53 100644
--- a/src/views/business/subpackage/apply/list.vue
+++ b/src/views/business/subpackage/apply/list.vue
@@ -302,7 +302,7 @@
         <search-item>
           <el-date-picker
             v-model="timeRange" type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="申请开始时间" end-placeholder="申请结束时间"
+            value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="申请开始时间" end-placeholder="申请结束时间" clearable
           />
         </search-item>
       </search-area>
diff --git a/src/views/business/subpackage/check/list.vue b/src/views/business/subpackage/check/list.vue
index 51ea419..a8b6744 100644
--- a/src/views/business/subpackage/check/list.vue
+++ b/src/views/business/subpackage/check/list.vue
@@ -111,8 +111,6 @@
 
 // 时间变更
 watch(timeRange, (val) => {
-  console.log(val[0])
-
   if (val) {
     listQuery.value.checkStartTime = `${val[0]}`
     listQuery.value.checkEndTime = `${val[1]}`
@@ -345,7 +343,8 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="timeRange" type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
+            v-model="timeRange"
+            clearable type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="验收开始时间" end-placeholder="验收结束时间"
           />
         </search-item>
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 98f4a39..a0db900 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -68,6 +68,7 @@
   else {
     listQuery.value.startTime = ''
     listQuery.value.endTime = ''
+    timeRange.value = ['', '']
   }
 })
 // 多选发生改变时

diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..9cf2b29 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -28,6 +28,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    DeptSelectByName: typeof import('./components/DeptSelectByName/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
diff --git a/src/views/business/board/standardReminder/list.vue b/src/views/business/board/standardReminder/list.vue
index 85efbb1..fd60743 100644
--- a/src/views/business/board/standardReminder/list.vue
+++ b/src/views/business/board/standardReminder/list.vue
@@ -94,12 +94,33 @@
 const preparation = ref<string>('')
 // 到期开始以及结束
 const validTime = ref<string>('')
+watch(preparation, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
+// 有效日期变更
+watch(validTime, (val) => {
+  if (val) {
+    listQuery.value.validStartTime = `${val[0]}`
+    listQuery.value.validEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.validStartTime = ''
+    listQuery.value.validEndTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.preparationStartDate = preparation.value[0] || ''
-  listQuery.value.preparationEndDate = preparation.value[1] || ''
-  listQuery.value.validStartTime = validTime.value[0] || ''
-  listQuery.value.validEndTime = validTime.value[1] || ''
+  // listQuery.value.preparationStartDate = preparation.value[0] || ''
+  // listQuery.value.preparationEndDate = preparation.value[1] || ''
+  // listQuery.value.validStartTime = validTime.value[0] || ''
+  // listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -223,16 +244,16 @@
   })
   if (list.value.length > 0) {
     const params = {
-      category: '', // 类别
-      id: '', // 主键id
-      managerState: '', // 管理状态
-      preparationEndDate: '', // 结束时间
-      preparationStartDate: '', // 开始时间
-      standardLaboratory: '', // 标准所在部门
-      standardName: '', // 标准名称
-      standardNo: '', // 标准编号
-      validEndTime: '', // 结束时间
-      validStartTime: '', // 开始时间
+      category: listQuery.value.category, // 类别
+      id: listQuery.value.id, // 主键id
+      managerState: listQuery.value.managerState, // 管理状态
+      preparationEndDate: listQuery.value.preparationEndDate, // 结束时间
+      preparationStartDate: listQuery.value.preparationStartDate, // 开始时间
+      standardLaboratory: listQuery.value.standardLaboratory, // 标准所在部门
+      standardName: listQuery.value.standardName, // 标准名称
+      standardNo: listQuery.value.standardNo, // 标准编号
+      validEndTime: listQuery.value.validEndTime, // 结束时间
+      validStartTime: listQuery.value.validStartTime, // 开始时间
       offset: 1, // 当前页
       limit: 20, // 每页多少条
       ids: checkoutList.value,
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 8666957..37ac73f 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -137,7 +137,7 @@
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  distributeDialogRef.value.initDialog(row.id, row.sampleId, row.orderId)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId, row.sampleStatus)
 }
 // 点击标签绑定
 const barCodeBind = ref()
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 807ea30..4e4eb46 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -37,11 +37,21 @@
   { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
   { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
 ])
-
+// 时间变更
+watch(trainTime, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 查询列表
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.startTime = trainTime.value[0] || ''
-  listQuery.value.endTime = trainTime.value[1] || ''
+  // listQuery.value.startTime = trainTime.value[0] || ''
+  // listQuery.value.endTime = trainTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2f7c1d0..bccde84 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -139,7 +139,17 @@
     id: '2', // 后端规定已收入传2
   })
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -147,8 +157,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.sampleStatus = active.value
   getInterChangeList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IinterchangeList) => {
@@ -280,7 +290,7 @@
       else if (type === 'delete') { // 无需检测
         interchangeStatusChange({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '7' }).then((res) => {
           if (res.code === 200) {
-            ElMessage.success(`已${title}`)
+            ElMessage.success('操作成功')
             fetchData(true)
           }
         })
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList.vue b/src/views/business/schedule/interchangeReceipt/receiptList.vue
index 275a053..83d93f4 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptList.vue
@@ -42,7 +42,17 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -50,8 +60,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getReceiptList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -124,13 +134,13 @@
   })
   if (list.value.length > 0) {
     const params = {
-      interchangeCode: '', // 交接单编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      reciever: '', // 接收人
-      deliverer: '', // 送样人
-      startTime: '', // 交接开始时间
-      endTime: '', // 交接结束时间
+      interchangeCode: listQuery.value.interchangeCode, // 交接单编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      reciever: listQuery.value.reciever, // 接收人
+      deliverer: listQuery.value.deliverer, // 送样人
+      startTime: listQuery.value.startTime, // 交接开始时间
+      endTime: listQuery.value.endTime, // 交接结束时间
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index cf0b532..f2fc852 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -26,8 +26,8 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   deliverer: '', // 送样人
-  isUrgent: 2, // 是否加急 2全部 1是 0否
-  status: 0, // 接收状态
+  isUrgent: '', // 是否加急 2全部 1是 0否
+  status: '', // 接收状态
   offset: 1,
   limit: 20,
 })
@@ -70,11 +70,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    isUrgentMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 2, // 是否加急全部后端定为2
-    })
+    // isUrgentMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 2, // 是否加急全部后端定为2
+    // })
   })
   // 接收状态
   getDictByCode('orderStatus').then((response) => {
@@ -85,11 +85,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    statusMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 0,
-    })
+    // statusMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 0,
+    // })
     console.log(statusMap.value)
   })
 }
@@ -125,8 +125,8 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     deliverer: '', // 送样人
-    isUrgent: 2, // 是否加急
-    status: 0, // 接收状态
+    isUrgent: '', // 是否加急 2全部 1是 0否
+    status: '', // 接收状态
     offset: 1,
     limit: 20,
   }
@@ -191,12 +191,12 @@
   })
   if (list.value.length > 0) {
     const params = {
-      orderCode: '', // 委托书编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      deliverer: '', // 送样人
-      isUrgent: 2, // 是否加急
-      status: 0, // 接收状态
+      orderCode: listQuery.value.orderCode, // 委托书编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      deliverer: listQuery.value.deliverer, // 送样人
+      isUrgent: listQuery.value.isUrgent, // 是否加急
+      status: listQuery.value.status, // 接收状态
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 2d92da9..14cd1ce 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -6,7 +6,7 @@
   customerName: string // 委托方名称
   deliverer: string // 送样人
   isUrgent: number | string // 是否加急
-  status: number // 接收状态
+  status: number | string// 接收状态
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 50308c7..25c5cf9 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -53,6 +53,7 @@
   handOutProperty: string // 分发性质-初次分发、退回分发
   id?: string // 实验室id
   customerId?: string // 客户id
+  certificationState?: string // 证书出具
 }
 
 // 实验室检测/我的检测列表
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index 7c17365..7159350 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -1,6 +1,6 @@
 <!-- 任务分发 -->
 <script lang="ts" setup name="TaskEdit">
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
 import ProcessConfig from './components/processConfig.vue'
@@ -11,6 +11,7 @@
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { UploadFile } from '@/api/measure/file'
 import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 interface dictType {
   id: string
@@ -251,16 +252,22 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    // UploadFile(fd).then((res) => {
-    //   if (res.code === 200) {
-    //     sampleForm.value.minioFileName = res.data[0]
-    //     // 重置当前验证
-    //     ElMessage.success('文件上传成功')
-    //   }
-    //   else {
-    //     ElMessage.error(res.message)
-    //   }
-    // })
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        sampleForm.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+        loading.close()
+      }
+      else {
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    })
   }
 }
 const upload = () => {
@@ -402,7 +409,7 @@
               <el-form-item label="校检类别:">
                 <el-select
                   v-model="sampleForm.measureCategory"
-                  :placeholder="roleType === 'detail' ? '' : '请选择校检类别'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择校检类别'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -424,7 +431,7 @@
               <el-form-item label="厂家国别:">
                 <el-select
                   v-model="sampleForm.manufacturerCountry"
-                  :placeholder="roleType === 'detail' ? '' : '请选择厂家国别'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择厂家国别'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -450,7 +457,7 @@
               <el-form-item label="ABC:">
                 <el-select
                   v-model="sampleForm.abc"
-                  :placeholder="roleType === 'detail' ? '' : '请选择ABC'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择ABC'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -504,8 +511,8 @@
               <el-form-item label="备注:">
                 <el-input
                   v-model="sampleForm.remark"
+                  autosize
                   type="textarea"
-                  :rows="2"
                   :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
                   :class="{ 'detail-input': roleType === 'detail' }"
@@ -516,7 +523,7 @@
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="sampleForm.measureType"
-                  :placeholder="roleType === 'detail' ? '' : '请选择检定方式'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择检定方式'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index dfbbf6a..6eeff55 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -81,7 +81,7 @@
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '165px' },
   { text: '样品属性', value: 'sampleBelongName', width: '100', align: 'center' },
   { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '90' },
-  { text: '证书出具', value: 'certificationState', align: 'center', width: '90', filter: (row: ITaskList) => { return `${row.alreadyCertifications}/${row.requireCertifications}` } },
+  { text: '证书出具', value: 'certificationState', align: 'center', width: '90' },
 ])
 // 表格数据
 const list = ref<ITaskList[]>([])
@@ -104,6 +104,7 @@
   getTaskList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: ITaskList) => {
       item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      item.certificationState = `${item.alreadyCertifications}/${item.requireCertifications}`
       return item
     })
     total.value = response.data.total
diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue
index e44dd67..194de53 100644
--- a/src/views/business/subpackage/apply/list.vue
+++ b/src/views/business/subpackage/apply/list.vue
@@ -302,7 +302,7 @@
         <search-item>
           <el-date-picker
             v-model="timeRange" type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="申请开始时间" end-placeholder="申请结束时间"
+            value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="申请开始时间" end-placeholder="申请结束时间" clearable
           />
         </search-item>
       </search-area>
diff --git a/src/views/business/subpackage/check/list.vue b/src/views/business/subpackage/check/list.vue
index 51ea419..a8b6744 100644
--- a/src/views/business/subpackage/check/list.vue
+++ b/src/views/business/subpackage/check/list.vue
@@ -111,8 +111,6 @@
 
 // 时间变更
 watch(timeRange, (val) => {
-  console.log(val[0])
-
   if (val) {
     listQuery.value.checkStartTime = `${val[0]}`
     listQuery.value.checkEndTime = `${val[1]}`
@@ -345,7 +343,8 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="timeRange" type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
+            v-model="timeRange"
+            clearable type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="验收开始时间" end-placeholder="验收结束时间"
           />
         </search-item>
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 98f4a39..a0db900 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -68,6 +68,7 @@
   else {
     listQuery.value.startTime = ''
     listQuery.value.endTime = ''
+    timeRange.value = ['', '']
   }
 })
 // 多选发生改变时
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index 6e41a94..ac98b8a 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -56,7 +56,17 @@
 const checkoutList = ref<string[]>([])
 // 文件上传input
 const fileRef = ref()
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -64,8 +74,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getSampleList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)

diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..9cf2b29 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -28,6 +28,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    DeptSelectByName: typeof import('./components/DeptSelectByName/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
diff --git a/src/views/business/board/standardReminder/list.vue b/src/views/business/board/standardReminder/list.vue
index 85efbb1..fd60743 100644
--- a/src/views/business/board/standardReminder/list.vue
+++ b/src/views/business/board/standardReminder/list.vue
@@ -94,12 +94,33 @@
 const preparation = ref<string>('')
 // 到期开始以及结束
 const validTime = ref<string>('')
+watch(preparation, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
+// 有效日期变更
+watch(validTime, (val) => {
+  if (val) {
+    listQuery.value.validStartTime = `${val[0]}`
+    listQuery.value.validEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.validStartTime = ''
+    listQuery.value.validEndTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.preparationStartDate = preparation.value[0] || ''
-  listQuery.value.preparationEndDate = preparation.value[1] || ''
-  listQuery.value.validStartTime = validTime.value[0] || ''
-  listQuery.value.validEndTime = validTime.value[1] || ''
+  // listQuery.value.preparationStartDate = preparation.value[0] || ''
+  // listQuery.value.preparationEndDate = preparation.value[1] || ''
+  // listQuery.value.validStartTime = validTime.value[0] || ''
+  // listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -223,16 +244,16 @@
   })
   if (list.value.length > 0) {
     const params = {
-      category: '', // 类别
-      id: '', // 主键id
-      managerState: '', // 管理状态
-      preparationEndDate: '', // 结束时间
-      preparationStartDate: '', // 开始时间
-      standardLaboratory: '', // 标准所在部门
-      standardName: '', // 标准名称
-      standardNo: '', // 标准编号
-      validEndTime: '', // 结束时间
-      validStartTime: '', // 开始时间
+      category: listQuery.value.category, // 类别
+      id: listQuery.value.id, // 主键id
+      managerState: listQuery.value.managerState, // 管理状态
+      preparationEndDate: listQuery.value.preparationEndDate, // 结束时间
+      preparationStartDate: listQuery.value.preparationStartDate, // 开始时间
+      standardLaboratory: listQuery.value.standardLaboratory, // 标准所在部门
+      standardName: listQuery.value.standardName, // 标准名称
+      standardNo: listQuery.value.standardNo, // 标准编号
+      validEndTime: listQuery.value.validEndTime, // 结束时间
+      validStartTime: listQuery.value.validStartTime, // 开始时间
       offset: 1, // 当前页
       limit: 20, // 每页多少条
       ids: checkoutList.value,
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 8666957..37ac73f 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -137,7 +137,7 @@
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  distributeDialogRef.value.initDialog(row.id, row.sampleId, row.orderId)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId, row.sampleStatus)
 }
 // 点击标签绑定
 const barCodeBind = ref()
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 807ea30..4e4eb46 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -37,11 +37,21 @@
   { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
   { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
 ])
-
+// 时间变更
+watch(trainTime, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 查询列表
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.startTime = trainTime.value[0] || ''
-  listQuery.value.endTime = trainTime.value[1] || ''
+  // listQuery.value.startTime = trainTime.value[0] || ''
+  // listQuery.value.endTime = trainTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2f7c1d0..bccde84 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -139,7 +139,17 @@
     id: '2', // 后端规定已收入传2
   })
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -147,8 +157,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.sampleStatus = active.value
   getInterChangeList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IinterchangeList) => {
@@ -280,7 +290,7 @@
       else if (type === 'delete') { // 无需检测
         interchangeStatusChange({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '7' }).then((res) => {
           if (res.code === 200) {
-            ElMessage.success(`已${title}`)
+            ElMessage.success('操作成功')
             fetchData(true)
           }
         })
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList.vue b/src/views/business/schedule/interchangeReceipt/receiptList.vue
index 275a053..83d93f4 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptList.vue
@@ -42,7 +42,17 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -50,8 +60,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getReceiptList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -124,13 +134,13 @@
   })
   if (list.value.length > 0) {
     const params = {
-      interchangeCode: '', // 交接单编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      reciever: '', // 接收人
-      deliverer: '', // 送样人
-      startTime: '', // 交接开始时间
-      endTime: '', // 交接结束时间
+      interchangeCode: listQuery.value.interchangeCode, // 交接单编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      reciever: listQuery.value.reciever, // 接收人
+      deliverer: listQuery.value.deliverer, // 送样人
+      startTime: listQuery.value.startTime, // 交接开始时间
+      endTime: listQuery.value.endTime, // 交接结束时间
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index cf0b532..f2fc852 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -26,8 +26,8 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   deliverer: '', // 送样人
-  isUrgent: 2, // 是否加急 2全部 1是 0否
-  status: 0, // 接收状态
+  isUrgent: '', // 是否加急 2全部 1是 0否
+  status: '', // 接收状态
   offset: 1,
   limit: 20,
 })
@@ -70,11 +70,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    isUrgentMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 2, // 是否加急全部后端定为2
-    })
+    // isUrgentMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 2, // 是否加急全部后端定为2
+    // })
   })
   // 接收状态
   getDictByCode('orderStatus').then((response) => {
@@ -85,11 +85,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    statusMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 0,
-    })
+    // statusMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 0,
+    // })
     console.log(statusMap.value)
   })
 }
@@ -125,8 +125,8 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     deliverer: '', // 送样人
-    isUrgent: 2, // 是否加急
-    status: 0, // 接收状态
+    isUrgent: '', // 是否加急 2全部 1是 0否
+    status: '', // 接收状态
     offset: 1,
     limit: 20,
   }
@@ -191,12 +191,12 @@
   })
   if (list.value.length > 0) {
     const params = {
-      orderCode: '', // 委托书编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      deliverer: '', // 送样人
-      isUrgent: 2, // 是否加急
-      status: 0, // 接收状态
+      orderCode: listQuery.value.orderCode, // 委托书编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      deliverer: listQuery.value.deliverer, // 送样人
+      isUrgent: listQuery.value.isUrgent, // 是否加急
+      status: listQuery.value.status, // 接收状态
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 2d92da9..14cd1ce 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -6,7 +6,7 @@
   customerName: string // 委托方名称
   deliverer: string // 送样人
   isUrgent: number | string // 是否加急
-  status: number // 接收状态
+  status: number | string// 接收状态
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 50308c7..25c5cf9 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -53,6 +53,7 @@
   handOutProperty: string // 分发性质-初次分发、退回分发
   id?: string // 实验室id
   customerId?: string // 客户id
+  certificationState?: string // 证书出具
 }
 
 // 实验室检测/我的检测列表
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index 7c17365..7159350 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -1,6 +1,6 @@
 <!-- 任务分发 -->
 <script lang="ts" setup name="TaskEdit">
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
 import ProcessConfig from './components/processConfig.vue'
@@ -11,6 +11,7 @@
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { UploadFile } from '@/api/measure/file'
 import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 interface dictType {
   id: string
@@ -251,16 +252,22 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    // UploadFile(fd).then((res) => {
-    //   if (res.code === 200) {
-    //     sampleForm.value.minioFileName = res.data[0]
-    //     // 重置当前验证
-    //     ElMessage.success('文件上传成功')
-    //   }
-    //   else {
-    //     ElMessage.error(res.message)
-    //   }
-    // })
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        sampleForm.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+        loading.close()
+      }
+      else {
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    })
   }
 }
 const upload = () => {
@@ -402,7 +409,7 @@
               <el-form-item label="校检类别:">
                 <el-select
                   v-model="sampleForm.measureCategory"
-                  :placeholder="roleType === 'detail' ? '' : '请选择校检类别'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择校检类别'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -424,7 +431,7 @@
               <el-form-item label="厂家国别:">
                 <el-select
                   v-model="sampleForm.manufacturerCountry"
-                  :placeholder="roleType === 'detail' ? '' : '请选择厂家国别'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择厂家国别'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -450,7 +457,7 @@
               <el-form-item label="ABC:">
                 <el-select
                   v-model="sampleForm.abc"
-                  :placeholder="roleType === 'detail' ? '' : '请选择ABC'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择ABC'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -504,8 +511,8 @@
               <el-form-item label="备注:">
                 <el-input
                   v-model="sampleForm.remark"
+                  autosize
                   type="textarea"
-                  :rows="2"
                   :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
                   :class="{ 'detail-input': roleType === 'detail' }"
@@ -516,7 +523,7 @@
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="sampleForm.measureType"
-                  :placeholder="roleType === 'detail' ? '' : '请选择检定方式'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择检定方式'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index dfbbf6a..6eeff55 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -81,7 +81,7 @@
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '165px' },
   { text: '样品属性', value: 'sampleBelongName', width: '100', align: 'center' },
   { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '90' },
-  { text: '证书出具', value: 'certificationState', align: 'center', width: '90', filter: (row: ITaskList) => { return `${row.alreadyCertifications}/${row.requireCertifications}` } },
+  { text: '证书出具', value: 'certificationState', align: 'center', width: '90' },
 ])
 // 表格数据
 const list = ref<ITaskList[]>([])
@@ -104,6 +104,7 @@
   getTaskList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: ITaskList) => {
       item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      item.certificationState = `${item.alreadyCertifications}/${item.requireCertifications}`
       return item
     })
     total.value = response.data.total
diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue
index e44dd67..194de53 100644
--- a/src/views/business/subpackage/apply/list.vue
+++ b/src/views/business/subpackage/apply/list.vue
@@ -302,7 +302,7 @@
         <search-item>
           <el-date-picker
             v-model="timeRange" type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="申请开始时间" end-placeholder="申请结束时间"
+            value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="申请开始时间" end-placeholder="申请结束时间" clearable
           />
         </search-item>
       </search-area>
diff --git a/src/views/business/subpackage/check/list.vue b/src/views/business/subpackage/check/list.vue
index 51ea419..a8b6744 100644
--- a/src/views/business/subpackage/check/list.vue
+++ b/src/views/business/subpackage/check/list.vue
@@ -111,8 +111,6 @@
 
 // 时间变更
 watch(timeRange, (val) => {
-  console.log(val[0])
-
   if (val) {
     listQuery.value.checkStartTime = `${val[0]}`
     listQuery.value.checkEndTime = `${val[1]}`
@@ -345,7 +343,8 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="timeRange" type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
+            v-model="timeRange"
+            clearable type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="验收开始时间" end-placeholder="验收结束时间"
           />
         </search-item>
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 98f4a39..a0db900 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -68,6 +68,7 @@
   else {
     listQuery.value.startTime = ''
     listQuery.value.endTime = ''
+    timeRange.value = ['', '']
   }
 })
 // 多选发生改变时
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index 6e41a94..ac98b8a 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -56,7 +56,17 @@
 const checkoutList = ref<string[]>([])
 // 文件上传input
 const fileRef = ref()
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -64,8 +74,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getSampleList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index 92e4b4a..6f465fc 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -67,7 +67,17 @@
     certificationStatusMap.value[`${item.value}`] = item.name
   })
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -75,8 +85,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getSampleList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IOvertimeList) => {
       return {

diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..9cf2b29 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -28,6 +28,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    DeptSelectByName: typeof import('./components/DeptSelectByName/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
diff --git a/src/views/business/board/standardReminder/list.vue b/src/views/business/board/standardReminder/list.vue
index 85efbb1..fd60743 100644
--- a/src/views/business/board/standardReminder/list.vue
+++ b/src/views/business/board/standardReminder/list.vue
@@ -94,12 +94,33 @@
 const preparation = ref<string>('')
 // 到期开始以及结束
 const validTime = ref<string>('')
+watch(preparation, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
+// 有效日期变更
+watch(validTime, (val) => {
+  if (val) {
+    listQuery.value.validStartTime = `${val[0]}`
+    listQuery.value.validEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.validStartTime = ''
+    listQuery.value.validEndTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.preparationStartDate = preparation.value[0] || ''
-  listQuery.value.preparationEndDate = preparation.value[1] || ''
-  listQuery.value.validStartTime = validTime.value[0] || ''
-  listQuery.value.validEndTime = validTime.value[1] || ''
+  // listQuery.value.preparationStartDate = preparation.value[0] || ''
+  // listQuery.value.preparationEndDate = preparation.value[1] || ''
+  // listQuery.value.validStartTime = validTime.value[0] || ''
+  // listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -223,16 +244,16 @@
   })
   if (list.value.length > 0) {
     const params = {
-      category: '', // 类别
-      id: '', // 主键id
-      managerState: '', // 管理状态
-      preparationEndDate: '', // 结束时间
-      preparationStartDate: '', // 开始时间
-      standardLaboratory: '', // 标准所在部门
-      standardName: '', // 标准名称
-      standardNo: '', // 标准编号
-      validEndTime: '', // 结束时间
-      validStartTime: '', // 开始时间
+      category: listQuery.value.category, // 类别
+      id: listQuery.value.id, // 主键id
+      managerState: listQuery.value.managerState, // 管理状态
+      preparationEndDate: listQuery.value.preparationEndDate, // 结束时间
+      preparationStartDate: listQuery.value.preparationStartDate, // 开始时间
+      standardLaboratory: listQuery.value.standardLaboratory, // 标准所在部门
+      standardName: listQuery.value.standardName, // 标准名称
+      standardNo: listQuery.value.standardNo, // 标准编号
+      validEndTime: listQuery.value.validEndTime, // 结束时间
+      validStartTime: listQuery.value.validStartTime, // 开始时间
       offset: 1, // 当前页
       limit: 20, // 每页多少条
       ids: checkoutList.value,
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 8666957..37ac73f 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -137,7 +137,7 @@
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  distributeDialogRef.value.initDialog(row.id, row.sampleId, row.orderId)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId, row.sampleStatus)
 }
 // 点击标签绑定
 const barCodeBind = ref()
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 807ea30..4e4eb46 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -37,11 +37,21 @@
   { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
   { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
 ])
-
+// 时间变更
+watch(trainTime, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 查询列表
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.startTime = trainTime.value[0] || ''
-  listQuery.value.endTime = trainTime.value[1] || ''
+  // listQuery.value.startTime = trainTime.value[0] || ''
+  // listQuery.value.endTime = trainTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2f7c1d0..bccde84 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -139,7 +139,17 @@
     id: '2', // 后端规定已收入传2
   })
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -147,8 +157,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.sampleStatus = active.value
   getInterChangeList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IinterchangeList) => {
@@ -280,7 +290,7 @@
       else if (type === 'delete') { // 无需检测
         interchangeStatusChange({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '7' }).then((res) => {
           if (res.code === 200) {
-            ElMessage.success(`已${title}`)
+            ElMessage.success('操作成功')
             fetchData(true)
           }
         })
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList.vue b/src/views/business/schedule/interchangeReceipt/receiptList.vue
index 275a053..83d93f4 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptList.vue
@@ -42,7 +42,17 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -50,8 +60,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getReceiptList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -124,13 +134,13 @@
   })
   if (list.value.length > 0) {
     const params = {
-      interchangeCode: '', // 交接单编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      reciever: '', // 接收人
-      deliverer: '', // 送样人
-      startTime: '', // 交接开始时间
-      endTime: '', // 交接结束时间
+      interchangeCode: listQuery.value.interchangeCode, // 交接单编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      reciever: listQuery.value.reciever, // 接收人
+      deliverer: listQuery.value.deliverer, // 送样人
+      startTime: listQuery.value.startTime, // 交接开始时间
+      endTime: listQuery.value.endTime, // 交接结束时间
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index cf0b532..f2fc852 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -26,8 +26,8 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   deliverer: '', // 送样人
-  isUrgent: 2, // 是否加急 2全部 1是 0否
-  status: 0, // 接收状态
+  isUrgent: '', // 是否加急 2全部 1是 0否
+  status: '', // 接收状态
   offset: 1,
   limit: 20,
 })
@@ -70,11 +70,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    isUrgentMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 2, // 是否加急全部后端定为2
-    })
+    // isUrgentMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 2, // 是否加急全部后端定为2
+    // })
   })
   // 接收状态
   getDictByCode('orderStatus').then((response) => {
@@ -85,11 +85,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    statusMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 0,
-    })
+    // statusMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 0,
+    // })
     console.log(statusMap.value)
   })
 }
@@ -125,8 +125,8 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     deliverer: '', // 送样人
-    isUrgent: 2, // 是否加急
-    status: 0, // 接收状态
+    isUrgent: '', // 是否加急 2全部 1是 0否
+    status: '', // 接收状态
     offset: 1,
     limit: 20,
   }
@@ -191,12 +191,12 @@
   })
   if (list.value.length > 0) {
     const params = {
-      orderCode: '', // 委托书编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      deliverer: '', // 送样人
-      isUrgent: 2, // 是否加急
-      status: 0, // 接收状态
+      orderCode: listQuery.value.orderCode, // 委托书编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      deliverer: listQuery.value.deliverer, // 送样人
+      isUrgent: listQuery.value.isUrgent, // 是否加急
+      status: listQuery.value.status, // 接收状态
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 2d92da9..14cd1ce 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -6,7 +6,7 @@
   customerName: string // 委托方名称
   deliverer: string // 送样人
   isUrgent: number | string // 是否加急
-  status: number // 接收状态
+  status: number | string// 接收状态
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 50308c7..25c5cf9 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -53,6 +53,7 @@
   handOutProperty: string // 分发性质-初次分发、退回分发
   id?: string // 实验室id
   customerId?: string // 客户id
+  certificationState?: string // 证书出具
 }
 
 // 实验室检测/我的检测列表
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index 7c17365..7159350 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -1,6 +1,6 @@
 <!-- 任务分发 -->
 <script lang="ts" setup name="TaskEdit">
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
 import ProcessConfig from './components/processConfig.vue'
@@ -11,6 +11,7 @@
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { UploadFile } from '@/api/measure/file'
 import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 interface dictType {
   id: string
@@ -251,16 +252,22 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    // UploadFile(fd).then((res) => {
-    //   if (res.code === 200) {
-    //     sampleForm.value.minioFileName = res.data[0]
-    //     // 重置当前验证
-    //     ElMessage.success('文件上传成功')
-    //   }
-    //   else {
-    //     ElMessage.error(res.message)
-    //   }
-    // })
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        sampleForm.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+        loading.close()
+      }
+      else {
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    })
   }
 }
 const upload = () => {
@@ -402,7 +409,7 @@
               <el-form-item label="校检类别:">
                 <el-select
                   v-model="sampleForm.measureCategory"
-                  :placeholder="roleType === 'detail' ? '' : '请选择校检类别'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择校检类别'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -424,7 +431,7 @@
               <el-form-item label="厂家国别:">
                 <el-select
                   v-model="sampleForm.manufacturerCountry"
-                  :placeholder="roleType === 'detail' ? '' : '请选择厂家国别'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择厂家国别'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -450,7 +457,7 @@
               <el-form-item label="ABC:">
                 <el-select
                   v-model="sampleForm.abc"
-                  :placeholder="roleType === 'detail' ? '' : '请选择ABC'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择ABC'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -504,8 +511,8 @@
               <el-form-item label="备注:">
                 <el-input
                   v-model="sampleForm.remark"
+                  autosize
                   type="textarea"
-                  :rows="2"
                   :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
                   :class="{ 'detail-input': roleType === 'detail' }"
@@ -516,7 +523,7 @@
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="sampleForm.measureType"
-                  :placeholder="roleType === 'detail' ? '' : '请选择检定方式'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择检定方式'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index dfbbf6a..6eeff55 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -81,7 +81,7 @@
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '165px' },
   { text: '样品属性', value: 'sampleBelongName', width: '100', align: 'center' },
   { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '90' },
-  { text: '证书出具', value: 'certificationState', align: 'center', width: '90', filter: (row: ITaskList) => { return `${row.alreadyCertifications}/${row.requireCertifications}` } },
+  { text: '证书出具', value: 'certificationState', align: 'center', width: '90' },
 ])
 // 表格数据
 const list = ref<ITaskList[]>([])
@@ -104,6 +104,7 @@
   getTaskList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: ITaskList) => {
       item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      item.certificationState = `${item.alreadyCertifications}/${item.requireCertifications}`
       return item
     })
     total.value = response.data.total
diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue
index e44dd67..194de53 100644
--- a/src/views/business/subpackage/apply/list.vue
+++ b/src/views/business/subpackage/apply/list.vue
@@ -302,7 +302,7 @@
         <search-item>
           <el-date-picker
             v-model="timeRange" type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="申请开始时间" end-placeholder="申请结束时间"
+            value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="申请开始时间" end-placeholder="申请结束时间" clearable
           />
         </search-item>
       </search-area>
diff --git a/src/views/business/subpackage/check/list.vue b/src/views/business/subpackage/check/list.vue
index 51ea419..a8b6744 100644
--- a/src/views/business/subpackage/check/list.vue
+++ b/src/views/business/subpackage/check/list.vue
@@ -111,8 +111,6 @@
 
 // 时间变更
 watch(timeRange, (val) => {
-  console.log(val[0])
-
   if (val) {
     listQuery.value.checkStartTime = `${val[0]}`
     listQuery.value.checkEndTime = `${val[1]}`
@@ -345,7 +343,8 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="timeRange" type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
+            v-model="timeRange"
+            clearable type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="验收开始时间" end-placeholder="验收结束时间"
           />
         </search-item>
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 98f4a39..a0db900 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -68,6 +68,7 @@
   else {
     listQuery.value.startTime = ''
     listQuery.value.endTime = ''
+    timeRange.value = ['', '']
   }
 })
 // 多选发生改变时
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index 6e41a94..ac98b8a 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -56,7 +56,17 @@
 const checkoutList = ref<string[]>([])
 // 文件上传input
 const fileRef = ref()
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -64,8 +74,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getSampleList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index 92e4b4a..6f465fc 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -67,7 +67,17 @@
     certificationStatusMap.value[`${item.value}`] = item.name
   })
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -75,8 +85,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getSampleList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IOvertimeList) => {
       return {
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index dbaa437..14464bf 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -86,6 +86,17 @@
     width: 160,
   },
 ]) // 表格
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 const fetchData = (isNowPage = false) => {
   loadingTable.value = true
@@ -93,8 +104,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.processResult = active.value
   getApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {

diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..9cf2b29 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -28,6 +28,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    DeptSelectByName: typeof import('./components/DeptSelectByName/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
diff --git a/src/views/business/board/standardReminder/list.vue b/src/views/business/board/standardReminder/list.vue
index 85efbb1..fd60743 100644
--- a/src/views/business/board/standardReminder/list.vue
+++ b/src/views/business/board/standardReminder/list.vue
@@ -94,12 +94,33 @@
 const preparation = ref<string>('')
 // 到期开始以及结束
 const validTime = ref<string>('')
+watch(preparation, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
+// 有效日期变更
+watch(validTime, (val) => {
+  if (val) {
+    listQuery.value.validStartTime = `${val[0]}`
+    listQuery.value.validEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.validStartTime = ''
+    listQuery.value.validEndTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.preparationStartDate = preparation.value[0] || ''
-  listQuery.value.preparationEndDate = preparation.value[1] || ''
-  listQuery.value.validStartTime = validTime.value[0] || ''
-  listQuery.value.validEndTime = validTime.value[1] || ''
+  // listQuery.value.preparationStartDate = preparation.value[0] || ''
+  // listQuery.value.preparationEndDate = preparation.value[1] || ''
+  // listQuery.value.validStartTime = validTime.value[0] || ''
+  // listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -223,16 +244,16 @@
   })
   if (list.value.length > 0) {
     const params = {
-      category: '', // 类别
-      id: '', // 主键id
-      managerState: '', // 管理状态
-      preparationEndDate: '', // 结束时间
-      preparationStartDate: '', // 开始时间
-      standardLaboratory: '', // 标准所在部门
-      standardName: '', // 标准名称
-      standardNo: '', // 标准编号
-      validEndTime: '', // 结束时间
-      validStartTime: '', // 开始时间
+      category: listQuery.value.category, // 类别
+      id: listQuery.value.id, // 主键id
+      managerState: listQuery.value.managerState, // 管理状态
+      preparationEndDate: listQuery.value.preparationEndDate, // 结束时间
+      preparationStartDate: listQuery.value.preparationStartDate, // 开始时间
+      standardLaboratory: listQuery.value.standardLaboratory, // 标准所在部门
+      standardName: listQuery.value.standardName, // 标准名称
+      standardNo: listQuery.value.standardNo, // 标准编号
+      validEndTime: listQuery.value.validEndTime, // 结束时间
+      validStartTime: listQuery.value.validStartTime, // 开始时间
       offset: 1, // 当前页
       limit: 20, // 每页多少条
       ids: checkoutList.value,
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 8666957..37ac73f 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -137,7 +137,7 @@
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  distributeDialogRef.value.initDialog(row.id, row.sampleId, row.orderId)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId, row.sampleStatus)
 }
 // 点击标签绑定
 const barCodeBind = ref()
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 807ea30..4e4eb46 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -37,11 +37,21 @@
   { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
   { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
 ])
-
+// 时间变更
+watch(trainTime, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 查询列表
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.startTime = trainTime.value[0] || ''
-  listQuery.value.endTime = trainTime.value[1] || ''
+  // listQuery.value.startTime = trainTime.value[0] || ''
+  // listQuery.value.endTime = trainTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2f7c1d0..bccde84 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -139,7 +139,17 @@
     id: '2', // 后端规定已收入传2
   })
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -147,8 +157,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.sampleStatus = active.value
   getInterChangeList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IinterchangeList) => {
@@ -280,7 +290,7 @@
       else if (type === 'delete') { // 无需检测
         interchangeStatusChange({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '7' }).then((res) => {
           if (res.code === 200) {
-            ElMessage.success(`已${title}`)
+            ElMessage.success('操作成功')
             fetchData(true)
           }
         })
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList.vue b/src/views/business/schedule/interchangeReceipt/receiptList.vue
index 275a053..83d93f4 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptList.vue
@@ -42,7 +42,17 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -50,8 +60,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getReceiptList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -124,13 +134,13 @@
   })
   if (list.value.length > 0) {
     const params = {
-      interchangeCode: '', // 交接单编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      reciever: '', // 接收人
-      deliverer: '', // 送样人
-      startTime: '', // 交接开始时间
-      endTime: '', // 交接结束时间
+      interchangeCode: listQuery.value.interchangeCode, // 交接单编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      reciever: listQuery.value.reciever, // 接收人
+      deliverer: listQuery.value.deliverer, // 送样人
+      startTime: listQuery.value.startTime, // 交接开始时间
+      endTime: listQuery.value.endTime, // 交接结束时间
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index cf0b532..f2fc852 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -26,8 +26,8 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   deliverer: '', // 送样人
-  isUrgent: 2, // 是否加急 2全部 1是 0否
-  status: 0, // 接收状态
+  isUrgent: '', // 是否加急 2全部 1是 0否
+  status: '', // 接收状态
   offset: 1,
   limit: 20,
 })
@@ -70,11 +70,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    isUrgentMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 2, // 是否加急全部后端定为2
-    })
+    // isUrgentMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 2, // 是否加急全部后端定为2
+    // })
   })
   // 接收状态
   getDictByCode('orderStatus').then((response) => {
@@ -85,11 +85,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    statusMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 0,
-    })
+    // statusMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 0,
+    // })
     console.log(statusMap.value)
   })
 }
@@ -125,8 +125,8 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     deliverer: '', // 送样人
-    isUrgent: 2, // 是否加急
-    status: 0, // 接收状态
+    isUrgent: '', // 是否加急 2全部 1是 0否
+    status: '', // 接收状态
     offset: 1,
     limit: 20,
   }
@@ -191,12 +191,12 @@
   })
   if (list.value.length > 0) {
     const params = {
-      orderCode: '', // 委托书编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      deliverer: '', // 送样人
-      isUrgent: 2, // 是否加急
-      status: 0, // 接收状态
+      orderCode: listQuery.value.orderCode, // 委托书编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      deliverer: listQuery.value.deliverer, // 送样人
+      isUrgent: listQuery.value.isUrgent, // 是否加急
+      status: listQuery.value.status, // 接收状态
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 2d92da9..14cd1ce 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -6,7 +6,7 @@
   customerName: string // 委托方名称
   deliverer: string // 送样人
   isUrgent: number | string // 是否加急
-  status: number // 接收状态
+  status: number | string// 接收状态
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 50308c7..25c5cf9 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -53,6 +53,7 @@
   handOutProperty: string // 分发性质-初次分发、退回分发
   id?: string // 实验室id
   customerId?: string // 客户id
+  certificationState?: string // 证书出具
 }
 
 // 实验室检测/我的检测列表
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index 7c17365..7159350 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -1,6 +1,6 @@
 <!-- 任务分发 -->
 <script lang="ts" setup name="TaskEdit">
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
 import ProcessConfig from './components/processConfig.vue'
@@ -11,6 +11,7 @@
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { UploadFile } from '@/api/measure/file'
 import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 interface dictType {
   id: string
@@ -251,16 +252,22 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    // UploadFile(fd).then((res) => {
-    //   if (res.code === 200) {
-    //     sampleForm.value.minioFileName = res.data[0]
-    //     // 重置当前验证
-    //     ElMessage.success('文件上传成功')
-    //   }
-    //   else {
-    //     ElMessage.error(res.message)
-    //   }
-    // })
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        sampleForm.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+        loading.close()
+      }
+      else {
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    })
   }
 }
 const upload = () => {
@@ -402,7 +409,7 @@
               <el-form-item label="校检类别:">
                 <el-select
                   v-model="sampleForm.measureCategory"
-                  :placeholder="roleType === 'detail' ? '' : '请选择校检类别'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择校检类别'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -424,7 +431,7 @@
               <el-form-item label="厂家国别:">
                 <el-select
                   v-model="sampleForm.manufacturerCountry"
-                  :placeholder="roleType === 'detail' ? '' : '请选择厂家国别'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择厂家国别'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -450,7 +457,7 @@
               <el-form-item label="ABC:">
                 <el-select
                   v-model="sampleForm.abc"
-                  :placeholder="roleType === 'detail' ? '' : '请选择ABC'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择ABC'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -504,8 +511,8 @@
               <el-form-item label="备注:">
                 <el-input
                   v-model="sampleForm.remark"
+                  autosize
                   type="textarea"
-                  :rows="2"
                   :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
                   :class="{ 'detail-input': roleType === 'detail' }"
@@ -516,7 +523,7 @@
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="sampleForm.measureType"
-                  :placeholder="roleType === 'detail' ? '' : '请选择检定方式'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择检定方式'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index dfbbf6a..6eeff55 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -81,7 +81,7 @@
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '165px' },
   { text: '样品属性', value: 'sampleBelongName', width: '100', align: 'center' },
   { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '90' },
-  { text: '证书出具', value: 'certificationState', align: 'center', width: '90', filter: (row: ITaskList) => { return `${row.alreadyCertifications}/${row.requireCertifications}` } },
+  { text: '证书出具', value: 'certificationState', align: 'center', width: '90' },
 ])
 // 表格数据
 const list = ref<ITaskList[]>([])
@@ -104,6 +104,7 @@
   getTaskList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: ITaskList) => {
       item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      item.certificationState = `${item.alreadyCertifications}/${item.requireCertifications}`
       return item
     })
     total.value = response.data.total
diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue
index e44dd67..194de53 100644
--- a/src/views/business/subpackage/apply/list.vue
+++ b/src/views/business/subpackage/apply/list.vue
@@ -302,7 +302,7 @@
         <search-item>
           <el-date-picker
             v-model="timeRange" type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="申请开始时间" end-placeholder="申请结束时间"
+            value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="申请开始时间" end-placeholder="申请结束时间" clearable
           />
         </search-item>
       </search-area>
diff --git a/src/views/business/subpackage/check/list.vue b/src/views/business/subpackage/check/list.vue
index 51ea419..a8b6744 100644
--- a/src/views/business/subpackage/check/list.vue
+++ b/src/views/business/subpackage/check/list.vue
@@ -111,8 +111,6 @@
 
 // 时间变更
 watch(timeRange, (val) => {
-  console.log(val[0])
-
   if (val) {
     listQuery.value.checkStartTime = `${val[0]}`
     listQuery.value.checkEndTime = `${val[1]}`
@@ -345,7 +343,8 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="timeRange" type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
+            v-model="timeRange"
+            clearable type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="验收开始时间" end-placeholder="验收结束时间"
           />
         </search-item>
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 98f4a39..a0db900 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -68,6 +68,7 @@
   else {
     listQuery.value.startTime = ''
     listQuery.value.endTime = ''
+    timeRange.value = ['', '']
   }
 })
 // 多选发生改变时
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index 6e41a94..ac98b8a 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -56,7 +56,17 @@
 const checkoutList = ref<string[]>([])
 // 文件上传input
 const fileRef = ref()
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -64,8 +74,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getSampleList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index 92e4b4a..6f465fc 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -67,7 +67,17 @@
     certificationStatusMap.value[`${item.value}`] = item.name
   })
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -75,8 +85,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getSampleList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IOvertimeList) => {
       return {
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index dbaa437..14464bf 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -86,6 +86,17 @@
     width: 160,
   },
 ]) // 表格
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 const fetchData = (isNowPage = false) => {
   loadingTable.value = true
@@ -93,8 +104,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.processResult = active.value
   getApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 60d1454..d0236cc 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -105,7 +105,17 @@
     align: 'center',
   },
 ])
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 const fetchData = (isNowPage = false) => {
   loadingTable.value = true
@@ -113,8 +123,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.approvalStatus = active.value
   getApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {

diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..9cf2b29 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -28,6 +28,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    DeptSelectByName: typeof import('./components/DeptSelectByName/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
diff --git a/src/views/business/board/standardReminder/list.vue b/src/views/business/board/standardReminder/list.vue
index 85efbb1..fd60743 100644
--- a/src/views/business/board/standardReminder/list.vue
+++ b/src/views/business/board/standardReminder/list.vue
@@ -94,12 +94,33 @@
 const preparation = ref<string>('')
 // 到期开始以及结束
 const validTime = ref<string>('')
+watch(preparation, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
+// 有效日期变更
+watch(validTime, (val) => {
+  if (val) {
+    listQuery.value.validStartTime = `${val[0]}`
+    listQuery.value.validEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.validStartTime = ''
+    listQuery.value.validEndTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.preparationStartDate = preparation.value[0] || ''
-  listQuery.value.preparationEndDate = preparation.value[1] || ''
-  listQuery.value.validStartTime = validTime.value[0] || ''
-  listQuery.value.validEndTime = validTime.value[1] || ''
+  // listQuery.value.preparationStartDate = preparation.value[0] || ''
+  // listQuery.value.preparationEndDate = preparation.value[1] || ''
+  // listQuery.value.validStartTime = validTime.value[0] || ''
+  // listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -223,16 +244,16 @@
   })
   if (list.value.length > 0) {
     const params = {
-      category: '', // 类别
-      id: '', // 主键id
-      managerState: '', // 管理状态
-      preparationEndDate: '', // 结束时间
-      preparationStartDate: '', // 开始时间
-      standardLaboratory: '', // 标准所在部门
-      standardName: '', // 标准名称
-      standardNo: '', // 标准编号
-      validEndTime: '', // 结束时间
-      validStartTime: '', // 开始时间
+      category: listQuery.value.category, // 类别
+      id: listQuery.value.id, // 主键id
+      managerState: listQuery.value.managerState, // 管理状态
+      preparationEndDate: listQuery.value.preparationEndDate, // 结束时间
+      preparationStartDate: listQuery.value.preparationStartDate, // 开始时间
+      standardLaboratory: listQuery.value.standardLaboratory, // 标准所在部门
+      standardName: listQuery.value.standardName, // 标准名称
+      standardNo: listQuery.value.standardNo, // 标准编号
+      validEndTime: listQuery.value.validEndTime, // 结束时间
+      validStartTime: listQuery.value.validStartTime, // 开始时间
       offset: 1, // 当前页
       limit: 20, // 每页多少条
       ids: checkoutList.value,
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 8666957..37ac73f 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -137,7 +137,7 @@
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  distributeDialogRef.value.initDialog(row.id, row.sampleId, row.orderId)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId, row.sampleStatus)
 }
 // 点击标签绑定
 const barCodeBind = ref()
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 807ea30..4e4eb46 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -37,11 +37,21 @@
   { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
   { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
 ])
-
+// 时间变更
+watch(trainTime, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 查询列表
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.startTime = trainTime.value[0] || ''
-  listQuery.value.endTime = trainTime.value[1] || ''
+  // listQuery.value.startTime = trainTime.value[0] || ''
+  // listQuery.value.endTime = trainTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2f7c1d0..bccde84 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -139,7 +139,17 @@
     id: '2', // 后端规定已收入传2
   })
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -147,8 +157,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.sampleStatus = active.value
   getInterChangeList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IinterchangeList) => {
@@ -280,7 +290,7 @@
       else if (type === 'delete') { // 无需检测
         interchangeStatusChange({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '7' }).then((res) => {
           if (res.code === 200) {
-            ElMessage.success(`已${title}`)
+            ElMessage.success('操作成功')
             fetchData(true)
           }
         })
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList.vue b/src/views/business/schedule/interchangeReceipt/receiptList.vue
index 275a053..83d93f4 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptList.vue
@@ -42,7 +42,17 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -50,8 +60,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getReceiptList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -124,13 +134,13 @@
   })
   if (list.value.length > 0) {
     const params = {
-      interchangeCode: '', // 交接单编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      reciever: '', // 接收人
-      deliverer: '', // 送样人
-      startTime: '', // 交接开始时间
-      endTime: '', // 交接结束时间
+      interchangeCode: listQuery.value.interchangeCode, // 交接单编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      reciever: listQuery.value.reciever, // 接收人
+      deliverer: listQuery.value.deliverer, // 送样人
+      startTime: listQuery.value.startTime, // 交接开始时间
+      endTime: listQuery.value.endTime, // 交接结束时间
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index cf0b532..f2fc852 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -26,8 +26,8 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   deliverer: '', // 送样人
-  isUrgent: 2, // 是否加急 2全部 1是 0否
-  status: 0, // 接收状态
+  isUrgent: '', // 是否加急 2全部 1是 0否
+  status: '', // 接收状态
   offset: 1,
   limit: 20,
 })
@@ -70,11 +70,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    isUrgentMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 2, // 是否加急全部后端定为2
-    })
+    // isUrgentMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 2, // 是否加急全部后端定为2
+    // })
   })
   // 接收状态
   getDictByCode('orderStatus').then((response) => {
@@ -85,11 +85,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    statusMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 0,
-    })
+    // statusMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 0,
+    // })
     console.log(statusMap.value)
   })
 }
@@ -125,8 +125,8 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     deliverer: '', // 送样人
-    isUrgent: 2, // 是否加急
-    status: 0, // 接收状态
+    isUrgent: '', // 是否加急 2全部 1是 0否
+    status: '', // 接收状态
     offset: 1,
     limit: 20,
   }
@@ -191,12 +191,12 @@
   })
   if (list.value.length > 0) {
     const params = {
-      orderCode: '', // 委托书编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      deliverer: '', // 送样人
-      isUrgent: 2, // 是否加急
-      status: 0, // 接收状态
+      orderCode: listQuery.value.orderCode, // 委托书编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      deliverer: listQuery.value.deliverer, // 送样人
+      isUrgent: listQuery.value.isUrgent, // 是否加急
+      status: listQuery.value.status, // 接收状态
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 2d92da9..14cd1ce 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -6,7 +6,7 @@
   customerName: string // 委托方名称
   deliverer: string // 送样人
   isUrgent: number | string // 是否加急
-  status: number // 接收状态
+  status: number | string// 接收状态
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 50308c7..25c5cf9 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -53,6 +53,7 @@
   handOutProperty: string // 分发性质-初次分发、退回分发
   id?: string // 实验室id
   customerId?: string // 客户id
+  certificationState?: string // 证书出具
 }
 
 // 实验室检测/我的检测列表
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index 7c17365..7159350 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -1,6 +1,6 @@
 <!-- 任务分发 -->
 <script lang="ts" setup name="TaskEdit">
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
 import ProcessConfig from './components/processConfig.vue'
@@ -11,6 +11,7 @@
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { UploadFile } from '@/api/measure/file'
 import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 interface dictType {
   id: string
@@ -251,16 +252,22 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    // UploadFile(fd).then((res) => {
-    //   if (res.code === 200) {
-    //     sampleForm.value.minioFileName = res.data[0]
-    //     // 重置当前验证
-    //     ElMessage.success('文件上传成功')
-    //   }
-    //   else {
-    //     ElMessage.error(res.message)
-    //   }
-    // })
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        sampleForm.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+        loading.close()
+      }
+      else {
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    })
   }
 }
 const upload = () => {
@@ -402,7 +409,7 @@
               <el-form-item label="校检类别:">
                 <el-select
                   v-model="sampleForm.measureCategory"
-                  :placeholder="roleType === 'detail' ? '' : '请选择校检类别'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择校检类别'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -424,7 +431,7 @@
               <el-form-item label="厂家国别:">
                 <el-select
                   v-model="sampleForm.manufacturerCountry"
-                  :placeholder="roleType === 'detail' ? '' : '请选择厂家国别'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择厂家国别'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -450,7 +457,7 @@
               <el-form-item label="ABC:">
                 <el-select
                   v-model="sampleForm.abc"
-                  :placeholder="roleType === 'detail' ? '' : '请选择ABC'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择ABC'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -504,8 +511,8 @@
               <el-form-item label="备注:">
                 <el-input
                   v-model="sampleForm.remark"
+                  autosize
                   type="textarea"
-                  :rows="2"
                   :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
                   :class="{ 'detail-input': roleType === 'detail' }"
@@ -516,7 +523,7 @@
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="sampleForm.measureType"
-                  :placeholder="roleType === 'detail' ? '' : '请选择检定方式'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择检定方式'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index dfbbf6a..6eeff55 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -81,7 +81,7 @@
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '165px' },
   { text: '样品属性', value: 'sampleBelongName', width: '100', align: 'center' },
   { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '90' },
-  { text: '证书出具', value: 'certificationState', align: 'center', width: '90', filter: (row: ITaskList) => { return `${row.alreadyCertifications}/${row.requireCertifications}` } },
+  { text: '证书出具', value: 'certificationState', align: 'center', width: '90' },
 ])
 // 表格数据
 const list = ref<ITaskList[]>([])
@@ -104,6 +104,7 @@
   getTaskList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: ITaskList) => {
       item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      item.certificationState = `${item.alreadyCertifications}/${item.requireCertifications}`
       return item
     })
     total.value = response.data.total
diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue
index e44dd67..194de53 100644
--- a/src/views/business/subpackage/apply/list.vue
+++ b/src/views/business/subpackage/apply/list.vue
@@ -302,7 +302,7 @@
         <search-item>
           <el-date-picker
             v-model="timeRange" type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="申请开始时间" end-placeholder="申请结束时间"
+            value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="申请开始时间" end-placeholder="申请结束时间" clearable
           />
         </search-item>
       </search-area>
diff --git a/src/views/business/subpackage/check/list.vue b/src/views/business/subpackage/check/list.vue
index 51ea419..a8b6744 100644
--- a/src/views/business/subpackage/check/list.vue
+++ b/src/views/business/subpackage/check/list.vue
@@ -111,8 +111,6 @@
 
 // 时间变更
 watch(timeRange, (val) => {
-  console.log(val[0])
-
   if (val) {
     listQuery.value.checkStartTime = `${val[0]}`
     listQuery.value.checkEndTime = `${val[1]}`
@@ -345,7 +343,8 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="timeRange" type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
+            v-model="timeRange"
+            clearable type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="验收开始时间" end-placeholder="验收结束时间"
           />
         </search-item>
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 98f4a39..a0db900 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -68,6 +68,7 @@
   else {
     listQuery.value.startTime = ''
     listQuery.value.endTime = ''
+    timeRange.value = ['', '']
   }
 })
 // 多选发生改变时
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index 6e41a94..ac98b8a 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -56,7 +56,17 @@
 const checkoutList = ref<string[]>([])
 // 文件上传input
 const fileRef = ref()
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -64,8 +74,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getSampleList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index 92e4b4a..6f465fc 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -67,7 +67,17 @@
     certificationStatusMap.value[`${item.value}`] = item.name
   })
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -75,8 +85,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getSampleList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IOvertimeList) => {
       return {
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index dbaa437..14464bf 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -86,6 +86,17 @@
     width: 160,
   },
 ]) // 表格
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 const fetchData = (isNowPage = false) => {
   loadingTable.value = true
@@ -93,8 +104,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.processResult = active.value
   getApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 60d1454..d0236cc 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -105,7 +105,17 @@
     align: 'center',
   },
 ])
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 const fetchData = (isNowPage = false) => {
   loadingTable.value = true
@@ -113,8 +123,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.approvalStatus = active.value
   getApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index aeb568e..5430b0f 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -103,10 +103,21 @@
 // 装载时间数组
 const checkTime = ref<string>('')
 const loadingTable = ref(false)
+// 时间变更
+watch(checkTime, (val) => {
+  if (val) {
+    listQuery.value.checkStartDate = `${val[0]}`
+    listQuery.value.checkEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.checkStartDate = ''
+    listQuery.value.checkEndDate = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.checkStartDate = checkTime.value[0] || ''
-  listQuery.value.checkEndDate = checkTime.value[1] || ''
+  // listQuery.value.checkStartDate = checkTime.value[0] || ''
+  // listQuery.value.checkEndDate = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页

diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..9cf2b29 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -28,6 +28,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    DeptSelectByName: typeof import('./components/DeptSelectByName/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
diff --git a/src/views/business/board/standardReminder/list.vue b/src/views/business/board/standardReminder/list.vue
index 85efbb1..fd60743 100644
--- a/src/views/business/board/standardReminder/list.vue
+++ b/src/views/business/board/standardReminder/list.vue
@@ -94,12 +94,33 @@
 const preparation = ref<string>('')
 // 到期开始以及结束
 const validTime = ref<string>('')
+watch(preparation, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
+// 有效日期变更
+watch(validTime, (val) => {
+  if (val) {
+    listQuery.value.validStartTime = `${val[0]}`
+    listQuery.value.validEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.validStartTime = ''
+    listQuery.value.validEndTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.preparationStartDate = preparation.value[0] || ''
-  listQuery.value.preparationEndDate = preparation.value[1] || ''
-  listQuery.value.validStartTime = validTime.value[0] || ''
-  listQuery.value.validEndTime = validTime.value[1] || ''
+  // listQuery.value.preparationStartDate = preparation.value[0] || ''
+  // listQuery.value.preparationEndDate = preparation.value[1] || ''
+  // listQuery.value.validStartTime = validTime.value[0] || ''
+  // listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -223,16 +244,16 @@
   })
   if (list.value.length > 0) {
     const params = {
-      category: '', // 类别
-      id: '', // 主键id
-      managerState: '', // 管理状态
-      preparationEndDate: '', // 结束时间
-      preparationStartDate: '', // 开始时间
-      standardLaboratory: '', // 标准所在部门
-      standardName: '', // 标准名称
-      standardNo: '', // 标准编号
-      validEndTime: '', // 结束时间
-      validStartTime: '', // 开始时间
+      category: listQuery.value.category, // 类别
+      id: listQuery.value.id, // 主键id
+      managerState: listQuery.value.managerState, // 管理状态
+      preparationEndDate: listQuery.value.preparationEndDate, // 结束时间
+      preparationStartDate: listQuery.value.preparationStartDate, // 开始时间
+      standardLaboratory: listQuery.value.standardLaboratory, // 标准所在部门
+      standardName: listQuery.value.standardName, // 标准名称
+      standardNo: listQuery.value.standardNo, // 标准编号
+      validEndTime: listQuery.value.validEndTime, // 结束时间
+      validStartTime: listQuery.value.validStartTime, // 开始时间
       offset: 1, // 当前页
       limit: 20, // 每页多少条
       ids: checkoutList.value,
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 8666957..37ac73f 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -137,7 +137,7 @@
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  distributeDialogRef.value.initDialog(row.id, row.sampleId, row.orderId)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId, row.sampleStatus)
 }
 // 点击标签绑定
 const barCodeBind = ref()
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 807ea30..4e4eb46 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -37,11 +37,21 @@
   { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
   { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
 ])
-
+// 时间变更
+watch(trainTime, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 查询列表
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.startTime = trainTime.value[0] || ''
-  listQuery.value.endTime = trainTime.value[1] || ''
+  // listQuery.value.startTime = trainTime.value[0] || ''
+  // listQuery.value.endTime = trainTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2f7c1d0..bccde84 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -139,7 +139,17 @@
     id: '2', // 后端规定已收入传2
   })
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -147,8 +157,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.sampleStatus = active.value
   getInterChangeList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IinterchangeList) => {
@@ -280,7 +290,7 @@
       else if (type === 'delete') { // 无需检测
         interchangeStatusChange({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '7' }).then((res) => {
           if (res.code === 200) {
-            ElMessage.success(`已${title}`)
+            ElMessage.success('操作成功')
             fetchData(true)
           }
         })
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList.vue b/src/views/business/schedule/interchangeReceipt/receiptList.vue
index 275a053..83d93f4 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptList.vue
@@ -42,7 +42,17 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -50,8 +60,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getReceiptList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -124,13 +134,13 @@
   })
   if (list.value.length > 0) {
     const params = {
-      interchangeCode: '', // 交接单编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      reciever: '', // 接收人
-      deliverer: '', // 送样人
-      startTime: '', // 交接开始时间
-      endTime: '', // 交接结束时间
+      interchangeCode: listQuery.value.interchangeCode, // 交接单编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      reciever: listQuery.value.reciever, // 接收人
+      deliverer: listQuery.value.deliverer, // 送样人
+      startTime: listQuery.value.startTime, // 交接开始时间
+      endTime: listQuery.value.endTime, // 交接结束时间
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index cf0b532..f2fc852 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -26,8 +26,8 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   deliverer: '', // 送样人
-  isUrgent: 2, // 是否加急 2全部 1是 0否
-  status: 0, // 接收状态
+  isUrgent: '', // 是否加急 2全部 1是 0否
+  status: '', // 接收状态
   offset: 1,
   limit: 20,
 })
@@ -70,11 +70,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    isUrgentMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 2, // 是否加急全部后端定为2
-    })
+    // isUrgentMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 2, // 是否加急全部后端定为2
+    // })
   })
   // 接收状态
   getDictByCode('orderStatus').then((response) => {
@@ -85,11 +85,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    statusMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 0,
-    })
+    // statusMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 0,
+    // })
     console.log(statusMap.value)
   })
 }
@@ -125,8 +125,8 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     deliverer: '', // 送样人
-    isUrgent: 2, // 是否加急
-    status: 0, // 接收状态
+    isUrgent: '', // 是否加急 2全部 1是 0否
+    status: '', // 接收状态
     offset: 1,
     limit: 20,
   }
@@ -191,12 +191,12 @@
   })
   if (list.value.length > 0) {
     const params = {
-      orderCode: '', // 委托书编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      deliverer: '', // 送样人
-      isUrgent: 2, // 是否加急
-      status: 0, // 接收状态
+      orderCode: listQuery.value.orderCode, // 委托书编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      deliverer: listQuery.value.deliverer, // 送样人
+      isUrgent: listQuery.value.isUrgent, // 是否加急
+      status: listQuery.value.status, // 接收状态
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 2d92da9..14cd1ce 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -6,7 +6,7 @@
   customerName: string // 委托方名称
   deliverer: string // 送样人
   isUrgent: number | string // 是否加急
-  status: number // 接收状态
+  status: number | string// 接收状态
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 50308c7..25c5cf9 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -53,6 +53,7 @@
   handOutProperty: string // 分发性质-初次分发、退回分发
   id?: string // 实验室id
   customerId?: string // 客户id
+  certificationState?: string // 证书出具
 }
 
 // 实验室检测/我的检测列表
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index 7c17365..7159350 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -1,6 +1,6 @@
 <!-- 任务分发 -->
 <script lang="ts" setup name="TaskEdit">
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
 import ProcessConfig from './components/processConfig.vue'
@@ -11,6 +11,7 @@
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { UploadFile } from '@/api/measure/file'
 import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 interface dictType {
   id: string
@@ -251,16 +252,22 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    // UploadFile(fd).then((res) => {
-    //   if (res.code === 200) {
-    //     sampleForm.value.minioFileName = res.data[0]
-    //     // 重置当前验证
-    //     ElMessage.success('文件上传成功')
-    //   }
-    //   else {
-    //     ElMessage.error(res.message)
-    //   }
-    // })
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        sampleForm.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+        loading.close()
+      }
+      else {
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    })
   }
 }
 const upload = () => {
@@ -402,7 +409,7 @@
               <el-form-item label="校检类别:">
                 <el-select
                   v-model="sampleForm.measureCategory"
-                  :placeholder="roleType === 'detail' ? '' : '请选择校检类别'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择校检类别'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -424,7 +431,7 @@
               <el-form-item label="厂家国别:">
                 <el-select
                   v-model="sampleForm.manufacturerCountry"
-                  :placeholder="roleType === 'detail' ? '' : '请选择厂家国别'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择厂家国别'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -450,7 +457,7 @@
               <el-form-item label="ABC:">
                 <el-select
                   v-model="sampleForm.abc"
-                  :placeholder="roleType === 'detail' ? '' : '请选择ABC'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择ABC'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -504,8 +511,8 @@
               <el-form-item label="备注:">
                 <el-input
                   v-model="sampleForm.remark"
+                  autosize
                   type="textarea"
-                  :rows="2"
                   :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
                   :class="{ 'detail-input': roleType === 'detail' }"
@@ -516,7 +523,7 @@
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="sampleForm.measureType"
-                  :placeholder="roleType === 'detail' ? '' : '请选择检定方式'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择检定方式'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index dfbbf6a..6eeff55 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -81,7 +81,7 @@
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '165px' },
   { text: '样品属性', value: 'sampleBelongName', width: '100', align: 'center' },
   { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '90' },
-  { text: '证书出具', value: 'certificationState', align: 'center', width: '90', filter: (row: ITaskList) => { return `${row.alreadyCertifications}/${row.requireCertifications}` } },
+  { text: '证书出具', value: 'certificationState', align: 'center', width: '90' },
 ])
 // 表格数据
 const list = ref<ITaskList[]>([])
@@ -104,6 +104,7 @@
   getTaskList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: ITaskList) => {
       item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      item.certificationState = `${item.alreadyCertifications}/${item.requireCertifications}`
       return item
     })
     total.value = response.data.total
diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue
index e44dd67..194de53 100644
--- a/src/views/business/subpackage/apply/list.vue
+++ b/src/views/business/subpackage/apply/list.vue
@@ -302,7 +302,7 @@
         <search-item>
           <el-date-picker
             v-model="timeRange" type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="申请开始时间" end-placeholder="申请结束时间"
+            value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="申请开始时间" end-placeholder="申请结束时间" clearable
           />
         </search-item>
       </search-area>
diff --git a/src/views/business/subpackage/check/list.vue b/src/views/business/subpackage/check/list.vue
index 51ea419..a8b6744 100644
--- a/src/views/business/subpackage/check/list.vue
+++ b/src/views/business/subpackage/check/list.vue
@@ -111,8 +111,6 @@
 
 // 时间变更
 watch(timeRange, (val) => {
-  console.log(val[0])
-
   if (val) {
     listQuery.value.checkStartTime = `${val[0]}`
     listQuery.value.checkEndTime = `${val[1]}`
@@ -345,7 +343,8 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="timeRange" type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
+            v-model="timeRange"
+            clearable type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="验收开始时间" end-placeholder="验收结束时间"
           />
         </search-item>
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 98f4a39..a0db900 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -68,6 +68,7 @@
   else {
     listQuery.value.startTime = ''
     listQuery.value.endTime = ''
+    timeRange.value = ['', '']
   }
 })
 // 多选发生改变时
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index 6e41a94..ac98b8a 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -56,7 +56,17 @@
 const checkoutList = ref<string[]>([])
 // 文件上传input
 const fileRef = ref()
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -64,8 +74,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getSampleList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index 92e4b4a..6f465fc 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -67,7 +67,17 @@
     certificationStatusMap.value[`${item.value}`] = item.name
   })
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -75,8 +85,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getSampleList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IOvertimeList) => {
       return {
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index dbaa437..14464bf 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -86,6 +86,17 @@
     width: 160,
   },
 ]) // 表格
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 const fetchData = (isNowPage = false) => {
   loadingTable.value = true
@@ -93,8 +104,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.processResult = active.value
   getApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 60d1454..d0236cc 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -105,7 +105,17 @@
     align: 'center',
   },
 ])
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 const fetchData = (isNowPage = false) => {
   loadingTable.value = true
@@ -113,8 +123,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.approvalStatus = active.value
   getApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index aeb568e..5430b0f 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -103,10 +103,21 @@
 // 装载时间数组
 const checkTime = ref<string>('')
 const loadingTable = ref(false)
+// 时间变更
+watch(checkTime, (val) => {
+  if (val) {
+    listQuery.value.checkStartDate = `${val[0]}`
+    listQuery.value.checkEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.checkStartDate = ''
+    listQuery.value.checkEndDate = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.checkStartDate = checkTime.value[0] || ''
-  listQuery.value.checkEndDate = checkTime.value[1] || ''
+  // listQuery.value.checkStartDate = checkTime.value[0] || ''
+  // listQuery.value.checkEndDate = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 6229abf..9d30934 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -112,10 +112,21 @@
 // 装载时间数组
 const checkTime = ref('')
 const loadingTable = ref(false)
+// 时间变更
+watch(checkTime, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.startTime = checkTime.value[0] || ''
-  listQuery.value.endTime = checkTime.value[1] || ''
+  // listQuery.value.startTime = checkTime.value[0] || ''
+  // listQuery.value.endTime = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页

diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..9cf2b29 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -28,6 +28,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    DeptSelectByName: typeof import('./components/DeptSelectByName/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
diff --git a/src/views/business/board/standardReminder/list.vue b/src/views/business/board/standardReminder/list.vue
index 85efbb1..fd60743 100644
--- a/src/views/business/board/standardReminder/list.vue
+++ b/src/views/business/board/standardReminder/list.vue
@@ -94,12 +94,33 @@
 const preparation = ref<string>('')
 // 到期开始以及结束
 const validTime = ref<string>('')
+watch(preparation, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
+// 有效日期变更
+watch(validTime, (val) => {
+  if (val) {
+    listQuery.value.validStartTime = `${val[0]}`
+    listQuery.value.validEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.validStartTime = ''
+    listQuery.value.validEndTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.preparationStartDate = preparation.value[0] || ''
-  listQuery.value.preparationEndDate = preparation.value[1] || ''
-  listQuery.value.validStartTime = validTime.value[0] || ''
-  listQuery.value.validEndTime = validTime.value[1] || ''
+  // listQuery.value.preparationStartDate = preparation.value[0] || ''
+  // listQuery.value.preparationEndDate = preparation.value[1] || ''
+  // listQuery.value.validStartTime = validTime.value[0] || ''
+  // listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -223,16 +244,16 @@
   })
   if (list.value.length > 0) {
     const params = {
-      category: '', // 类别
-      id: '', // 主键id
-      managerState: '', // 管理状态
-      preparationEndDate: '', // 结束时间
-      preparationStartDate: '', // 开始时间
-      standardLaboratory: '', // 标准所在部门
-      standardName: '', // 标准名称
-      standardNo: '', // 标准编号
-      validEndTime: '', // 结束时间
-      validStartTime: '', // 开始时间
+      category: listQuery.value.category, // 类别
+      id: listQuery.value.id, // 主键id
+      managerState: listQuery.value.managerState, // 管理状态
+      preparationEndDate: listQuery.value.preparationEndDate, // 结束时间
+      preparationStartDate: listQuery.value.preparationStartDate, // 开始时间
+      standardLaboratory: listQuery.value.standardLaboratory, // 标准所在部门
+      standardName: listQuery.value.standardName, // 标准名称
+      standardNo: listQuery.value.standardNo, // 标准编号
+      validEndTime: listQuery.value.validEndTime, // 结束时间
+      validStartTime: listQuery.value.validStartTime, // 开始时间
       offset: 1, // 当前页
       limit: 20, // 每页多少条
       ids: checkoutList.value,
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 8666957..37ac73f 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -137,7 +137,7 @@
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  distributeDialogRef.value.initDialog(row.id, row.sampleId, row.orderId)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId, row.sampleStatus)
 }
 // 点击标签绑定
 const barCodeBind = ref()
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 807ea30..4e4eb46 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -37,11 +37,21 @@
   { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
   { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
 ])
-
+// 时间变更
+watch(trainTime, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 查询列表
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.startTime = trainTime.value[0] || ''
-  listQuery.value.endTime = trainTime.value[1] || ''
+  // listQuery.value.startTime = trainTime.value[0] || ''
+  // listQuery.value.endTime = trainTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2f7c1d0..bccde84 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -139,7 +139,17 @@
     id: '2', // 后端规定已收入传2
   })
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -147,8 +157,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.sampleStatus = active.value
   getInterChangeList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IinterchangeList) => {
@@ -280,7 +290,7 @@
       else if (type === 'delete') { // 无需检测
         interchangeStatusChange({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '7' }).then((res) => {
           if (res.code === 200) {
-            ElMessage.success(`已${title}`)
+            ElMessage.success('操作成功')
             fetchData(true)
           }
         })
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList.vue b/src/views/business/schedule/interchangeReceipt/receiptList.vue
index 275a053..83d93f4 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptList.vue
@@ -42,7 +42,17 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -50,8 +60,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getReceiptList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -124,13 +134,13 @@
   })
   if (list.value.length > 0) {
     const params = {
-      interchangeCode: '', // 交接单编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      reciever: '', // 接收人
-      deliverer: '', // 送样人
-      startTime: '', // 交接开始时间
-      endTime: '', // 交接结束时间
+      interchangeCode: listQuery.value.interchangeCode, // 交接单编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      reciever: listQuery.value.reciever, // 接收人
+      deliverer: listQuery.value.deliverer, // 送样人
+      startTime: listQuery.value.startTime, // 交接开始时间
+      endTime: listQuery.value.endTime, // 交接结束时间
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index cf0b532..f2fc852 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -26,8 +26,8 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   deliverer: '', // 送样人
-  isUrgent: 2, // 是否加急 2全部 1是 0否
-  status: 0, // 接收状态
+  isUrgent: '', // 是否加急 2全部 1是 0否
+  status: '', // 接收状态
   offset: 1,
   limit: 20,
 })
@@ -70,11 +70,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    isUrgentMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 2, // 是否加急全部后端定为2
-    })
+    // isUrgentMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 2, // 是否加急全部后端定为2
+    // })
   })
   // 接收状态
   getDictByCode('orderStatus').then((response) => {
@@ -85,11 +85,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    statusMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 0,
-    })
+    // statusMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 0,
+    // })
     console.log(statusMap.value)
   })
 }
@@ -125,8 +125,8 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     deliverer: '', // 送样人
-    isUrgent: 2, // 是否加急
-    status: 0, // 接收状态
+    isUrgent: '', // 是否加急 2全部 1是 0否
+    status: '', // 接收状态
     offset: 1,
     limit: 20,
   }
@@ -191,12 +191,12 @@
   })
   if (list.value.length > 0) {
     const params = {
-      orderCode: '', // 委托书编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      deliverer: '', // 送样人
-      isUrgent: 2, // 是否加急
-      status: 0, // 接收状态
+      orderCode: listQuery.value.orderCode, // 委托书编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      deliverer: listQuery.value.deliverer, // 送样人
+      isUrgent: listQuery.value.isUrgent, // 是否加急
+      status: listQuery.value.status, // 接收状态
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 2d92da9..14cd1ce 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -6,7 +6,7 @@
   customerName: string // 委托方名称
   deliverer: string // 送样人
   isUrgent: number | string // 是否加急
-  status: number // 接收状态
+  status: number | string// 接收状态
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 50308c7..25c5cf9 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -53,6 +53,7 @@
   handOutProperty: string // 分发性质-初次分发、退回分发
   id?: string // 实验室id
   customerId?: string // 客户id
+  certificationState?: string // 证书出具
 }
 
 // 实验室检测/我的检测列表
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index 7c17365..7159350 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -1,6 +1,6 @@
 <!-- 任务分发 -->
 <script lang="ts" setup name="TaskEdit">
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
 import ProcessConfig from './components/processConfig.vue'
@@ -11,6 +11,7 @@
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { UploadFile } from '@/api/measure/file'
 import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 interface dictType {
   id: string
@@ -251,16 +252,22 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    // UploadFile(fd).then((res) => {
-    //   if (res.code === 200) {
-    //     sampleForm.value.minioFileName = res.data[0]
-    //     // 重置当前验证
-    //     ElMessage.success('文件上传成功')
-    //   }
-    //   else {
-    //     ElMessage.error(res.message)
-    //   }
-    // })
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        sampleForm.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+        loading.close()
+      }
+      else {
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    })
   }
 }
 const upload = () => {
@@ -402,7 +409,7 @@
               <el-form-item label="校检类别:">
                 <el-select
                   v-model="sampleForm.measureCategory"
-                  :placeholder="roleType === 'detail' ? '' : '请选择校检类别'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择校检类别'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -424,7 +431,7 @@
               <el-form-item label="厂家国别:">
                 <el-select
                   v-model="sampleForm.manufacturerCountry"
-                  :placeholder="roleType === 'detail' ? '' : '请选择厂家国别'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择厂家国别'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -450,7 +457,7 @@
               <el-form-item label="ABC:">
                 <el-select
                   v-model="sampleForm.abc"
-                  :placeholder="roleType === 'detail' ? '' : '请选择ABC'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择ABC'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -504,8 +511,8 @@
               <el-form-item label="备注:">
                 <el-input
                   v-model="sampleForm.remark"
+                  autosize
                   type="textarea"
-                  :rows="2"
                   :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
                   :class="{ 'detail-input': roleType === 'detail' }"
@@ -516,7 +523,7 @@
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="sampleForm.measureType"
-                  :placeholder="roleType === 'detail' ? '' : '请选择检定方式'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择检定方式'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index dfbbf6a..6eeff55 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -81,7 +81,7 @@
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '165px' },
   { text: '样品属性', value: 'sampleBelongName', width: '100', align: 'center' },
   { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '90' },
-  { text: '证书出具', value: 'certificationState', align: 'center', width: '90', filter: (row: ITaskList) => { return `${row.alreadyCertifications}/${row.requireCertifications}` } },
+  { text: '证书出具', value: 'certificationState', align: 'center', width: '90' },
 ])
 // 表格数据
 const list = ref<ITaskList[]>([])
@@ -104,6 +104,7 @@
   getTaskList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: ITaskList) => {
       item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      item.certificationState = `${item.alreadyCertifications}/${item.requireCertifications}`
       return item
     })
     total.value = response.data.total
diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue
index e44dd67..194de53 100644
--- a/src/views/business/subpackage/apply/list.vue
+++ b/src/views/business/subpackage/apply/list.vue
@@ -302,7 +302,7 @@
         <search-item>
           <el-date-picker
             v-model="timeRange" type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="申请开始时间" end-placeholder="申请结束时间"
+            value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="申请开始时间" end-placeholder="申请结束时间" clearable
           />
         </search-item>
       </search-area>
diff --git a/src/views/business/subpackage/check/list.vue b/src/views/business/subpackage/check/list.vue
index 51ea419..a8b6744 100644
--- a/src/views/business/subpackage/check/list.vue
+++ b/src/views/business/subpackage/check/list.vue
@@ -111,8 +111,6 @@
 
 // 时间变更
 watch(timeRange, (val) => {
-  console.log(val[0])
-
   if (val) {
     listQuery.value.checkStartTime = `${val[0]}`
     listQuery.value.checkEndTime = `${val[1]}`
@@ -345,7 +343,8 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="timeRange" type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
+            v-model="timeRange"
+            clearable type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="验收开始时间" end-placeholder="验收结束时间"
           />
         </search-item>
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 98f4a39..a0db900 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -68,6 +68,7 @@
   else {
     listQuery.value.startTime = ''
     listQuery.value.endTime = ''
+    timeRange.value = ['', '']
   }
 })
 // 多选发生改变时
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index 6e41a94..ac98b8a 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -56,7 +56,17 @@
 const checkoutList = ref<string[]>([])
 // 文件上传input
 const fileRef = ref()
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -64,8 +74,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getSampleList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index 92e4b4a..6f465fc 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -67,7 +67,17 @@
     certificationStatusMap.value[`${item.value}`] = item.name
   })
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -75,8 +85,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getSampleList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IOvertimeList) => {
       return {
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index dbaa437..14464bf 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -86,6 +86,17 @@
     width: 160,
   },
 ]) // 表格
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 const fetchData = (isNowPage = false) => {
   loadingTable.value = true
@@ -93,8 +104,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.processResult = active.value
   getApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 60d1454..d0236cc 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -105,7 +105,17 @@
     align: 'center',
   },
 ])
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 const fetchData = (isNowPage = false) => {
   loadingTable.value = true
@@ -113,8 +123,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.approvalStatus = active.value
   getApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index aeb568e..5430b0f 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -103,10 +103,21 @@
 // 装载时间数组
 const checkTime = ref<string>('')
 const loadingTable = ref(false)
+// 时间变更
+watch(checkTime, (val) => {
+  if (val) {
+    listQuery.value.checkStartDate = `${val[0]}`
+    listQuery.value.checkEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.checkStartDate = ''
+    listQuery.value.checkEndDate = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.checkStartDate = checkTime.value[0] || ''
-  listQuery.value.checkEndDate = checkTime.value[1] || ''
+  // listQuery.value.checkStartDate = checkTime.value[0] || ''
+  // listQuery.value.checkEndDate = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 6229abf..9d30934 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -112,10 +112,21 @@
 // 装载时间数组
 const checkTime = ref('')
 const loadingTable = ref(false)
+// 时间变更
+watch(checkTime, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.startTime = checkTime.value[0] || ''
-  listQuery.value.endTime = checkTime.value[1] || ''
+  // listQuery.value.startTime = checkTime.value[0] || ''
+  // listQuery.value.endTime = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index daca294..de18467 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -66,6 +66,17 @@
 const checkoutList = ref<IManageChecklist[]>([])
 // 文件上传input
 const fileRef = ref()
+// 时间变更
+watch(checkDate, (val) => {
+  if (val) {
+    listQuery.value.checkStartDate = `${val[0]}`
+    listQuery.value.checkEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.checkStartDate = ''
+    listQuery.value.checkEndDate = ''
+  }
+})
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
@@ -73,8 +84,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.checkStartDate = checkDate.value[0] || ''
-  listQuery.value.checkEndDate = checkDate.value[1] || ''
+  // listQuery.value.checkStartDate = checkDate.value[0] || ''
+  // listQuery.value.checkEndDate = checkDate.value[1] || ''
   getcheckInfoList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: any) => {
       return {

diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..9cf2b29 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -28,6 +28,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    DeptSelectByName: typeof import('./components/DeptSelectByName/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
diff --git a/src/views/business/board/standardReminder/list.vue b/src/views/business/board/standardReminder/list.vue
index 85efbb1..fd60743 100644
--- a/src/views/business/board/standardReminder/list.vue
+++ b/src/views/business/board/standardReminder/list.vue
@@ -94,12 +94,33 @@
 const preparation = ref<string>('')
 // 到期开始以及结束
 const validTime = ref<string>('')
+watch(preparation, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
+// 有效日期变更
+watch(validTime, (val) => {
+  if (val) {
+    listQuery.value.validStartTime = `${val[0]}`
+    listQuery.value.validEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.validStartTime = ''
+    listQuery.value.validEndTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.preparationStartDate = preparation.value[0] || ''
-  listQuery.value.preparationEndDate = preparation.value[1] || ''
-  listQuery.value.validStartTime = validTime.value[0] || ''
-  listQuery.value.validEndTime = validTime.value[1] || ''
+  // listQuery.value.preparationStartDate = preparation.value[0] || ''
+  // listQuery.value.preparationEndDate = preparation.value[1] || ''
+  // listQuery.value.validStartTime = validTime.value[0] || ''
+  // listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -223,16 +244,16 @@
   })
   if (list.value.length > 0) {
     const params = {
-      category: '', // 类别
-      id: '', // 主键id
-      managerState: '', // 管理状态
-      preparationEndDate: '', // 结束时间
-      preparationStartDate: '', // 开始时间
-      standardLaboratory: '', // 标准所在部门
-      standardName: '', // 标准名称
-      standardNo: '', // 标准编号
-      validEndTime: '', // 结束时间
-      validStartTime: '', // 开始时间
+      category: listQuery.value.category, // 类别
+      id: listQuery.value.id, // 主键id
+      managerState: listQuery.value.managerState, // 管理状态
+      preparationEndDate: listQuery.value.preparationEndDate, // 结束时间
+      preparationStartDate: listQuery.value.preparationStartDate, // 开始时间
+      standardLaboratory: listQuery.value.standardLaboratory, // 标准所在部门
+      standardName: listQuery.value.standardName, // 标准名称
+      standardNo: listQuery.value.standardNo, // 标准编号
+      validEndTime: listQuery.value.validEndTime, // 结束时间
+      validStartTime: listQuery.value.validStartTime, // 开始时间
       offset: 1, // 当前页
       limit: 20, // 每页多少条
       ids: checkoutList.value,
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 8666957..37ac73f 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -137,7 +137,7 @@
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  distributeDialogRef.value.initDialog(row.id, row.sampleId, row.orderId)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId, row.sampleStatus)
 }
 // 点击标签绑定
 const barCodeBind = ref()
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 807ea30..4e4eb46 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -37,11 +37,21 @@
   { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
   { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
 ])
-
+// 时间变更
+watch(trainTime, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 查询列表
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.startTime = trainTime.value[0] || ''
-  listQuery.value.endTime = trainTime.value[1] || ''
+  // listQuery.value.startTime = trainTime.value[0] || ''
+  // listQuery.value.endTime = trainTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2f7c1d0..bccde84 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -139,7 +139,17 @@
     id: '2', // 后端规定已收入传2
   })
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -147,8 +157,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.sampleStatus = active.value
   getInterChangeList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IinterchangeList) => {
@@ -280,7 +290,7 @@
       else if (type === 'delete') { // 无需检测
         interchangeStatusChange({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '7' }).then((res) => {
           if (res.code === 200) {
-            ElMessage.success(`已${title}`)
+            ElMessage.success('操作成功')
             fetchData(true)
           }
         })
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList.vue b/src/views/business/schedule/interchangeReceipt/receiptList.vue
index 275a053..83d93f4 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptList.vue
@@ -42,7 +42,17 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -50,8 +60,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getReceiptList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -124,13 +134,13 @@
   })
   if (list.value.length > 0) {
     const params = {
-      interchangeCode: '', // 交接单编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      reciever: '', // 接收人
-      deliverer: '', // 送样人
-      startTime: '', // 交接开始时间
-      endTime: '', // 交接结束时间
+      interchangeCode: listQuery.value.interchangeCode, // 交接单编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      reciever: listQuery.value.reciever, // 接收人
+      deliverer: listQuery.value.deliverer, // 送样人
+      startTime: listQuery.value.startTime, // 交接开始时间
+      endTime: listQuery.value.endTime, // 交接结束时间
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index cf0b532..f2fc852 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -26,8 +26,8 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   deliverer: '', // 送样人
-  isUrgent: 2, // 是否加急 2全部 1是 0否
-  status: 0, // 接收状态
+  isUrgent: '', // 是否加急 2全部 1是 0否
+  status: '', // 接收状态
   offset: 1,
   limit: 20,
 })
@@ -70,11 +70,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    isUrgentMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 2, // 是否加急全部后端定为2
-    })
+    // isUrgentMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 2, // 是否加急全部后端定为2
+    // })
   })
   // 接收状态
   getDictByCode('orderStatus').then((response) => {
@@ -85,11 +85,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    statusMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 0,
-    })
+    // statusMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 0,
+    // })
     console.log(statusMap.value)
   })
 }
@@ -125,8 +125,8 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     deliverer: '', // 送样人
-    isUrgent: 2, // 是否加急
-    status: 0, // 接收状态
+    isUrgent: '', // 是否加急 2全部 1是 0否
+    status: '', // 接收状态
     offset: 1,
     limit: 20,
   }
@@ -191,12 +191,12 @@
   })
   if (list.value.length > 0) {
     const params = {
-      orderCode: '', // 委托书编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      deliverer: '', // 送样人
-      isUrgent: 2, // 是否加急
-      status: 0, // 接收状态
+      orderCode: listQuery.value.orderCode, // 委托书编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      deliverer: listQuery.value.deliverer, // 送样人
+      isUrgent: listQuery.value.isUrgent, // 是否加急
+      status: listQuery.value.status, // 接收状态
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 2d92da9..14cd1ce 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -6,7 +6,7 @@
   customerName: string // 委托方名称
   deliverer: string // 送样人
   isUrgent: number | string // 是否加急
-  status: number // 接收状态
+  status: number | string// 接收状态
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 50308c7..25c5cf9 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -53,6 +53,7 @@
   handOutProperty: string // 分发性质-初次分发、退回分发
   id?: string // 实验室id
   customerId?: string // 客户id
+  certificationState?: string // 证书出具
 }
 
 // 实验室检测/我的检测列表
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index 7c17365..7159350 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -1,6 +1,6 @@
 <!-- 任务分发 -->
 <script lang="ts" setup name="TaskEdit">
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
 import ProcessConfig from './components/processConfig.vue'
@@ -11,6 +11,7 @@
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { UploadFile } from '@/api/measure/file'
 import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 interface dictType {
   id: string
@@ -251,16 +252,22 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    // UploadFile(fd).then((res) => {
-    //   if (res.code === 200) {
-    //     sampleForm.value.minioFileName = res.data[0]
-    //     // 重置当前验证
-    //     ElMessage.success('文件上传成功')
-    //   }
-    //   else {
-    //     ElMessage.error(res.message)
-    //   }
-    // })
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        sampleForm.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+        loading.close()
+      }
+      else {
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    })
   }
 }
 const upload = () => {
@@ -402,7 +409,7 @@
               <el-form-item label="校检类别:">
                 <el-select
                   v-model="sampleForm.measureCategory"
-                  :placeholder="roleType === 'detail' ? '' : '请选择校检类别'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择校检类别'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -424,7 +431,7 @@
               <el-form-item label="厂家国别:">
                 <el-select
                   v-model="sampleForm.manufacturerCountry"
-                  :placeholder="roleType === 'detail' ? '' : '请选择厂家国别'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择厂家国别'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -450,7 +457,7 @@
               <el-form-item label="ABC:">
                 <el-select
                   v-model="sampleForm.abc"
-                  :placeholder="roleType === 'detail' ? '' : '请选择ABC'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择ABC'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -504,8 +511,8 @@
               <el-form-item label="备注:">
                 <el-input
                   v-model="sampleForm.remark"
+                  autosize
                   type="textarea"
-                  :rows="2"
                   :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
                   :class="{ 'detail-input': roleType === 'detail' }"
@@ -516,7 +523,7 @@
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="sampleForm.measureType"
-                  :placeholder="roleType === 'detail' ? '' : '请选择检定方式'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择检定方式'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index dfbbf6a..6eeff55 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -81,7 +81,7 @@
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '165px' },
   { text: '样品属性', value: 'sampleBelongName', width: '100', align: 'center' },
   { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '90' },
-  { text: '证书出具', value: 'certificationState', align: 'center', width: '90', filter: (row: ITaskList) => { return `${row.alreadyCertifications}/${row.requireCertifications}` } },
+  { text: '证书出具', value: 'certificationState', align: 'center', width: '90' },
 ])
 // 表格数据
 const list = ref<ITaskList[]>([])
@@ -104,6 +104,7 @@
   getTaskList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: ITaskList) => {
       item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      item.certificationState = `${item.alreadyCertifications}/${item.requireCertifications}`
       return item
     })
     total.value = response.data.total
diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue
index e44dd67..194de53 100644
--- a/src/views/business/subpackage/apply/list.vue
+++ b/src/views/business/subpackage/apply/list.vue
@@ -302,7 +302,7 @@
         <search-item>
           <el-date-picker
             v-model="timeRange" type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="申请开始时间" end-placeholder="申请结束时间"
+            value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="申请开始时间" end-placeholder="申请结束时间" clearable
           />
         </search-item>
       </search-area>
diff --git a/src/views/business/subpackage/check/list.vue b/src/views/business/subpackage/check/list.vue
index 51ea419..a8b6744 100644
--- a/src/views/business/subpackage/check/list.vue
+++ b/src/views/business/subpackage/check/list.vue
@@ -111,8 +111,6 @@
 
 // 时间变更
 watch(timeRange, (val) => {
-  console.log(val[0])
-
   if (val) {
     listQuery.value.checkStartTime = `${val[0]}`
     listQuery.value.checkEndTime = `${val[1]}`
@@ -345,7 +343,8 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="timeRange" type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
+            v-model="timeRange"
+            clearable type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="验收开始时间" end-placeholder="验收结束时间"
           />
         </search-item>
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 98f4a39..a0db900 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -68,6 +68,7 @@
   else {
     listQuery.value.startTime = ''
     listQuery.value.endTime = ''
+    timeRange.value = ['', '']
   }
 })
 // 多选发生改变时
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index 6e41a94..ac98b8a 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -56,7 +56,17 @@
 const checkoutList = ref<string[]>([])
 // 文件上传input
 const fileRef = ref()
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -64,8 +74,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getSampleList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index 92e4b4a..6f465fc 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -67,7 +67,17 @@
     certificationStatusMap.value[`${item.value}`] = item.name
   })
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -75,8 +85,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getSampleList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IOvertimeList) => {
       return {
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index dbaa437..14464bf 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -86,6 +86,17 @@
     width: 160,
   },
 ]) // 表格
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 const fetchData = (isNowPage = false) => {
   loadingTable.value = true
@@ -93,8 +104,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.processResult = active.value
   getApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 60d1454..d0236cc 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -105,7 +105,17 @@
     align: 'center',
   },
 ])
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 const fetchData = (isNowPage = false) => {
   loadingTable.value = true
@@ -113,8 +123,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.approvalStatus = active.value
   getApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index aeb568e..5430b0f 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -103,10 +103,21 @@
 // 装载时间数组
 const checkTime = ref<string>('')
 const loadingTable = ref(false)
+// 时间变更
+watch(checkTime, (val) => {
+  if (val) {
+    listQuery.value.checkStartDate = `${val[0]}`
+    listQuery.value.checkEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.checkStartDate = ''
+    listQuery.value.checkEndDate = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.checkStartDate = checkTime.value[0] || ''
-  listQuery.value.checkEndDate = checkTime.value[1] || ''
+  // listQuery.value.checkStartDate = checkTime.value[0] || ''
+  // listQuery.value.checkEndDate = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 6229abf..9d30934 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -112,10 +112,21 @@
 // 装载时间数组
 const checkTime = ref('')
 const loadingTable = ref(false)
+// 时间变更
+watch(checkTime, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.startTime = checkTime.value[0] || ''
-  listQuery.value.endTime = checkTime.value[1] || ''
+  // listQuery.value.startTime = checkTime.value[0] || ''
+  // listQuery.value.endTime = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index daca294..de18467 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -66,6 +66,17 @@
 const checkoutList = ref<IManageChecklist[]>([])
 // 文件上传input
 const fileRef = ref()
+// 时间变更
+watch(checkDate, (val) => {
+  if (val) {
+    listQuery.value.checkStartDate = `${val[0]}`
+    listQuery.value.checkEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.checkStartDate = ''
+    listQuery.value.checkEndDate = ''
+  }
+})
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
@@ -73,8 +84,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.checkStartDate = checkDate.value[0] || ''
-  listQuery.value.checkEndDate = checkDate.value[1] || ''
+  // listQuery.value.checkStartDate = checkDate.value[0] || ''
+  // listQuery.value.checkEndDate = checkDate.value[1] || ''
   getcheckInfoList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: any) => {
       return {
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 00d283c..50b014c 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -99,6 +99,17 @@
     approvalStatusReserveMap.value[item.name] = `${item.value}`
   })
 }
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -106,8 +117,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.approvalStatus = active.value
   getReceiveApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {

diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..9cf2b29 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -28,6 +28,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    DeptSelectByName: typeof import('./components/DeptSelectByName/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
diff --git a/src/views/business/board/standardReminder/list.vue b/src/views/business/board/standardReminder/list.vue
index 85efbb1..fd60743 100644
--- a/src/views/business/board/standardReminder/list.vue
+++ b/src/views/business/board/standardReminder/list.vue
@@ -94,12 +94,33 @@
 const preparation = ref<string>('')
 // 到期开始以及结束
 const validTime = ref<string>('')
+watch(preparation, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
+// 有效日期变更
+watch(validTime, (val) => {
+  if (val) {
+    listQuery.value.validStartTime = `${val[0]}`
+    listQuery.value.validEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.validStartTime = ''
+    listQuery.value.validEndTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.preparationStartDate = preparation.value[0] || ''
-  listQuery.value.preparationEndDate = preparation.value[1] || ''
-  listQuery.value.validStartTime = validTime.value[0] || ''
-  listQuery.value.validEndTime = validTime.value[1] || ''
+  // listQuery.value.preparationStartDate = preparation.value[0] || ''
+  // listQuery.value.preparationEndDate = preparation.value[1] || ''
+  // listQuery.value.validStartTime = validTime.value[0] || ''
+  // listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -223,16 +244,16 @@
   })
   if (list.value.length > 0) {
     const params = {
-      category: '', // 类别
-      id: '', // 主键id
-      managerState: '', // 管理状态
-      preparationEndDate: '', // 结束时间
-      preparationStartDate: '', // 开始时间
-      standardLaboratory: '', // 标准所在部门
-      standardName: '', // 标准名称
-      standardNo: '', // 标准编号
-      validEndTime: '', // 结束时间
-      validStartTime: '', // 开始时间
+      category: listQuery.value.category, // 类别
+      id: listQuery.value.id, // 主键id
+      managerState: listQuery.value.managerState, // 管理状态
+      preparationEndDate: listQuery.value.preparationEndDate, // 结束时间
+      preparationStartDate: listQuery.value.preparationStartDate, // 开始时间
+      standardLaboratory: listQuery.value.standardLaboratory, // 标准所在部门
+      standardName: listQuery.value.standardName, // 标准名称
+      standardNo: listQuery.value.standardNo, // 标准编号
+      validEndTime: listQuery.value.validEndTime, // 结束时间
+      validStartTime: listQuery.value.validStartTime, // 开始时间
       offset: 1, // 当前页
       limit: 20, // 每页多少条
       ids: checkoutList.value,
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 8666957..37ac73f 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -137,7 +137,7 @@
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  distributeDialogRef.value.initDialog(row.id, row.sampleId, row.orderId)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId, row.sampleStatus)
 }
 // 点击标签绑定
 const barCodeBind = ref()
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 807ea30..4e4eb46 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -37,11 +37,21 @@
   { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
   { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
 ])
-
+// 时间变更
+watch(trainTime, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 查询列表
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.startTime = trainTime.value[0] || ''
-  listQuery.value.endTime = trainTime.value[1] || ''
+  // listQuery.value.startTime = trainTime.value[0] || ''
+  // listQuery.value.endTime = trainTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2f7c1d0..bccde84 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -139,7 +139,17 @@
     id: '2', // 后端规定已收入传2
   })
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -147,8 +157,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.sampleStatus = active.value
   getInterChangeList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IinterchangeList) => {
@@ -280,7 +290,7 @@
       else if (type === 'delete') { // 无需检测
         interchangeStatusChange({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '7' }).then((res) => {
           if (res.code === 200) {
-            ElMessage.success(`已${title}`)
+            ElMessage.success('操作成功')
             fetchData(true)
           }
         })
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList.vue b/src/views/business/schedule/interchangeReceipt/receiptList.vue
index 275a053..83d93f4 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptList.vue
@@ -42,7 +42,17 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -50,8 +60,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getReceiptList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -124,13 +134,13 @@
   })
   if (list.value.length > 0) {
     const params = {
-      interchangeCode: '', // 交接单编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      reciever: '', // 接收人
-      deliverer: '', // 送样人
-      startTime: '', // 交接开始时间
-      endTime: '', // 交接结束时间
+      interchangeCode: listQuery.value.interchangeCode, // 交接单编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      reciever: listQuery.value.reciever, // 接收人
+      deliverer: listQuery.value.deliverer, // 送样人
+      startTime: listQuery.value.startTime, // 交接开始时间
+      endTime: listQuery.value.endTime, // 交接结束时间
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index cf0b532..f2fc852 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -26,8 +26,8 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   deliverer: '', // 送样人
-  isUrgent: 2, // 是否加急 2全部 1是 0否
-  status: 0, // 接收状态
+  isUrgent: '', // 是否加急 2全部 1是 0否
+  status: '', // 接收状态
   offset: 1,
   limit: 20,
 })
@@ -70,11 +70,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    isUrgentMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 2, // 是否加急全部后端定为2
-    })
+    // isUrgentMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 2, // 是否加急全部后端定为2
+    // })
   })
   // 接收状态
   getDictByCode('orderStatus').then((response) => {
@@ -85,11 +85,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    statusMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 0,
-    })
+    // statusMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 0,
+    // })
     console.log(statusMap.value)
   })
 }
@@ -125,8 +125,8 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     deliverer: '', // 送样人
-    isUrgent: 2, // 是否加急
-    status: 0, // 接收状态
+    isUrgent: '', // 是否加急 2全部 1是 0否
+    status: '', // 接收状态
     offset: 1,
     limit: 20,
   }
@@ -191,12 +191,12 @@
   })
   if (list.value.length > 0) {
     const params = {
-      orderCode: '', // 委托书编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      deliverer: '', // 送样人
-      isUrgent: 2, // 是否加急
-      status: 0, // 接收状态
+      orderCode: listQuery.value.orderCode, // 委托书编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      deliverer: listQuery.value.deliverer, // 送样人
+      isUrgent: listQuery.value.isUrgent, // 是否加急
+      status: listQuery.value.status, // 接收状态
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 2d92da9..14cd1ce 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -6,7 +6,7 @@
   customerName: string // 委托方名称
   deliverer: string // 送样人
   isUrgent: number | string // 是否加急
-  status: number // 接收状态
+  status: number | string// 接收状态
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 50308c7..25c5cf9 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -53,6 +53,7 @@
   handOutProperty: string // 分发性质-初次分发、退回分发
   id?: string // 实验室id
   customerId?: string // 客户id
+  certificationState?: string // 证书出具
 }
 
 // 实验室检测/我的检测列表
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index 7c17365..7159350 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -1,6 +1,6 @@
 <!-- 任务分发 -->
 <script lang="ts" setup name="TaskEdit">
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
 import ProcessConfig from './components/processConfig.vue'
@@ -11,6 +11,7 @@
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { UploadFile } from '@/api/measure/file'
 import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 interface dictType {
   id: string
@@ -251,16 +252,22 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    // UploadFile(fd).then((res) => {
-    //   if (res.code === 200) {
-    //     sampleForm.value.minioFileName = res.data[0]
-    //     // 重置当前验证
-    //     ElMessage.success('文件上传成功')
-    //   }
-    //   else {
-    //     ElMessage.error(res.message)
-    //   }
-    // })
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        sampleForm.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+        loading.close()
+      }
+      else {
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    })
   }
 }
 const upload = () => {
@@ -402,7 +409,7 @@
               <el-form-item label="校检类别:">
                 <el-select
                   v-model="sampleForm.measureCategory"
-                  :placeholder="roleType === 'detail' ? '' : '请选择校检类别'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择校检类别'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -424,7 +431,7 @@
               <el-form-item label="厂家国别:">
                 <el-select
                   v-model="sampleForm.manufacturerCountry"
-                  :placeholder="roleType === 'detail' ? '' : '请选择厂家国别'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择厂家国别'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -450,7 +457,7 @@
               <el-form-item label="ABC:">
                 <el-select
                   v-model="sampleForm.abc"
-                  :placeholder="roleType === 'detail' ? '' : '请选择ABC'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择ABC'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -504,8 +511,8 @@
               <el-form-item label="备注:">
                 <el-input
                   v-model="sampleForm.remark"
+                  autosize
                   type="textarea"
-                  :rows="2"
                   :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
                   :class="{ 'detail-input': roleType === 'detail' }"
@@ -516,7 +523,7 @@
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="sampleForm.measureType"
-                  :placeholder="roleType === 'detail' ? '' : '请选择检定方式'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择检定方式'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index dfbbf6a..6eeff55 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -81,7 +81,7 @@
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '165px' },
   { text: '样品属性', value: 'sampleBelongName', width: '100', align: 'center' },
   { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '90' },
-  { text: '证书出具', value: 'certificationState', align: 'center', width: '90', filter: (row: ITaskList) => { return `${row.alreadyCertifications}/${row.requireCertifications}` } },
+  { text: '证书出具', value: 'certificationState', align: 'center', width: '90' },
 ])
 // 表格数据
 const list = ref<ITaskList[]>([])
@@ -104,6 +104,7 @@
   getTaskList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: ITaskList) => {
       item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      item.certificationState = `${item.alreadyCertifications}/${item.requireCertifications}`
       return item
     })
     total.value = response.data.total
diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue
index e44dd67..194de53 100644
--- a/src/views/business/subpackage/apply/list.vue
+++ b/src/views/business/subpackage/apply/list.vue
@@ -302,7 +302,7 @@
         <search-item>
           <el-date-picker
             v-model="timeRange" type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="申请开始时间" end-placeholder="申请结束时间"
+            value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="申请开始时间" end-placeholder="申请结束时间" clearable
           />
         </search-item>
       </search-area>
diff --git a/src/views/business/subpackage/check/list.vue b/src/views/business/subpackage/check/list.vue
index 51ea419..a8b6744 100644
--- a/src/views/business/subpackage/check/list.vue
+++ b/src/views/business/subpackage/check/list.vue
@@ -111,8 +111,6 @@
 
 // 时间变更
 watch(timeRange, (val) => {
-  console.log(val[0])
-
   if (val) {
     listQuery.value.checkStartTime = `${val[0]}`
     listQuery.value.checkEndTime = `${val[1]}`
@@ -345,7 +343,8 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="timeRange" type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
+            v-model="timeRange"
+            clearable type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="验收开始时间" end-placeholder="验收结束时间"
           />
         </search-item>
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 98f4a39..a0db900 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -68,6 +68,7 @@
   else {
     listQuery.value.startTime = ''
     listQuery.value.endTime = ''
+    timeRange.value = ['', '']
   }
 })
 // 多选发生改变时
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index 6e41a94..ac98b8a 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -56,7 +56,17 @@
 const checkoutList = ref<string[]>([])
 // 文件上传input
 const fileRef = ref()
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -64,8 +74,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getSampleList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index 92e4b4a..6f465fc 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -67,7 +67,17 @@
     certificationStatusMap.value[`${item.value}`] = item.name
   })
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -75,8 +85,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getSampleList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IOvertimeList) => {
       return {
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index dbaa437..14464bf 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -86,6 +86,17 @@
     width: 160,
   },
 ]) // 表格
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 const fetchData = (isNowPage = false) => {
   loadingTable.value = true
@@ -93,8 +104,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.processResult = active.value
   getApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 60d1454..d0236cc 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -105,7 +105,17 @@
     align: 'center',
   },
 ])
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 const fetchData = (isNowPage = false) => {
   loadingTable.value = true
@@ -113,8 +123,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.approvalStatus = active.value
   getApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index aeb568e..5430b0f 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -103,10 +103,21 @@
 // 装载时间数组
 const checkTime = ref<string>('')
 const loadingTable = ref(false)
+// 时间变更
+watch(checkTime, (val) => {
+  if (val) {
+    listQuery.value.checkStartDate = `${val[0]}`
+    listQuery.value.checkEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.checkStartDate = ''
+    listQuery.value.checkEndDate = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.checkStartDate = checkTime.value[0] || ''
-  listQuery.value.checkEndDate = checkTime.value[1] || ''
+  // listQuery.value.checkStartDate = checkTime.value[0] || ''
+  // listQuery.value.checkEndDate = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 6229abf..9d30934 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -112,10 +112,21 @@
 // 装载时间数组
 const checkTime = ref('')
 const loadingTable = ref(false)
+// 时间变更
+watch(checkTime, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.startTime = checkTime.value[0] || ''
-  listQuery.value.endTime = checkTime.value[1] || ''
+  // listQuery.value.startTime = checkTime.value[0] || ''
+  // listQuery.value.endTime = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index daca294..de18467 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -66,6 +66,17 @@
 const checkoutList = ref<IManageChecklist[]>([])
 // 文件上传input
 const fileRef = ref()
+// 时间变更
+watch(checkDate, (val) => {
+  if (val) {
+    listQuery.value.checkStartDate = `${val[0]}`
+    listQuery.value.checkEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.checkStartDate = ''
+    listQuery.value.checkEndDate = ''
+  }
+})
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
@@ -73,8 +84,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.checkStartDate = checkDate.value[0] || ''
-  listQuery.value.checkEndDate = checkDate.value[1] || ''
+  // listQuery.value.checkStartDate = checkDate.value[0] || ''
+  // listQuery.value.checkEndDate = checkDate.value[1] || ''
   getcheckInfoList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: any) => {
       return {
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 00d283c..50b014c 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -99,6 +99,17 @@
     approvalStatusReserveMap.value[item.name] = `${item.value}`
   })
 }
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -106,8 +117,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.approvalStatus = active.value
   getReceiveApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/receive/solve/solveList.vue b/src/views/device/receive/solve/solveList.vue
index 809c0c1..ec1e8bb 100644
--- a/src/views/device/receive/solve/solveList.vue
+++ b/src/views/device/receive/solve/solveList.vue
@@ -120,7 +120,17 @@
   timeRange.value = ['', ''] // 把时间选择框置空
   fetchData(true)
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -128,8 +138,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getReceiveApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IsolveListType) => {
       return {

diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..9cf2b29 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -28,6 +28,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    DeptSelectByName: typeof import('./components/DeptSelectByName/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
diff --git a/src/views/business/board/standardReminder/list.vue b/src/views/business/board/standardReminder/list.vue
index 85efbb1..fd60743 100644
--- a/src/views/business/board/standardReminder/list.vue
+++ b/src/views/business/board/standardReminder/list.vue
@@ -94,12 +94,33 @@
 const preparation = ref<string>('')
 // 到期开始以及结束
 const validTime = ref<string>('')
+watch(preparation, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
+// 有效日期变更
+watch(validTime, (val) => {
+  if (val) {
+    listQuery.value.validStartTime = `${val[0]}`
+    listQuery.value.validEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.validStartTime = ''
+    listQuery.value.validEndTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.preparationStartDate = preparation.value[0] || ''
-  listQuery.value.preparationEndDate = preparation.value[1] || ''
-  listQuery.value.validStartTime = validTime.value[0] || ''
-  listQuery.value.validEndTime = validTime.value[1] || ''
+  // listQuery.value.preparationStartDate = preparation.value[0] || ''
+  // listQuery.value.preparationEndDate = preparation.value[1] || ''
+  // listQuery.value.validStartTime = validTime.value[0] || ''
+  // listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -223,16 +244,16 @@
   })
   if (list.value.length > 0) {
     const params = {
-      category: '', // 类别
-      id: '', // 主键id
-      managerState: '', // 管理状态
-      preparationEndDate: '', // 结束时间
-      preparationStartDate: '', // 开始时间
-      standardLaboratory: '', // 标准所在部门
-      standardName: '', // 标准名称
-      standardNo: '', // 标准编号
-      validEndTime: '', // 结束时间
-      validStartTime: '', // 开始时间
+      category: listQuery.value.category, // 类别
+      id: listQuery.value.id, // 主键id
+      managerState: listQuery.value.managerState, // 管理状态
+      preparationEndDate: listQuery.value.preparationEndDate, // 结束时间
+      preparationStartDate: listQuery.value.preparationStartDate, // 开始时间
+      standardLaboratory: listQuery.value.standardLaboratory, // 标准所在部门
+      standardName: listQuery.value.standardName, // 标准名称
+      standardNo: listQuery.value.standardNo, // 标准编号
+      validEndTime: listQuery.value.validEndTime, // 结束时间
+      validStartTime: listQuery.value.validStartTime, // 开始时间
       offset: 1, // 当前页
       limit: 20, // 每页多少条
       ids: checkoutList.value,
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 8666957..37ac73f 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -137,7 +137,7 @@
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  distributeDialogRef.value.initDialog(row.id, row.sampleId, row.orderId)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId, row.sampleStatus)
 }
 // 点击标签绑定
 const barCodeBind = ref()
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 807ea30..4e4eb46 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -37,11 +37,21 @@
   { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
   { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
 ])
-
+// 时间变更
+watch(trainTime, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 查询列表
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.startTime = trainTime.value[0] || ''
-  listQuery.value.endTime = trainTime.value[1] || ''
+  // listQuery.value.startTime = trainTime.value[0] || ''
+  // listQuery.value.endTime = trainTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2f7c1d0..bccde84 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -139,7 +139,17 @@
     id: '2', // 后端规定已收入传2
   })
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -147,8 +157,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.sampleStatus = active.value
   getInterChangeList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IinterchangeList) => {
@@ -280,7 +290,7 @@
       else if (type === 'delete') { // 无需检测
         interchangeStatusChange({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '7' }).then((res) => {
           if (res.code === 200) {
-            ElMessage.success(`已${title}`)
+            ElMessage.success('操作成功')
             fetchData(true)
           }
         })
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList.vue b/src/views/business/schedule/interchangeReceipt/receiptList.vue
index 275a053..83d93f4 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptList.vue
@@ -42,7 +42,17 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -50,8 +60,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getReceiptList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -124,13 +134,13 @@
   })
   if (list.value.length > 0) {
     const params = {
-      interchangeCode: '', // 交接单编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      reciever: '', // 接收人
-      deliverer: '', // 送样人
-      startTime: '', // 交接开始时间
-      endTime: '', // 交接结束时间
+      interchangeCode: listQuery.value.interchangeCode, // 交接单编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      reciever: listQuery.value.reciever, // 接收人
+      deliverer: listQuery.value.deliverer, // 送样人
+      startTime: listQuery.value.startTime, // 交接开始时间
+      endTime: listQuery.value.endTime, // 交接结束时间
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index cf0b532..f2fc852 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -26,8 +26,8 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   deliverer: '', // 送样人
-  isUrgent: 2, // 是否加急 2全部 1是 0否
-  status: 0, // 接收状态
+  isUrgent: '', // 是否加急 2全部 1是 0否
+  status: '', // 接收状态
   offset: 1,
   limit: 20,
 })
@@ -70,11 +70,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    isUrgentMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 2, // 是否加急全部后端定为2
-    })
+    // isUrgentMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 2, // 是否加急全部后端定为2
+    // })
   })
   // 接收状态
   getDictByCode('orderStatus').then((response) => {
@@ -85,11 +85,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    statusMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 0,
-    })
+    // statusMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 0,
+    // })
     console.log(statusMap.value)
   })
 }
@@ -125,8 +125,8 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     deliverer: '', // 送样人
-    isUrgent: 2, // 是否加急
-    status: 0, // 接收状态
+    isUrgent: '', // 是否加急 2全部 1是 0否
+    status: '', // 接收状态
     offset: 1,
     limit: 20,
   }
@@ -191,12 +191,12 @@
   })
   if (list.value.length > 0) {
     const params = {
-      orderCode: '', // 委托书编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      deliverer: '', // 送样人
-      isUrgent: 2, // 是否加急
-      status: 0, // 接收状态
+      orderCode: listQuery.value.orderCode, // 委托书编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      deliverer: listQuery.value.deliverer, // 送样人
+      isUrgent: listQuery.value.isUrgent, // 是否加急
+      status: listQuery.value.status, // 接收状态
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 2d92da9..14cd1ce 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -6,7 +6,7 @@
   customerName: string // 委托方名称
   deliverer: string // 送样人
   isUrgent: number | string // 是否加急
-  status: number // 接收状态
+  status: number | string// 接收状态
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 50308c7..25c5cf9 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -53,6 +53,7 @@
   handOutProperty: string // 分发性质-初次分发、退回分发
   id?: string // 实验室id
   customerId?: string // 客户id
+  certificationState?: string // 证书出具
 }
 
 // 实验室检测/我的检测列表
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index 7c17365..7159350 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -1,6 +1,6 @@
 <!-- 任务分发 -->
 <script lang="ts" setup name="TaskEdit">
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
 import ProcessConfig from './components/processConfig.vue'
@@ -11,6 +11,7 @@
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { UploadFile } from '@/api/measure/file'
 import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 interface dictType {
   id: string
@@ -251,16 +252,22 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    // UploadFile(fd).then((res) => {
-    //   if (res.code === 200) {
-    //     sampleForm.value.minioFileName = res.data[0]
-    //     // 重置当前验证
-    //     ElMessage.success('文件上传成功')
-    //   }
-    //   else {
-    //     ElMessage.error(res.message)
-    //   }
-    // })
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        sampleForm.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+        loading.close()
+      }
+      else {
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    })
   }
 }
 const upload = () => {
@@ -402,7 +409,7 @@
               <el-form-item label="校检类别:">
                 <el-select
                   v-model="sampleForm.measureCategory"
-                  :placeholder="roleType === 'detail' ? '' : '请选择校检类别'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择校检类别'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -424,7 +431,7 @@
               <el-form-item label="厂家国别:">
                 <el-select
                   v-model="sampleForm.manufacturerCountry"
-                  :placeholder="roleType === 'detail' ? '' : '请选择厂家国别'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择厂家国别'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -450,7 +457,7 @@
               <el-form-item label="ABC:">
                 <el-select
                   v-model="sampleForm.abc"
-                  :placeholder="roleType === 'detail' ? '' : '请选择ABC'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择ABC'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -504,8 +511,8 @@
               <el-form-item label="备注:">
                 <el-input
                   v-model="sampleForm.remark"
+                  autosize
                   type="textarea"
-                  :rows="2"
                   :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
                   :class="{ 'detail-input': roleType === 'detail' }"
@@ -516,7 +523,7 @@
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="sampleForm.measureType"
-                  :placeholder="roleType === 'detail' ? '' : '请选择检定方式'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择检定方式'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index dfbbf6a..6eeff55 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -81,7 +81,7 @@
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '165px' },
   { text: '样品属性', value: 'sampleBelongName', width: '100', align: 'center' },
   { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '90' },
-  { text: '证书出具', value: 'certificationState', align: 'center', width: '90', filter: (row: ITaskList) => { return `${row.alreadyCertifications}/${row.requireCertifications}` } },
+  { text: '证书出具', value: 'certificationState', align: 'center', width: '90' },
 ])
 // 表格数据
 const list = ref<ITaskList[]>([])
@@ -104,6 +104,7 @@
   getTaskList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: ITaskList) => {
       item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      item.certificationState = `${item.alreadyCertifications}/${item.requireCertifications}`
       return item
     })
     total.value = response.data.total
diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue
index e44dd67..194de53 100644
--- a/src/views/business/subpackage/apply/list.vue
+++ b/src/views/business/subpackage/apply/list.vue
@@ -302,7 +302,7 @@
         <search-item>
           <el-date-picker
             v-model="timeRange" type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="申请开始时间" end-placeholder="申请结束时间"
+            value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="申请开始时间" end-placeholder="申请结束时间" clearable
           />
         </search-item>
       </search-area>
diff --git a/src/views/business/subpackage/check/list.vue b/src/views/business/subpackage/check/list.vue
index 51ea419..a8b6744 100644
--- a/src/views/business/subpackage/check/list.vue
+++ b/src/views/business/subpackage/check/list.vue
@@ -111,8 +111,6 @@
 
 // 时间变更
 watch(timeRange, (val) => {
-  console.log(val[0])
-
   if (val) {
     listQuery.value.checkStartTime = `${val[0]}`
     listQuery.value.checkEndTime = `${val[1]}`
@@ -345,7 +343,8 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="timeRange" type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
+            v-model="timeRange"
+            clearable type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="验收开始时间" end-placeholder="验收结束时间"
           />
         </search-item>
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 98f4a39..a0db900 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -68,6 +68,7 @@
   else {
     listQuery.value.startTime = ''
     listQuery.value.endTime = ''
+    timeRange.value = ['', '']
   }
 })
 // 多选发生改变时
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index 6e41a94..ac98b8a 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -56,7 +56,17 @@
 const checkoutList = ref<string[]>([])
 // 文件上传input
 const fileRef = ref()
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -64,8 +74,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getSampleList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index 92e4b4a..6f465fc 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -67,7 +67,17 @@
     certificationStatusMap.value[`${item.value}`] = item.name
   })
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -75,8 +85,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getSampleList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IOvertimeList) => {
       return {
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index dbaa437..14464bf 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -86,6 +86,17 @@
     width: 160,
   },
 ]) // 表格
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 const fetchData = (isNowPage = false) => {
   loadingTable.value = true
@@ -93,8 +104,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.processResult = active.value
   getApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 60d1454..d0236cc 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -105,7 +105,17 @@
     align: 'center',
   },
 ])
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 const fetchData = (isNowPage = false) => {
   loadingTable.value = true
@@ -113,8 +123,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.approvalStatus = active.value
   getApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index aeb568e..5430b0f 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -103,10 +103,21 @@
 // 装载时间数组
 const checkTime = ref<string>('')
 const loadingTable = ref(false)
+// 时间变更
+watch(checkTime, (val) => {
+  if (val) {
+    listQuery.value.checkStartDate = `${val[0]}`
+    listQuery.value.checkEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.checkStartDate = ''
+    listQuery.value.checkEndDate = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.checkStartDate = checkTime.value[0] || ''
-  listQuery.value.checkEndDate = checkTime.value[1] || ''
+  // listQuery.value.checkStartDate = checkTime.value[0] || ''
+  // listQuery.value.checkEndDate = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 6229abf..9d30934 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -112,10 +112,21 @@
 // 装载时间数组
 const checkTime = ref('')
 const loadingTable = ref(false)
+// 时间变更
+watch(checkTime, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.startTime = checkTime.value[0] || ''
-  listQuery.value.endTime = checkTime.value[1] || ''
+  // listQuery.value.startTime = checkTime.value[0] || ''
+  // listQuery.value.endTime = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index daca294..de18467 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -66,6 +66,17 @@
 const checkoutList = ref<IManageChecklist[]>([])
 // 文件上传input
 const fileRef = ref()
+// 时间变更
+watch(checkDate, (val) => {
+  if (val) {
+    listQuery.value.checkStartDate = `${val[0]}`
+    listQuery.value.checkEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.checkStartDate = ''
+    listQuery.value.checkEndDate = ''
+  }
+})
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
@@ -73,8 +84,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.checkStartDate = checkDate.value[0] || ''
-  listQuery.value.checkEndDate = checkDate.value[1] || ''
+  // listQuery.value.checkStartDate = checkDate.value[0] || ''
+  // listQuery.value.checkEndDate = checkDate.value[1] || ''
   getcheckInfoList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: any) => {
       return {
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 00d283c..50b014c 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -99,6 +99,17 @@
     approvalStatusReserveMap.value[item.name] = `${item.value}`
   })
 }
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -106,8 +117,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.approvalStatus = active.value
   getReceiveApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/receive/solve/solveList.vue b/src/views/device/receive/solve/solveList.vue
index 809c0c1..ec1e8bb 100644
--- a/src/views/device/receive/solve/solveList.vue
+++ b/src/views/device/receive/solve/solveList.vue
@@ -120,7 +120,17 @@
   timeRange.value = ['', ''] // 把时间选择框置空
   fetchData(true)
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -128,8 +138,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getReceiveApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IsolveListType) => {
       return {
diff --git a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
index 4744536..b4fe085 100644
--- a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
@@ -43,7 +43,12 @@
   select.value = -1
   listPageApi(listQuery.value).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows
+      list.value = res.data.rows.map((item: { effectiveStatusName: string }) => {
+        return {
+          ...item,
+          isDisabled: item.effectiveStatusName === '已废止',
+        }
+      })
       total.value = res.data.total
     }
   })
@@ -142,7 +147,7 @@
           </el-table-column>
           <el-table-column label="" width="55" align="center" fixed="left">
             <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
+              <el-radio v-model="select" :disabled="scope.row.isDisabled" :label="scope.$index" class="radio" />
             </template>
           </el-table-column>
         </template>

diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..9cf2b29 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -28,6 +28,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    DeptSelectByName: typeof import('./components/DeptSelectByName/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
diff --git a/src/views/business/board/standardReminder/list.vue b/src/views/business/board/standardReminder/list.vue
index 85efbb1..fd60743 100644
--- a/src/views/business/board/standardReminder/list.vue
+++ b/src/views/business/board/standardReminder/list.vue
@@ -94,12 +94,33 @@
 const preparation = ref<string>('')
 // 到期开始以及结束
 const validTime = ref<string>('')
+watch(preparation, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
+// 有效日期变更
+watch(validTime, (val) => {
+  if (val) {
+    listQuery.value.validStartTime = `${val[0]}`
+    listQuery.value.validEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.validStartTime = ''
+    listQuery.value.validEndTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.preparationStartDate = preparation.value[0] || ''
-  listQuery.value.preparationEndDate = preparation.value[1] || ''
-  listQuery.value.validStartTime = validTime.value[0] || ''
-  listQuery.value.validEndTime = validTime.value[1] || ''
+  // listQuery.value.preparationStartDate = preparation.value[0] || ''
+  // listQuery.value.preparationEndDate = preparation.value[1] || ''
+  // listQuery.value.validStartTime = validTime.value[0] || ''
+  // listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -223,16 +244,16 @@
   })
   if (list.value.length > 0) {
     const params = {
-      category: '', // 类别
-      id: '', // 主键id
-      managerState: '', // 管理状态
-      preparationEndDate: '', // 结束时间
-      preparationStartDate: '', // 开始时间
-      standardLaboratory: '', // 标准所在部门
-      standardName: '', // 标准名称
-      standardNo: '', // 标准编号
-      validEndTime: '', // 结束时间
-      validStartTime: '', // 开始时间
+      category: listQuery.value.category, // 类别
+      id: listQuery.value.id, // 主键id
+      managerState: listQuery.value.managerState, // 管理状态
+      preparationEndDate: listQuery.value.preparationEndDate, // 结束时间
+      preparationStartDate: listQuery.value.preparationStartDate, // 开始时间
+      standardLaboratory: listQuery.value.standardLaboratory, // 标准所在部门
+      standardName: listQuery.value.standardName, // 标准名称
+      standardNo: listQuery.value.standardNo, // 标准编号
+      validEndTime: listQuery.value.validEndTime, // 结束时间
+      validStartTime: listQuery.value.validStartTime, // 开始时间
       offset: 1, // 当前页
       limit: 20, // 每页多少条
       ids: checkoutList.value,
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 8666957..37ac73f 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -137,7 +137,7 @@
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  distributeDialogRef.value.initDialog(row.id, row.sampleId, row.orderId)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId, row.sampleStatus)
 }
 // 点击标签绑定
 const barCodeBind = ref()
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 807ea30..4e4eb46 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -37,11 +37,21 @@
   { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
   { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
 ])
-
+// 时间变更
+watch(trainTime, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 查询列表
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.startTime = trainTime.value[0] || ''
-  listQuery.value.endTime = trainTime.value[1] || ''
+  // listQuery.value.startTime = trainTime.value[0] || ''
+  // listQuery.value.endTime = trainTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2f7c1d0..bccde84 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -139,7 +139,17 @@
     id: '2', // 后端规定已收入传2
   })
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -147,8 +157,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.sampleStatus = active.value
   getInterChangeList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IinterchangeList) => {
@@ -280,7 +290,7 @@
       else if (type === 'delete') { // 无需检测
         interchangeStatusChange({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '7' }).then((res) => {
           if (res.code === 200) {
-            ElMessage.success(`已${title}`)
+            ElMessage.success('操作成功')
             fetchData(true)
           }
         })
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList.vue b/src/views/business/schedule/interchangeReceipt/receiptList.vue
index 275a053..83d93f4 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptList.vue
@@ -42,7 +42,17 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -50,8 +60,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getReceiptList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -124,13 +134,13 @@
   })
   if (list.value.length > 0) {
     const params = {
-      interchangeCode: '', // 交接单编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      reciever: '', // 接收人
-      deliverer: '', // 送样人
-      startTime: '', // 交接开始时间
-      endTime: '', // 交接结束时间
+      interchangeCode: listQuery.value.interchangeCode, // 交接单编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      reciever: listQuery.value.reciever, // 接收人
+      deliverer: listQuery.value.deliverer, // 送样人
+      startTime: listQuery.value.startTime, // 交接开始时间
+      endTime: listQuery.value.endTime, // 交接结束时间
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index cf0b532..f2fc852 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -26,8 +26,8 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   deliverer: '', // 送样人
-  isUrgent: 2, // 是否加急 2全部 1是 0否
-  status: 0, // 接收状态
+  isUrgent: '', // 是否加急 2全部 1是 0否
+  status: '', // 接收状态
   offset: 1,
   limit: 20,
 })
@@ -70,11 +70,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    isUrgentMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 2, // 是否加急全部后端定为2
-    })
+    // isUrgentMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 2, // 是否加急全部后端定为2
+    // })
   })
   // 接收状态
   getDictByCode('orderStatus').then((response) => {
@@ -85,11 +85,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    statusMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 0,
-    })
+    // statusMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 0,
+    // })
     console.log(statusMap.value)
   })
 }
@@ -125,8 +125,8 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     deliverer: '', // 送样人
-    isUrgent: 2, // 是否加急
-    status: 0, // 接收状态
+    isUrgent: '', // 是否加急 2全部 1是 0否
+    status: '', // 接收状态
     offset: 1,
     limit: 20,
   }
@@ -191,12 +191,12 @@
   })
   if (list.value.length > 0) {
     const params = {
-      orderCode: '', // 委托书编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      deliverer: '', // 送样人
-      isUrgent: 2, // 是否加急
-      status: 0, // 接收状态
+      orderCode: listQuery.value.orderCode, // 委托书编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      deliverer: listQuery.value.deliverer, // 送样人
+      isUrgent: listQuery.value.isUrgent, // 是否加急
+      status: listQuery.value.status, // 接收状态
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 2d92da9..14cd1ce 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -6,7 +6,7 @@
   customerName: string // 委托方名称
   deliverer: string // 送样人
   isUrgent: number | string // 是否加急
-  status: number // 接收状态
+  status: number | string// 接收状态
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 50308c7..25c5cf9 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -53,6 +53,7 @@
   handOutProperty: string // 分发性质-初次分发、退回分发
   id?: string // 实验室id
   customerId?: string // 客户id
+  certificationState?: string // 证书出具
 }
 
 // 实验室检测/我的检测列表
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index 7c17365..7159350 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -1,6 +1,6 @@
 <!-- 任务分发 -->
 <script lang="ts" setup name="TaskEdit">
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
 import ProcessConfig from './components/processConfig.vue'
@@ -11,6 +11,7 @@
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { UploadFile } from '@/api/measure/file'
 import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 interface dictType {
   id: string
@@ -251,16 +252,22 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    // UploadFile(fd).then((res) => {
-    //   if (res.code === 200) {
-    //     sampleForm.value.minioFileName = res.data[0]
-    //     // 重置当前验证
-    //     ElMessage.success('文件上传成功')
-    //   }
-    //   else {
-    //     ElMessage.error(res.message)
-    //   }
-    // })
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        sampleForm.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+        loading.close()
+      }
+      else {
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    })
   }
 }
 const upload = () => {
@@ -402,7 +409,7 @@
               <el-form-item label="校检类别:">
                 <el-select
                   v-model="sampleForm.measureCategory"
-                  :placeholder="roleType === 'detail' ? '' : '请选择校检类别'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择校检类别'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -424,7 +431,7 @@
               <el-form-item label="厂家国别:">
                 <el-select
                   v-model="sampleForm.manufacturerCountry"
-                  :placeholder="roleType === 'detail' ? '' : '请选择厂家国别'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择厂家国别'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -450,7 +457,7 @@
               <el-form-item label="ABC:">
                 <el-select
                   v-model="sampleForm.abc"
-                  :placeholder="roleType === 'detail' ? '' : '请选择ABC'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择ABC'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -504,8 +511,8 @@
               <el-form-item label="备注:">
                 <el-input
                   v-model="sampleForm.remark"
+                  autosize
                   type="textarea"
-                  :rows="2"
                   :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
                   :class="{ 'detail-input': roleType === 'detail' }"
@@ -516,7 +523,7 @@
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="sampleForm.measureType"
-                  :placeholder="roleType === 'detail' ? '' : '请选择检定方式'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择检定方式'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index dfbbf6a..6eeff55 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -81,7 +81,7 @@
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '165px' },
   { text: '样品属性', value: 'sampleBelongName', width: '100', align: 'center' },
   { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '90' },
-  { text: '证书出具', value: 'certificationState', align: 'center', width: '90', filter: (row: ITaskList) => { return `${row.alreadyCertifications}/${row.requireCertifications}` } },
+  { text: '证书出具', value: 'certificationState', align: 'center', width: '90' },
 ])
 // 表格数据
 const list = ref<ITaskList[]>([])
@@ -104,6 +104,7 @@
   getTaskList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: ITaskList) => {
       item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      item.certificationState = `${item.alreadyCertifications}/${item.requireCertifications}`
       return item
     })
     total.value = response.data.total
diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue
index e44dd67..194de53 100644
--- a/src/views/business/subpackage/apply/list.vue
+++ b/src/views/business/subpackage/apply/list.vue
@@ -302,7 +302,7 @@
         <search-item>
           <el-date-picker
             v-model="timeRange" type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="申请开始时间" end-placeholder="申请结束时间"
+            value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="申请开始时间" end-placeholder="申请结束时间" clearable
           />
         </search-item>
       </search-area>
diff --git a/src/views/business/subpackage/check/list.vue b/src/views/business/subpackage/check/list.vue
index 51ea419..a8b6744 100644
--- a/src/views/business/subpackage/check/list.vue
+++ b/src/views/business/subpackage/check/list.vue
@@ -111,8 +111,6 @@
 
 // 时间变更
 watch(timeRange, (val) => {
-  console.log(val[0])
-
   if (val) {
     listQuery.value.checkStartTime = `${val[0]}`
     listQuery.value.checkEndTime = `${val[1]}`
@@ -345,7 +343,8 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="timeRange" type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
+            v-model="timeRange"
+            clearable type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="验收开始时间" end-placeholder="验收结束时间"
           />
         </search-item>
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 98f4a39..a0db900 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -68,6 +68,7 @@
   else {
     listQuery.value.startTime = ''
     listQuery.value.endTime = ''
+    timeRange.value = ['', '']
   }
 })
 // 多选发生改变时
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index 6e41a94..ac98b8a 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -56,7 +56,17 @@
 const checkoutList = ref<string[]>([])
 // 文件上传input
 const fileRef = ref()
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -64,8 +74,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getSampleList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index 92e4b4a..6f465fc 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -67,7 +67,17 @@
     certificationStatusMap.value[`${item.value}`] = item.name
   })
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -75,8 +85,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getSampleList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IOvertimeList) => {
       return {
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index dbaa437..14464bf 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -86,6 +86,17 @@
     width: 160,
   },
 ]) // 表格
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 const fetchData = (isNowPage = false) => {
   loadingTable.value = true
@@ -93,8 +104,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.processResult = active.value
   getApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 60d1454..d0236cc 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -105,7 +105,17 @@
     align: 'center',
   },
 ])
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 const fetchData = (isNowPage = false) => {
   loadingTable.value = true
@@ -113,8 +123,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.approvalStatus = active.value
   getApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index aeb568e..5430b0f 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -103,10 +103,21 @@
 // 装载时间数组
 const checkTime = ref<string>('')
 const loadingTable = ref(false)
+// 时间变更
+watch(checkTime, (val) => {
+  if (val) {
+    listQuery.value.checkStartDate = `${val[0]}`
+    listQuery.value.checkEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.checkStartDate = ''
+    listQuery.value.checkEndDate = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.checkStartDate = checkTime.value[0] || ''
-  listQuery.value.checkEndDate = checkTime.value[1] || ''
+  // listQuery.value.checkStartDate = checkTime.value[0] || ''
+  // listQuery.value.checkEndDate = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 6229abf..9d30934 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -112,10 +112,21 @@
 // 装载时间数组
 const checkTime = ref('')
 const loadingTable = ref(false)
+// 时间变更
+watch(checkTime, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.startTime = checkTime.value[0] || ''
-  listQuery.value.endTime = checkTime.value[1] || ''
+  // listQuery.value.startTime = checkTime.value[0] || ''
+  // listQuery.value.endTime = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index daca294..de18467 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -66,6 +66,17 @@
 const checkoutList = ref<IManageChecklist[]>([])
 // 文件上传input
 const fileRef = ref()
+// 时间变更
+watch(checkDate, (val) => {
+  if (val) {
+    listQuery.value.checkStartDate = `${val[0]}`
+    listQuery.value.checkEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.checkStartDate = ''
+    listQuery.value.checkEndDate = ''
+  }
+})
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
@@ -73,8 +84,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.checkStartDate = checkDate.value[0] || ''
-  listQuery.value.checkEndDate = checkDate.value[1] || ''
+  // listQuery.value.checkStartDate = checkDate.value[0] || ''
+  // listQuery.value.checkEndDate = checkDate.value[1] || ''
   getcheckInfoList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: any) => {
       return {
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 00d283c..50b014c 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -99,6 +99,17 @@
     approvalStatusReserveMap.value[item.name] = `${item.value}`
   })
 }
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -106,8 +117,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.approvalStatus = active.value
   getReceiveApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/receive/solve/solveList.vue b/src/views/device/receive/solve/solveList.vue
index 809c0c1..ec1e8bb 100644
--- a/src/views/device/receive/solve/solveList.vue
+++ b/src/views/device/receive/solve/solveList.vue
@@ -120,7 +120,17 @@
   timeRange.value = ['', ''] // 把时间选择框置空
   fetchData(true)
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -128,8 +138,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getReceiveApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IsolveListType) => {
       return {
diff --git a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
index 4744536..b4fe085 100644
--- a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
@@ -43,7 +43,12 @@
   select.value = -1
   listPageApi(listQuery.value).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows
+      list.value = res.data.rows.map((item: { effectiveStatusName: string }) => {
+        return {
+          ...item,
+          isDisabled: item.effectiveStatusName === '已废止',
+        }
+      })
       total.value = res.data.total
     }
   })
@@ -142,7 +147,7 @@
           </el-table-column>
           <el-table-column label="" width="55" align="center" fixed="left">
             <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
+              <el-radio v-model="select" :disabled="scope.row.isDisabled" :label="scope.$index" class="radio" />
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index a030dcf..0dd5547 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -94,12 +94,34 @@
 const preparation = ref<string>('')
 // 到期开始以及结束
 const validTime = ref<string>('')
+// 筹建日期变更
+watch(preparation, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
+// 有效日期变更
+watch(validTime, (val) => {
+  if (val) {
+    listQuery.value.validStartTime = `${val[0]}`
+    listQuery.value.validEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.validStartTime = ''
+    listQuery.value.validEndTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.preparationStartDate = preparation.value[0] || ''
-  listQuery.value.preparationEndDate = preparation.value[1] || ''
-  listQuery.value.validStartTime = validTime.value[0] || ''
-  listQuery.value.validEndTime = validTime.value[1] || ''
+  // listQuery.value.preparationStartDate = preparation.value[0] || ''
+  // listQuery.value.preparationEndDate = preparation.value[1] || ''
+  // listQuery.value.validStartTime = validTime.value[0] || ''
+  // listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页

diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..9cf2b29 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -28,6 +28,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    DeptSelectByName: typeof import('./components/DeptSelectByName/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
diff --git a/src/views/business/board/standardReminder/list.vue b/src/views/business/board/standardReminder/list.vue
index 85efbb1..fd60743 100644
--- a/src/views/business/board/standardReminder/list.vue
+++ b/src/views/business/board/standardReminder/list.vue
@@ -94,12 +94,33 @@
 const preparation = ref<string>('')
 // 到期开始以及结束
 const validTime = ref<string>('')
+watch(preparation, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
+// 有效日期变更
+watch(validTime, (val) => {
+  if (val) {
+    listQuery.value.validStartTime = `${val[0]}`
+    listQuery.value.validEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.validStartTime = ''
+    listQuery.value.validEndTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.preparationStartDate = preparation.value[0] || ''
-  listQuery.value.preparationEndDate = preparation.value[1] || ''
-  listQuery.value.validStartTime = validTime.value[0] || ''
-  listQuery.value.validEndTime = validTime.value[1] || ''
+  // listQuery.value.preparationStartDate = preparation.value[0] || ''
+  // listQuery.value.preparationEndDate = preparation.value[1] || ''
+  // listQuery.value.validStartTime = validTime.value[0] || ''
+  // listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -223,16 +244,16 @@
   })
   if (list.value.length > 0) {
     const params = {
-      category: '', // 类别
-      id: '', // 主键id
-      managerState: '', // 管理状态
-      preparationEndDate: '', // 结束时间
-      preparationStartDate: '', // 开始时间
-      standardLaboratory: '', // 标准所在部门
-      standardName: '', // 标准名称
-      standardNo: '', // 标准编号
-      validEndTime: '', // 结束时间
-      validStartTime: '', // 开始时间
+      category: listQuery.value.category, // 类别
+      id: listQuery.value.id, // 主键id
+      managerState: listQuery.value.managerState, // 管理状态
+      preparationEndDate: listQuery.value.preparationEndDate, // 结束时间
+      preparationStartDate: listQuery.value.preparationStartDate, // 开始时间
+      standardLaboratory: listQuery.value.standardLaboratory, // 标准所在部门
+      standardName: listQuery.value.standardName, // 标准名称
+      standardNo: listQuery.value.standardNo, // 标准编号
+      validEndTime: listQuery.value.validEndTime, // 结束时间
+      validStartTime: listQuery.value.validStartTime, // 开始时间
       offset: 1, // 当前页
       limit: 20, // 每页多少条
       ids: checkoutList.value,
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 8666957..37ac73f 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -137,7 +137,7 @@
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  distributeDialogRef.value.initDialog(row.id, row.sampleId, row.orderId)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId, row.sampleStatus)
 }
 // 点击标签绑定
 const barCodeBind = ref()
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 807ea30..4e4eb46 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -37,11 +37,21 @@
   { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
   { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
 ])
-
+// 时间变更
+watch(trainTime, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 查询列表
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.startTime = trainTime.value[0] || ''
-  listQuery.value.endTime = trainTime.value[1] || ''
+  // listQuery.value.startTime = trainTime.value[0] || ''
+  // listQuery.value.endTime = trainTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2f7c1d0..bccde84 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -139,7 +139,17 @@
     id: '2', // 后端规定已收入传2
   })
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -147,8 +157,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.sampleStatus = active.value
   getInterChangeList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IinterchangeList) => {
@@ -280,7 +290,7 @@
       else if (type === 'delete') { // 无需检测
         interchangeStatusChange({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '7' }).then((res) => {
           if (res.code === 200) {
-            ElMessage.success(`已${title}`)
+            ElMessage.success('操作成功')
             fetchData(true)
           }
         })
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList.vue b/src/views/business/schedule/interchangeReceipt/receiptList.vue
index 275a053..83d93f4 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptList.vue
@@ -42,7 +42,17 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -50,8 +60,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getReceiptList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -124,13 +134,13 @@
   })
   if (list.value.length > 0) {
     const params = {
-      interchangeCode: '', // 交接单编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      reciever: '', // 接收人
-      deliverer: '', // 送样人
-      startTime: '', // 交接开始时间
-      endTime: '', // 交接结束时间
+      interchangeCode: listQuery.value.interchangeCode, // 交接单编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      reciever: listQuery.value.reciever, // 接收人
+      deliverer: listQuery.value.deliverer, // 送样人
+      startTime: listQuery.value.startTime, // 交接开始时间
+      endTime: listQuery.value.endTime, // 交接结束时间
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index cf0b532..f2fc852 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -26,8 +26,8 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   deliverer: '', // 送样人
-  isUrgent: 2, // 是否加急 2全部 1是 0否
-  status: 0, // 接收状态
+  isUrgent: '', // 是否加急 2全部 1是 0否
+  status: '', // 接收状态
   offset: 1,
   limit: 20,
 })
@@ -70,11 +70,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    isUrgentMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 2, // 是否加急全部后端定为2
-    })
+    // isUrgentMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 2, // 是否加急全部后端定为2
+    // })
   })
   // 接收状态
   getDictByCode('orderStatus').then((response) => {
@@ -85,11 +85,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    statusMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 0,
-    })
+    // statusMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 0,
+    // })
     console.log(statusMap.value)
   })
 }
@@ -125,8 +125,8 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     deliverer: '', // 送样人
-    isUrgent: 2, // 是否加急
-    status: 0, // 接收状态
+    isUrgent: '', // 是否加急 2全部 1是 0否
+    status: '', // 接收状态
     offset: 1,
     limit: 20,
   }
@@ -191,12 +191,12 @@
   })
   if (list.value.length > 0) {
     const params = {
-      orderCode: '', // 委托书编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      deliverer: '', // 送样人
-      isUrgent: 2, // 是否加急
-      status: 0, // 接收状态
+      orderCode: listQuery.value.orderCode, // 委托书编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      deliverer: listQuery.value.deliverer, // 送样人
+      isUrgent: listQuery.value.isUrgent, // 是否加急
+      status: listQuery.value.status, // 接收状态
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 2d92da9..14cd1ce 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -6,7 +6,7 @@
   customerName: string // 委托方名称
   deliverer: string // 送样人
   isUrgent: number | string // 是否加急
-  status: number // 接收状态
+  status: number | string// 接收状态
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 50308c7..25c5cf9 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -53,6 +53,7 @@
   handOutProperty: string // 分发性质-初次分发、退回分发
   id?: string // 实验室id
   customerId?: string // 客户id
+  certificationState?: string // 证书出具
 }
 
 // 实验室检测/我的检测列表
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index 7c17365..7159350 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -1,6 +1,6 @@
 <!-- 任务分发 -->
 <script lang="ts" setup name="TaskEdit">
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
 import ProcessConfig from './components/processConfig.vue'
@@ -11,6 +11,7 @@
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { UploadFile } from '@/api/measure/file'
 import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 interface dictType {
   id: string
@@ -251,16 +252,22 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    // UploadFile(fd).then((res) => {
-    //   if (res.code === 200) {
-    //     sampleForm.value.minioFileName = res.data[0]
-    //     // 重置当前验证
-    //     ElMessage.success('文件上传成功')
-    //   }
-    //   else {
-    //     ElMessage.error(res.message)
-    //   }
-    // })
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        sampleForm.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+        loading.close()
+      }
+      else {
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    })
   }
 }
 const upload = () => {
@@ -402,7 +409,7 @@
               <el-form-item label="校检类别:">
                 <el-select
                   v-model="sampleForm.measureCategory"
-                  :placeholder="roleType === 'detail' ? '' : '请选择校检类别'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择校检类别'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -424,7 +431,7 @@
               <el-form-item label="厂家国别:">
                 <el-select
                   v-model="sampleForm.manufacturerCountry"
-                  :placeholder="roleType === 'detail' ? '' : '请选择厂家国别'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择厂家国别'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -450,7 +457,7 @@
               <el-form-item label="ABC:">
                 <el-select
                   v-model="sampleForm.abc"
-                  :placeholder="roleType === 'detail' ? '' : '请选择ABC'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择ABC'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -504,8 +511,8 @@
               <el-form-item label="备注:">
                 <el-input
                   v-model="sampleForm.remark"
+                  autosize
                   type="textarea"
-                  :rows="2"
                   :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
                   :class="{ 'detail-input': roleType === 'detail' }"
@@ -516,7 +523,7 @@
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="sampleForm.measureType"
-                  :placeholder="roleType === 'detail' ? '' : '请选择检定方式'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择检定方式'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index dfbbf6a..6eeff55 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -81,7 +81,7 @@
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '165px' },
   { text: '样品属性', value: 'sampleBelongName', width: '100', align: 'center' },
   { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '90' },
-  { text: '证书出具', value: 'certificationState', align: 'center', width: '90', filter: (row: ITaskList) => { return `${row.alreadyCertifications}/${row.requireCertifications}` } },
+  { text: '证书出具', value: 'certificationState', align: 'center', width: '90' },
 ])
 // 表格数据
 const list = ref<ITaskList[]>([])
@@ -104,6 +104,7 @@
   getTaskList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: ITaskList) => {
       item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      item.certificationState = `${item.alreadyCertifications}/${item.requireCertifications}`
       return item
     })
     total.value = response.data.total
diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue
index e44dd67..194de53 100644
--- a/src/views/business/subpackage/apply/list.vue
+++ b/src/views/business/subpackage/apply/list.vue
@@ -302,7 +302,7 @@
         <search-item>
           <el-date-picker
             v-model="timeRange" type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="申请开始时间" end-placeholder="申请结束时间"
+            value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="申请开始时间" end-placeholder="申请结束时间" clearable
           />
         </search-item>
       </search-area>
diff --git a/src/views/business/subpackage/check/list.vue b/src/views/business/subpackage/check/list.vue
index 51ea419..a8b6744 100644
--- a/src/views/business/subpackage/check/list.vue
+++ b/src/views/business/subpackage/check/list.vue
@@ -111,8 +111,6 @@
 
 // 时间变更
 watch(timeRange, (val) => {
-  console.log(val[0])
-
   if (val) {
     listQuery.value.checkStartTime = `${val[0]}`
     listQuery.value.checkEndTime = `${val[1]}`
@@ -345,7 +343,8 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="timeRange" type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
+            v-model="timeRange"
+            clearable type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="验收开始时间" end-placeholder="验收结束时间"
           />
         </search-item>
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 98f4a39..a0db900 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -68,6 +68,7 @@
   else {
     listQuery.value.startTime = ''
     listQuery.value.endTime = ''
+    timeRange.value = ['', '']
   }
 })
 // 多选发生改变时
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index 6e41a94..ac98b8a 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -56,7 +56,17 @@
 const checkoutList = ref<string[]>([])
 // 文件上传input
 const fileRef = ref()
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -64,8 +74,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getSampleList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index 92e4b4a..6f465fc 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -67,7 +67,17 @@
     certificationStatusMap.value[`${item.value}`] = item.name
   })
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -75,8 +85,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getSampleList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IOvertimeList) => {
       return {
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index dbaa437..14464bf 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -86,6 +86,17 @@
     width: 160,
   },
 ]) // 表格
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 const fetchData = (isNowPage = false) => {
   loadingTable.value = true
@@ -93,8 +104,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.processResult = active.value
   getApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 60d1454..d0236cc 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -105,7 +105,17 @@
     align: 'center',
   },
 ])
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 const fetchData = (isNowPage = false) => {
   loadingTable.value = true
@@ -113,8 +123,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.approvalStatus = active.value
   getApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index aeb568e..5430b0f 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -103,10 +103,21 @@
 // 装载时间数组
 const checkTime = ref<string>('')
 const loadingTable = ref(false)
+// 时间变更
+watch(checkTime, (val) => {
+  if (val) {
+    listQuery.value.checkStartDate = `${val[0]}`
+    listQuery.value.checkEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.checkStartDate = ''
+    listQuery.value.checkEndDate = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.checkStartDate = checkTime.value[0] || ''
-  listQuery.value.checkEndDate = checkTime.value[1] || ''
+  // listQuery.value.checkStartDate = checkTime.value[0] || ''
+  // listQuery.value.checkEndDate = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 6229abf..9d30934 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -112,10 +112,21 @@
 // 装载时间数组
 const checkTime = ref('')
 const loadingTable = ref(false)
+// 时间变更
+watch(checkTime, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.startTime = checkTime.value[0] || ''
-  listQuery.value.endTime = checkTime.value[1] || ''
+  // listQuery.value.startTime = checkTime.value[0] || ''
+  // listQuery.value.endTime = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index daca294..de18467 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -66,6 +66,17 @@
 const checkoutList = ref<IManageChecklist[]>([])
 // 文件上传input
 const fileRef = ref()
+// 时间变更
+watch(checkDate, (val) => {
+  if (val) {
+    listQuery.value.checkStartDate = `${val[0]}`
+    listQuery.value.checkEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.checkStartDate = ''
+    listQuery.value.checkEndDate = ''
+  }
+})
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
@@ -73,8 +84,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.checkStartDate = checkDate.value[0] || ''
-  listQuery.value.checkEndDate = checkDate.value[1] || ''
+  // listQuery.value.checkStartDate = checkDate.value[0] || ''
+  // listQuery.value.checkEndDate = checkDate.value[1] || ''
   getcheckInfoList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: any) => {
       return {
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 00d283c..50b014c 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -99,6 +99,17 @@
     approvalStatusReserveMap.value[item.name] = `${item.value}`
   })
 }
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -106,8 +117,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.approvalStatus = active.value
   getReceiveApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/receive/solve/solveList.vue b/src/views/device/receive/solve/solveList.vue
index 809c0c1..ec1e8bb 100644
--- a/src/views/device/receive/solve/solveList.vue
+++ b/src/views/device/receive/solve/solveList.vue
@@ -120,7 +120,17 @@
   timeRange.value = ['', ''] // 把时间选择框置空
   fetchData(true)
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -128,8 +138,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getReceiveApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IsolveListType) => {
       return {
diff --git a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
index 4744536..b4fe085 100644
--- a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
@@ -43,7 +43,12 @@
   select.value = -1
   listPageApi(listQuery.value).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows
+      list.value = res.data.rows.map((item: { effectiveStatusName: string }) => {
+        return {
+          ...item,
+          isDisabled: item.effectiveStatusName === '已废止',
+        }
+      })
       total.value = res.data.total
     }
   })
@@ -142,7 +147,7 @@
           </el-table-column>
           <el-table-column label="" width="55" align="center" fixed="left">
             <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
+              <el-radio v-model="select" :disabled="scope.row.isDisabled" :label="scope.$index" class="radio" />
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index a030dcf..0dd5547 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -94,12 +94,34 @@
 const preparation = ref<string>('')
 // 到期开始以及结束
 const validTime = ref<string>('')
+// 筹建日期变更
+watch(preparation, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
+// 有效日期变更
+watch(validTime, (val) => {
+  if (val) {
+    listQuery.value.validStartTime = `${val[0]}`
+    listQuery.value.validEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.validStartTime = ''
+    listQuery.value.validEndTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.preparationStartDate = preparation.value[0] || ''
-  listQuery.value.preparationEndDate = preparation.value[1] || ''
-  listQuery.value.validStartTime = validTime.value[0] || ''
-  listQuery.value.validEndTime = validTime.value[1] || ''
+  // listQuery.value.preparationStartDate = preparation.value[0] || ''
+  // listQuery.value.preparationEndDate = preparation.value[1] || ''
+  // listQuery.value.validStartTime = validTime.value[0] || ''
+  // listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index 39d8683..bb69fe9 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -99,6 +99,17 @@
 const standardManagerStateList = ref<IOptions[]>([])
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
+// 时间变更
+watch(preparationDate, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
@@ -107,8 +118,8 @@
     listQuery.value.offset = 1
   }
   // 筹建日期
-  listQuery.value.preparationStartDate = preparationDate.value[0] || ''
-  listQuery.value.preparationEndDate = preparationDate.value[1] || ''
+  // listQuery.value.preparationStartDate = preparationDate.value[0] || ''
+  // listQuery.value.preparationEndDate = preparationDate.value[1] || ''
   getStandardList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: any) => {
       return {

diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..9cf2b29 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -28,6 +28,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    DeptSelectByName: typeof import('./components/DeptSelectByName/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
diff --git a/src/views/business/board/standardReminder/list.vue b/src/views/business/board/standardReminder/list.vue
index 85efbb1..fd60743 100644
--- a/src/views/business/board/standardReminder/list.vue
+++ b/src/views/business/board/standardReminder/list.vue
@@ -94,12 +94,33 @@
 const preparation = ref<string>('')
 // 到期开始以及结束
 const validTime = ref<string>('')
+watch(preparation, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
+// 有效日期变更
+watch(validTime, (val) => {
+  if (val) {
+    listQuery.value.validStartTime = `${val[0]}`
+    listQuery.value.validEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.validStartTime = ''
+    listQuery.value.validEndTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.preparationStartDate = preparation.value[0] || ''
-  listQuery.value.preparationEndDate = preparation.value[1] || ''
-  listQuery.value.validStartTime = validTime.value[0] || ''
-  listQuery.value.validEndTime = validTime.value[1] || ''
+  // listQuery.value.preparationStartDate = preparation.value[0] || ''
+  // listQuery.value.preparationEndDate = preparation.value[1] || ''
+  // listQuery.value.validStartTime = validTime.value[0] || ''
+  // listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -223,16 +244,16 @@
   })
   if (list.value.length > 0) {
     const params = {
-      category: '', // 类别
-      id: '', // 主键id
-      managerState: '', // 管理状态
-      preparationEndDate: '', // 结束时间
-      preparationStartDate: '', // 开始时间
-      standardLaboratory: '', // 标准所在部门
-      standardName: '', // 标准名称
-      standardNo: '', // 标准编号
-      validEndTime: '', // 结束时间
-      validStartTime: '', // 开始时间
+      category: listQuery.value.category, // 类别
+      id: listQuery.value.id, // 主键id
+      managerState: listQuery.value.managerState, // 管理状态
+      preparationEndDate: listQuery.value.preparationEndDate, // 结束时间
+      preparationStartDate: listQuery.value.preparationStartDate, // 开始时间
+      standardLaboratory: listQuery.value.standardLaboratory, // 标准所在部门
+      standardName: listQuery.value.standardName, // 标准名称
+      standardNo: listQuery.value.standardNo, // 标准编号
+      validEndTime: listQuery.value.validEndTime, // 结束时间
+      validStartTime: listQuery.value.validStartTime, // 开始时间
       offset: 1, // 当前页
       limit: 20, // 每页多少条
       ids: checkoutList.value,
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 8666957..37ac73f 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -137,7 +137,7 @@
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  distributeDialogRef.value.initDialog(row.id, row.sampleId, row.orderId)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId, row.sampleStatus)
 }
 // 点击标签绑定
 const barCodeBind = ref()
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 807ea30..4e4eb46 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -37,11 +37,21 @@
   { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
   { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
 ])
-
+// 时间变更
+watch(trainTime, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 查询列表
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.startTime = trainTime.value[0] || ''
-  listQuery.value.endTime = trainTime.value[1] || ''
+  // listQuery.value.startTime = trainTime.value[0] || ''
+  // listQuery.value.endTime = trainTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2f7c1d0..bccde84 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -139,7 +139,17 @@
     id: '2', // 后端规定已收入传2
   })
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -147,8 +157,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.sampleStatus = active.value
   getInterChangeList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IinterchangeList) => {
@@ -280,7 +290,7 @@
       else if (type === 'delete') { // 无需检测
         interchangeStatusChange({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '7' }).then((res) => {
           if (res.code === 200) {
-            ElMessage.success(`已${title}`)
+            ElMessage.success('操作成功')
             fetchData(true)
           }
         })
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList.vue b/src/views/business/schedule/interchangeReceipt/receiptList.vue
index 275a053..83d93f4 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptList.vue
@@ -42,7 +42,17 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -50,8 +60,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getReceiptList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -124,13 +134,13 @@
   })
   if (list.value.length > 0) {
     const params = {
-      interchangeCode: '', // 交接单编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      reciever: '', // 接收人
-      deliverer: '', // 送样人
-      startTime: '', // 交接开始时间
-      endTime: '', // 交接结束时间
+      interchangeCode: listQuery.value.interchangeCode, // 交接单编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      reciever: listQuery.value.reciever, // 接收人
+      deliverer: listQuery.value.deliverer, // 送样人
+      startTime: listQuery.value.startTime, // 交接开始时间
+      endTime: listQuery.value.endTime, // 交接结束时间
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index cf0b532..f2fc852 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -26,8 +26,8 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   deliverer: '', // 送样人
-  isUrgent: 2, // 是否加急 2全部 1是 0否
-  status: 0, // 接收状态
+  isUrgent: '', // 是否加急 2全部 1是 0否
+  status: '', // 接收状态
   offset: 1,
   limit: 20,
 })
@@ -70,11 +70,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    isUrgentMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 2, // 是否加急全部后端定为2
-    })
+    // isUrgentMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 2, // 是否加急全部后端定为2
+    // })
   })
   // 接收状态
   getDictByCode('orderStatus').then((response) => {
@@ -85,11 +85,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    statusMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 0,
-    })
+    // statusMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 0,
+    // })
     console.log(statusMap.value)
   })
 }
@@ -125,8 +125,8 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     deliverer: '', // 送样人
-    isUrgent: 2, // 是否加急
-    status: 0, // 接收状态
+    isUrgent: '', // 是否加急 2全部 1是 0否
+    status: '', // 接收状态
     offset: 1,
     limit: 20,
   }
@@ -191,12 +191,12 @@
   })
   if (list.value.length > 0) {
     const params = {
-      orderCode: '', // 委托书编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      deliverer: '', // 送样人
-      isUrgent: 2, // 是否加急
-      status: 0, // 接收状态
+      orderCode: listQuery.value.orderCode, // 委托书编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      deliverer: listQuery.value.deliverer, // 送样人
+      isUrgent: listQuery.value.isUrgent, // 是否加急
+      status: listQuery.value.status, // 接收状态
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 2d92da9..14cd1ce 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -6,7 +6,7 @@
   customerName: string // 委托方名称
   deliverer: string // 送样人
   isUrgent: number | string // 是否加急
-  status: number // 接收状态
+  status: number | string// 接收状态
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 50308c7..25c5cf9 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -53,6 +53,7 @@
   handOutProperty: string // 分发性质-初次分发、退回分发
   id?: string // 实验室id
   customerId?: string // 客户id
+  certificationState?: string // 证书出具
 }
 
 // 实验室检测/我的检测列表
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index 7c17365..7159350 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -1,6 +1,6 @@
 <!-- 任务分发 -->
 <script lang="ts" setup name="TaskEdit">
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
 import ProcessConfig from './components/processConfig.vue'
@@ -11,6 +11,7 @@
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { UploadFile } from '@/api/measure/file'
 import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 interface dictType {
   id: string
@@ -251,16 +252,22 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    // UploadFile(fd).then((res) => {
-    //   if (res.code === 200) {
-    //     sampleForm.value.minioFileName = res.data[0]
-    //     // 重置当前验证
-    //     ElMessage.success('文件上传成功')
-    //   }
-    //   else {
-    //     ElMessage.error(res.message)
-    //   }
-    // })
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        sampleForm.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+        loading.close()
+      }
+      else {
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    })
   }
 }
 const upload = () => {
@@ -402,7 +409,7 @@
               <el-form-item label="校检类别:">
                 <el-select
                   v-model="sampleForm.measureCategory"
-                  :placeholder="roleType === 'detail' ? '' : '请选择校检类别'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择校检类别'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -424,7 +431,7 @@
               <el-form-item label="厂家国别:">
                 <el-select
                   v-model="sampleForm.manufacturerCountry"
-                  :placeholder="roleType === 'detail' ? '' : '请选择厂家国别'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择厂家国别'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -450,7 +457,7 @@
               <el-form-item label="ABC:">
                 <el-select
                   v-model="sampleForm.abc"
-                  :placeholder="roleType === 'detail' ? '' : '请选择ABC'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择ABC'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -504,8 +511,8 @@
               <el-form-item label="备注:">
                 <el-input
                   v-model="sampleForm.remark"
+                  autosize
                   type="textarea"
-                  :rows="2"
                   :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
                   :class="{ 'detail-input': roleType === 'detail' }"
@@ -516,7 +523,7 @@
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="sampleForm.measureType"
-                  :placeholder="roleType === 'detail' ? '' : '请选择检定方式'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择检定方式'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index dfbbf6a..6eeff55 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -81,7 +81,7 @@
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '165px' },
   { text: '样品属性', value: 'sampleBelongName', width: '100', align: 'center' },
   { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '90' },
-  { text: '证书出具', value: 'certificationState', align: 'center', width: '90', filter: (row: ITaskList) => { return `${row.alreadyCertifications}/${row.requireCertifications}` } },
+  { text: '证书出具', value: 'certificationState', align: 'center', width: '90' },
 ])
 // 表格数据
 const list = ref<ITaskList[]>([])
@@ -104,6 +104,7 @@
   getTaskList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: ITaskList) => {
       item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      item.certificationState = `${item.alreadyCertifications}/${item.requireCertifications}`
       return item
     })
     total.value = response.data.total
diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue
index e44dd67..194de53 100644
--- a/src/views/business/subpackage/apply/list.vue
+++ b/src/views/business/subpackage/apply/list.vue
@@ -302,7 +302,7 @@
         <search-item>
           <el-date-picker
             v-model="timeRange" type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="申请开始时间" end-placeholder="申请结束时间"
+            value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="申请开始时间" end-placeholder="申请结束时间" clearable
           />
         </search-item>
       </search-area>
diff --git a/src/views/business/subpackage/check/list.vue b/src/views/business/subpackage/check/list.vue
index 51ea419..a8b6744 100644
--- a/src/views/business/subpackage/check/list.vue
+++ b/src/views/business/subpackage/check/list.vue
@@ -111,8 +111,6 @@
 
 // 时间变更
 watch(timeRange, (val) => {
-  console.log(val[0])
-
   if (val) {
     listQuery.value.checkStartTime = `${val[0]}`
     listQuery.value.checkEndTime = `${val[1]}`
@@ -345,7 +343,8 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="timeRange" type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
+            v-model="timeRange"
+            clearable type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="验收开始时间" end-placeholder="验收结束时间"
           />
         </search-item>
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 98f4a39..a0db900 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -68,6 +68,7 @@
   else {
     listQuery.value.startTime = ''
     listQuery.value.endTime = ''
+    timeRange.value = ['', '']
   }
 })
 // 多选发生改变时
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index 6e41a94..ac98b8a 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -56,7 +56,17 @@
 const checkoutList = ref<string[]>([])
 // 文件上传input
 const fileRef = ref()
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -64,8 +74,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getSampleList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index 92e4b4a..6f465fc 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -67,7 +67,17 @@
     certificationStatusMap.value[`${item.value}`] = item.name
   })
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -75,8 +85,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getSampleList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IOvertimeList) => {
       return {
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index dbaa437..14464bf 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -86,6 +86,17 @@
     width: 160,
   },
 ]) // 表格
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 const fetchData = (isNowPage = false) => {
   loadingTable.value = true
@@ -93,8 +104,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.processResult = active.value
   getApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 60d1454..d0236cc 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -105,7 +105,17 @@
     align: 'center',
   },
 ])
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 const fetchData = (isNowPage = false) => {
   loadingTable.value = true
@@ -113,8 +123,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.approvalStatus = active.value
   getApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index aeb568e..5430b0f 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -103,10 +103,21 @@
 // 装载时间数组
 const checkTime = ref<string>('')
 const loadingTable = ref(false)
+// 时间变更
+watch(checkTime, (val) => {
+  if (val) {
+    listQuery.value.checkStartDate = `${val[0]}`
+    listQuery.value.checkEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.checkStartDate = ''
+    listQuery.value.checkEndDate = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.checkStartDate = checkTime.value[0] || ''
-  listQuery.value.checkEndDate = checkTime.value[1] || ''
+  // listQuery.value.checkStartDate = checkTime.value[0] || ''
+  // listQuery.value.checkEndDate = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 6229abf..9d30934 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -112,10 +112,21 @@
 // 装载时间数组
 const checkTime = ref('')
 const loadingTable = ref(false)
+// 时间变更
+watch(checkTime, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.startTime = checkTime.value[0] || ''
-  listQuery.value.endTime = checkTime.value[1] || ''
+  // listQuery.value.startTime = checkTime.value[0] || ''
+  // listQuery.value.endTime = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index daca294..de18467 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -66,6 +66,17 @@
 const checkoutList = ref<IManageChecklist[]>([])
 // 文件上传input
 const fileRef = ref()
+// 时间变更
+watch(checkDate, (val) => {
+  if (val) {
+    listQuery.value.checkStartDate = `${val[0]}`
+    listQuery.value.checkEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.checkStartDate = ''
+    listQuery.value.checkEndDate = ''
+  }
+})
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
@@ -73,8 +84,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.checkStartDate = checkDate.value[0] || ''
-  listQuery.value.checkEndDate = checkDate.value[1] || ''
+  // listQuery.value.checkStartDate = checkDate.value[0] || ''
+  // listQuery.value.checkEndDate = checkDate.value[1] || ''
   getcheckInfoList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: any) => {
       return {
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 00d283c..50b014c 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -99,6 +99,17 @@
     approvalStatusReserveMap.value[item.name] = `${item.value}`
   })
 }
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -106,8 +117,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.approvalStatus = active.value
   getReceiveApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/receive/solve/solveList.vue b/src/views/device/receive/solve/solveList.vue
index 809c0c1..ec1e8bb 100644
--- a/src/views/device/receive/solve/solveList.vue
+++ b/src/views/device/receive/solve/solveList.vue
@@ -120,7 +120,17 @@
   timeRange.value = ['', ''] // 把时间选择框置空
   fetchData(true)
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -128,8 +138,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getReceiveApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IsolveListType) => {
       return {
diff --git a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
index 4744536..b4fe085 100644
--- a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
@@ -43,7 +43,12 @@
   select.value = -1
   listPageApi(listQuery.value).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows
+      list.value = res.data.rows.map((item: { effectiveStatusName: string }) => {
+        return {
+          ...item,
+          isDisabled: item.effectiveStatusName === '已废止',
+        }
+      })
       total.value = res.data.total
     }
   })
@@ -142,7 +147,7 @@
           </el-table-column>
           <el-table-column label="" width="55" align="center" fixed="left">
             <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
+              <el-radio v-model="select" :disabled="scope.row.isDisabled" :label="scope.$index" class="radio" />
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index a030dcf..0dd5547 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -94,12 +94,34 @@
 const preparation = ref<string>('')
 // 到期开始以及结束
 const validTime = ref<string>('')
+// 筹建日期变更
+watch(preparation, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
+// 有效日期变更
+watch(validTime, (val) => {
+  if (val) {
+    listQuery.value.validStartTime = `${val[0]}`
+    listQuery.value.validEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.validStartTime = ''
+    listQuery.value.validEndTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.preparationStartDate = preparation.value[0] || ''
-  listQuery.value.preparationEndDate = preparation.value[1] || ''
-  listQuery.value.validStartTime = validTime.value[0] || ''
-  listQuery.value.validEndTime = validTime.value[1] || ''
+  // listQuery.value.preparationStartDate = preparation.value[0] || ''
+  // listQuery.value.preparationEndDate = preparation.value[1] || ''
+  // listQuery.value.validStartTime = validTime.value[0] || ''
+  // listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index 39d8683..bb69fe9 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -99,6 +99,17 @@
 const standardManagerStateList = ref<IOptions[]>([])
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
+// 时间变更
+watch(preparationDate, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
@@ -107,8 +118,8 @@
     listQuery.value.offset = 1
   }
   // 筹建日期
-  listQuery.value.preparationStartDate = preparationDate.value[0] || ''
-  listQuery.value.preparationEndDate = preparationDate.value[1] || ''
+  // listQuery.value.preparationStartDate = preparationDate.value[0] || ''
+  // listQuery.value.preparationEndDate = preparationDate.value[1] || ''
   getStandardList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: any) => {
       return {
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 37205fc..edf9dd7 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -793,7 +793,7 @@
             保存
           </el-button>
           <!-- 待审批 -->
-          <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'agree' })">
+          <!-- <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'agree' })">
             同意
           </el-button>
           <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'reject' })">
@@ -801,7 +801,7 @@
           </el-button>
           <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'refuse' })">
             拒绝
-          </el-button>
+          </el-button> -->
           <!-- </template> -->
         </template>
         <el-button v-if="(title === '详情' && $route.query?.approvalStatusName === '草稿箱' && isCancel)" type="primary" @click="editForm">

diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..9cf2b29 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -28,6 +28,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    DeptSelectByName: typeof import('./components/DeptSelectByName/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
diff --git a/src/views/business/board/standardReminder/list.vue b/src/views/business/board/standardReminder/list.vue
index 85efbb1..fd60743 100644
--- a/src/views/business/board/standardReminder/list.vue
+++ b/src/views/business/board/standardReminder/list.vue
@@ -94,12 +94,33 @@
 const preparation = ref<string>('')
 // 到期开始以及结束
 const validTime = ref<string>('')
+watch(preparation, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
+// 有效日期变更
+watch(validTime, (val) => {
+  if (val) {
+    listQuery.value.validStartTime = `${val[0]}`
+    listQuery.value.validEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.validStartTime = ''
+    listQuery.value.validEndTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.preparationStartDate = preparation.value[0] || ''
-  listQuery.value.preparationEndDate = preparation.value[1] || ''
-  listQuery.value.validStartTime = validTime.value[0] || ''
-  listQuery.value.validEndTime = validTime.value[1] || ''
+  // listQuery.value.preparationStartDate = preparation.value[0] || ''
+  // listQuery.value.preparationEndDate = preparation.value[1] || ''
+  // listQuery.value.validStartTime = validTime.value[0] || ''
+  // listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -223,16 +244,16 @@
   })
   if (list.value.length > 0) {
     const params = {
-      category: '', // 类别
-      id: '', // 主键id
-      managerState: '', // 管理状态
-      preparationEndDate: '', // 结束时间
-      preparationStartDate: '', // 开始时间
-      standardLaboratory: '', // 标准所在部门
-      standardName: '', // 标准名称
-      standardNo: '', // 标准编号
-      validEndTime: '', // 结束时间
-      validStartTime: '', // 开始时间
+      category: listQuery.value.category, // 类别
+      id: listQuery.value.id, // 主键id
+      managerState: listQuery.value.managerState, // 管理状态
+      preparationEndDate: listQuery.value.preparationEndDate, // 结束时间
+      preparationStartDate: listQuery.value.preparationStartDate, // 开始时间
+      standardLaboratory: listQuery.value.standardLaboratory, // 标准所在部门
+      standardName: listQuery.value.standardName, // 标准名称
+      standardNo: listQuery.value.standardNo, // 标准编号
+      validEndTime: listQuery.value.validEndTime, // 结束时间
+      validStartTime: listQuery.value.validStartTime, // 开始时间
       offset: 1, // 当前页
       limit: 20, // 每页多少条
       ids: checkoutList.value,
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 8666957..37ac73f 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -137,7 +137,7 @@
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  distributeDialogRef.value.initDialog(row.id, row.sampleId, row.orderId)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId, row.sampleStatus)
 }
 // 点击标签绑定
 const barCodeBind = ref()
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 807ea30..4e4eb46 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -37,11 +37,21 @@
   { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
   { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
 ])
-
+// 时间变更
+watch(trainTime, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 查询列表
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.startTime = trainTime.value[0] || ''
-  listQuery.value.endTime = trainTime.value[1] || ''
+  // listQuery.value.startTime = trainTime.value[0] || ''
+  // listQuery.value.endTime = trainTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2f7c1d0..bccde84 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -139,7 +139,17 @@
     id: '2', // 后端规定已收入传2
   })
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -147,8 +157,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.sampleStatus = active.value
   getInterChangeList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IinterchangeList) => {
@@ -280,7 +290,7 @@
       else if (type === 'delete') { // 无需检测
         interchangeStatusChange({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '7' }).then((res) => {
           if (res.code === 200) {
-            ElMessage.success(`已${title}`)
+            ElMessage.success('操作成功')
             fetchData(true)
           }
         })
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList.vue b/src/views/business/schedule/interchangeReceipt/receiptList.vue
index 275a053..83d93f4 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptList.vue
@@ -42,7 +42,17 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -50,8 +60,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getReceiptList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -124,13 +134,13 @@
   })
   if (list.value.length > 0) {
     const params = {
-      interchangeCode: '', // 交接单编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      reciever: '', // 接收人
-      deliverer: '', // 送样人
-      startTime: '', // 交接开始时间
-      endTime: '', // 交接结束时间
+      interchangeCode: listQuery.value.interchangeCode, // 交接单编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      reciever: listQuery.value.reciever, // 接收人
+      deliverer: listQuery.value.deliverer, // 送样人
+      startTime: listQuery.value.startTime, // 交接开始时间
+      endTime: listQuery.value.endTime, // 交接结束时间
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index cf0b532..f2fc852 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -26,8 +26,8 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   deliverer: '', // 送样人
-  isUrgent: 2, // 是否加急 2全部 1是 0否
-  status: 0, // 接收状态
+  isUrgent: '', // 是否加急 2全部 1是 0否
+  status: '', // 接收状态
   offset: 1,
   limit: 20,
 })
@@ -70,11 +70,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    isUrgentMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 2, // 是否加急全部后端定为2
-    })
+    // isUrgentMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 2, // 是否加急全部后端定为2
+    // })
   })
   // 接收状态
   getDictByCode('orderStatus').then((response) => {
@@ -85,11 +85,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    statusMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 0,
-    })
+    // statusMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 0,
+    // })
     console.log(statusMap.value)
   })
 }
@@ -125,8 +125,8 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     deliverer: '', // 送样人
-    isUrgent: 2, // 是否加急
-    status: 0, // 接收状态
+    isUrgent: '', // 是否加急 2全部 1是 0否
+    status: '', // 接收状态
     offset: 1,
     limit: 20,
   }
@@ -191,12 +191,12 @@
   })
   if (list.value.length > 0) {
     const params = {
-      orderCode: '', // 委托书编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      deliverer: '', // 送样人
-      isUrgent: 2, // 是否加急
-      status: 0, // 接收状态
+      orderCode: listQuery.value.orderCode, // 委托书编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      deliverer: listQuery.value.deliverer, // 送样人
+      isUrgent: listQuery.value.isUrgent, // 是否加急
+      status: listQuery.value.status, // 接收状态
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 2d92da9..14cd1ce 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -6,7 +6,7 @@
   customerName: string // 委托方名称
   deliverer: string // 送样人
   isUrgent: number | string // 是否加急
-  status: number // 接收状态
+  status: number | string// 接收状态
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 50308c7..25c5cf9 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -53,6 +53,7 @@
   handOutProperty: string // 分发性质-初次分发、退回分发
   id?: string // 实验室id
   customerId?: string // 客户id
+  certificationState?: string // 证书出具
 }
 
 // 实验室检测/我的检测列表
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index 7c17365..7159350 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -1,6 +1,6 @@
 <!-- 任务分发 -->
 <script lang="ts" setup name="TaskEdit">
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
 import ProcessConfig from './components/processConfig.vue'
@@ -11,6 +11,7 @@
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { UploadFile } from '@/api/measure/file'
 import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 interface dictType {
   id: string
@@ -251,16 +252,22 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    // UploadFile(fd).then((res) => {
-    //   if (res.code === 200) {
-    //     sampleForm.value.minioFileName = res.data[0]
-    //     // 重置当前验证
-    //     ElMessage.success('文件上传成功')
-    //   }
-    //   else {
-    //     ElMessage.error(res.message)
-    //   }
-    // })
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        sampleForm.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+        loading.close()
+      }
+      else {
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    })
   }
 }
 const upload = () => {
@@ -402,7 +409,7 @@
               <el-form-item label="校检类别:">
                 <el-select
                   v-model="sampleForm.measureCategory"
-                  :placeholder="roleType === 'detail' ? '' : '请选择校检类别'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择校检类别'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -424,7 +431,7 @@
               <el-form-item label="厂家国别:">
                 <el-select
                   v-model="sampleForm.manufacturerCountry"
-                  :placeholder="roleType === 'detail' ? '' : '请选择厂家国别'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择厂家国别'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -450,7 +457,7 @@
               <el-form-item label="ABC:">
                 <el-select
                   v-model="sampleForm.abc"
-                  :placeholder="roleType === 'detail' ? '' : '请选择ABC'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择ABC'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -504,8 +511,8 @@
               <el-form-item label="备注:">
                 <el-input
                   v-model="sampleForm.remark"
+                  autosize
                   type="textarea"
-                  :rows="2"
                   :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
                   :class="{ 'detail-input': roleType === 'detail' }"
@@ -516,7 +523,7 @@
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="sampleForm.measureType"
-                  :placeholder="roleType === 'detail' ? '' : '请选择检定方式'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择检定方式'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index dfbbf6a..6eeff55 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -81,7 +81,7 @@
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '165px' },
   { text: '样品属性', value: 'sampleBelongName', width: '100', align: 'center' },
   { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '90' },
-  { text: '证书出具', value: 'certificationState', align: 'center', width: '90', filter: (row: ITaskList) => { return `${row.alreadyCertifications}/${row.requireCertifications}` } },
+  { text: '证书出具', value: 'certificationState', align: 'center', width: '90' },
 ])
 // 表格数据
 const list = ref<ITaskList[]>([])
@@ -104,6 +104,7 @@
   getTaskList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: ITaskList) => {
       item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      item.certificationState = `${item.alreadyCertifications}/${item.requireCertifications}`
       return item
     })
     total.value = response.data.total
diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue
index e44dd67..194de53 100644
--- a/src/views/business/subpackage/apply/list.vue
+++ b/src/views/business/subpackage/apply/list.vue
@@ -302,7 +302,7 @@
         <search-item>
           <el-date-picker
             v-model="timeRange" type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="申请开始时间" end-placeholder="申请结束时间"
+            value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="申请开始时间" end-placeholder="申请结束时间" clearable
           />
         </search-item>
       </search-area>
diff --git a/src/views/business/subpackage/check/list.vue b/src/views/business/subpackage/check/list.vue
index 51ea419..a8b6744 100644
--- a/src/views/business/subpackage/check/list.vue
+++ b/src/views/business/subpackage/check/list.vue
@@ -111,8 +111,6 @@
 
 // 时间变更
 watch(timeRange, (val) => {
-  console.log(val[0])
-
   if (val) {
     listQuery.value.checkStartTime = `${val[0]}`
     listQuery.value.checkEndTime = `${val[1]}`
@@ -345,7 +343,8 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="timeRange" type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
+            v-model="timeRange"
+            clearable type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="验收开始时间" end-placeholder="验收结束时间"
           />
         </search-item>
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 98f4a39..a0db900 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -68,6 +68,7 @@
   else {
     listQuery.value.startTime = ''
     listQuery.value.endTime = ''
+    timeRange.value = ['', '']
   }
 })
 // 多选发生改变时
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index 6e41a94..ac98b8a 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -56,7 +56,17 @@
 const checkoutList = ref<string[]>([])
 // 文件上传input
 const fileRef = ref()
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -64,8 +74,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getSampleList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index 92e4b4a..6f465fc 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -67,7 +67,17 @@
     certificationStatusMap.value[`${item.value}`] = item.name
   })
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -75,8 +85,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getSampleList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IOvertimeList) => {
       return {
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index dbaa437..14464bf 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -86,6 +86,17 @@
     width: 160,
   },
 ]) // 表格
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 const fetchData = (isNowPage = false) => {
   loadingTable.value = true
@@ -93,8 +104,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.processResult = active.value
   getApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 60d1454..d0236cc 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -105,7 +105,17 @@
     align: 'center',
   },
 ])
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 const fetchData = (isNowPage = false) => {
   loadingTable.value = true
@@ -113,8 +123,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.approvalStatus = active.value
   getApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index aeb568e..5430b0f 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -103,10 +103,21 @@
 // 装载时间数组
 const checkTime = ref<string>('')
 const loadingTable = ref(false)
+// 时间变更
+watch(checkTime, (val) => {
+  if (val) {
+    listQuery.value.checkStartDate = `${val[0]}`
+    listQuery.value.checkEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.checkStartDate = ''
+    listQuery.value.checkEndDate = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.checkStartDate = checkTime.value[0] || ''
-  listQuery.value.checkEndDate = checkTime.value[1] || ''
+  // listQuery.value.checkStartDate = checkTime.value[0] || ''
+  // listQuery.value.checkEndDate = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 6229abf..9d30934 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -112,10 +112,21 @@
 // 装载时间数组
 const checkTime = ref('')
 const loadingTable = ref(false)
+// 时间变更
+watch(checkTime, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.startTime = checkTime.value[0] || ''
-  listQuery.value.endTime = checkTime.value[1] || ''
+  // listQuery.value.startTime = checkTime.value[0] || ''
+  // listQuery.value.endTime = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index daca294..de18467 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -66,6 +66,17 @@
 const checkoutList = ref<IManageChecklist[]>([])
 // 文件上传input
 const fileRef = ref()
+// 时间变更
+watch(checkDate, (val) => {
+  if (val) {
+    listQuery.value.checkStartDate = `${val[0]}`
+    listQuery.value.checkEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.checkStartDate = ''
+    listQuery.value.checkEndDate = ''
+  }
+})
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
@@ -73,8 +84,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.checkStartDate = checkDate.value[0] || ''
-  listQuery.value.checkEndDate = checkDate.value[1] || ''
+  // listQuery.value.checkStartDate = checkDate.value[0] || ''
+  // listQuery.value.checkEndDate = checkDate.value[1] || ''
   getcheckInfoList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: any) => {
       return {
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 00d283c..50b014c 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -99,6 +99,17 @@
     approvalStatusReserveMap.value[item.name] = `${item.value}`
   })
 }
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -106,8 +117,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.approvalStatus = active.value
   getReceiveApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/receive/solve/solveList.vue b/src/views/device/receive/solve/solveList.vue
index 809c0c1..ec1e8bb 100644
--- a/src/views/device/receive/solve/solveList.vue
+++ b/src/views/device/receive/solve/solveList.vue
@@ -120,7 +120,17 @@
   timeRange.value = ['', ''] // 把时间选择框置空
   fetchData(true)
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -128,8 +138,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getReceiveApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IsolveListType) => {
       return {
diff --git a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
index 4744536..b4fe085 100644
--- a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
@@ -43,7 +43,12 @@
   select.value = -1
   listPageApi(listQuery.value).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows
+      list.value = res.data.rows.map((item: { effectiveStatusName: string }) => {
+        return {
+          ...item,
+          isDisabled: item.effectiveStatusName === '已废止',
+        }
+      })
       total.value = res.data.total
     }
   })
@@ -142,7 +147,7 @@
           </el-table-column>
           <el-table-column label="" width="55" align="center" fixed="left">
             <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
+              <el-radio v-model="select" :disabled="scope.row.isDisabled" :label="scope.$index" class="radio" />
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index a030dcf..0dd5547 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -94,12 +94,34 @@
 const preparation = ref<string>('')
 // 到期开始以及结束
 const validTime = ref<string>('')
+// 筹建日期变更
+watch(preparation, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
+// 有效日期变更
+watch(validTime, (val) => {
+  if (val) {
+    listQuery.value.validStartTime = `${val[0]}`
+    listQuery.value.validEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.validStartTime = ''
+    listQuery.value.validEndTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.preparationStartDate = preparation.value[0] || ''
-  listQuery.value.preparationEndDate = preparation.value[1] || ''
-  listQuery.value.validStartTime = validTime.value[0] || ''
-  listQuery.value.validEndTime = validTime.value[1] || ''
+  // listQuery.value.preparationStartDate = preparation.value[0] || ''
+  // listQuery.value.preparationEndDate = preparation.value[1] || ''
+  // listQuery.value.validStartTime = validTime.value[0] || ''
+  // listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index 39d8683..bb69fe9 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -99,6 +99,17 @@
 const standardManagerStateList = ref<IOptions[]>([])
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
+// 时间变更
+watch(preparationDate, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
@@ -107,8 +118,8 @@
     listQuery.value.offset = 1
   }
   // 筹建日期
-  listQuery.value.preparationStartDate = preparationDate.value[0] || ''
-  listQuery.value.preparationEndDate = preparationDate.value[1] || ''
+  // listQuery.value.preparationStartDate = preparationDate.value[0] || ''
+  // listQuery.value.preparationEndDate = preparationDate.value[1] || ''
   getStandardList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: any) => {
       return {
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 37205fc..edf9dd7 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -793,7 +793,7 @@
             保存
           </el-button>
           <!-- 待审批 -->
-          <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'agree' })">
+          <!-- <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'agree' })">
             同意
           </el-button>
           <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'reject' })">
@@ -801,7 +801,7 @@
           </el-button>
           <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'refuse' })">
             拒绝
-          </el-button>
+          </el-button> -->
           <!-- </template> -->
         </template>
         <el-button v-if="(title === '详情' && $route.query?.approvalStatusName === '草稿箱' && isCancel)" type="primary" @click="editForm">
diff --git a/src/views/finance/businessSettlement/list.vue b/src/views/finance/businessSettlement/list.vue
index e942abb..9543947 100644
--- a/src/views/finance/businessSettlement/list.vue
+++ b/src/views/finance/businessSettlement/list.vue
@@ -43,6 +43,7 @@
 const list = ref<IList[]>([]) // 表格数据
 // 选中的内容
 const checkoutList = ref<string[]>([])
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true

diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..9cf2b29 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -28,6 +28,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    DeptSelectByName: typeof import('./components/DeptSelectByName/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
diff --git a/src/views/business/board/standardReminder/list.vue b/src/views/business/board/standardReminder/list.vue
index 85efbb1..fd60743 100644
--- a/src/views/business/board/standardReminder/list.vue
+++ b/src/views/business/board/standardReminder/list.vue
@@ -94,12 +94,33 @@
 const preparation = ref<string>('')
 // 到期开始以及结束
 const validTime = ref<string>('')
+watch(preparation, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
+// 有效日期变更
+watch(validTime, (val) => {
+  if (val) {
+    listQuery.value.validStartTime = `${val[0]}`
+    listQuery.value.validEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.validStartTime = ''
+    listQuery.value.validEndTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.preparationStartDate = preparation.value[0] || ''
-  listQuery.value.preparationEndDate = preparation.value[1] || ''
-  listQuery.value.validStartTime = validTime.value[0] || ''
-  listQuery.value.validEndTime = validTime.value[1] || ''
+  // listQuery.value.preparationStartDate = preparation.value[0] || ''
+  // listQuery.value.preparationEndDate = preparation.value[1] || ''
+  // listQuery.value.validStartTime = validTime.value[0] || ''
+  // listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -223,16 +244,16 @@
   })
   if (list.value.length > 0) {
     const params = {
-      category: '', // 类别
-      id: '', // 主键id
-      managerState: '', // 管理状态
-      preparationEndDate: '', // 结束时间
-      preparationStartDate: '', // 开始时间
-      standardLaboratory: '', // 标准所在部门
-      standardName: '', // 标准名称
-      standardNo: '', // 标准编号
-      validEndTime: '', // 结束时间
-      validStartTime: '', // 开始时间
+      category: listQuery.value.category, // 类别
+      id: listQuery.value.id, // 主键id
+      managerState: listQuery.value.managerState, // 管理状态
+      preparationEndDate: listQuery.value.preparationEndDate, // 结束时间
+      preparationStartDate: listQuery.value.preparationStartDate, // 开始时间
+      standardLaboratory: listQuery.value.standardLaboratory, // 标准所在部门
+      standardName: listQuery.value.standardName, // 标准名称
+      standardNo: listQuery.value.standardNo, // 标准编号
+      validEndTime: listQuery.value.validEndTime, // 结束时间
+      validStartTime: listQuery.value.validStartTime, // 开始时间
       offset: 1, // 当前页
       limit: 20, // 每页多少条
       ids: checkoutList.value,
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 8666957..37ac73f 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -137,7 +137,7 @@
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  distributeDialogRef.value.initDialog(row.id, row.sampleId, row.orderId)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId, row.sampleStatus)
 }
 // 点击标签绑定
 const barCodeBind = ref()
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 807ea30..4e4eb46 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -37,11 +37,21 @@
   { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
   { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
 ])
-
+// 时间变更
+watch(trainTime, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 查询列表
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.startTime = trainTime.value[0] || ''
-  listQuery.value.endTime = trainTime.value[1] || ''
+  // listQuery.value.startTime = trainTime.value[0] || ''
+  // listQuery.value.endTime = trainTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2f7c1d0..bccde84 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -139,7 +139,17 @@
     id: '2', // 后端规定已收入传2
   })
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -147,8 +157,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.sampleStatus = active.value
   getInterChangeList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IinterchangeList) => {
@@ -280,7 +290,7 @@
       else if (type === 'delete') { // 无需检测
         interchangeStatusChange({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '7' }).then((res) => {
           if (res.code === 200) {
-            ElMessage.success(`已${title}`)
+            ElMessage.success('操作成功')
             fetchData(true)
           }
         })
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList.vue b/src/views/business/schedule/interchangeReceipt/receiptList.vue
index 275a053..83d93f4 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptList.vue
@@ -42,7 +42,17 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -50,8 +60,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getReceiptList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -124,13 +134,13 @@
   })
   if (list.value.length > 0) {
     const params = {
-      interchangeCode: '', // 交接单编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      reciever: '', // 接收人
-      deliverer: '', // 送样人
-      startTime: '', // 交接开始时间
-      endTime: '', // 交接结束时间
+      interchangeCode: listQuery.value.interchangeCode, // 交接单编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      reciever: listQuery.value.reciever, // 接收人
+      deliverer: listQuery.value.deliverer, // 送样人
+      startTime: listQuery.value.startTime, // 交接开始时间
+      endTime: listQuery.value.endTime, // 交接结束时间
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index cf0b532..f2fc852 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -26,8 +26,8 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   deliverer: '', // 送样人
-  isUrgent: 2, // 是否加急 2全部 1是 0否
-  status: 0, // 接收状态
+  isUrgent: '', // 是否加急 2全部 1是 0否
+  status: '', // 接收状态
   offset: 1,
   limit: 20,
 })
@@ -70,11 +70,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    isUrgentMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 2, // 是否加急全部后端定为2
-    })
+    // isUrgentMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 2, // 是否加急全部后端定为2
+    // })
   })
   // 接收状态
   getDictByCode('orderStatus').then((response) => {
@@ -85,11 +85,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    statusMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 0,
-    })
+    // statusMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 0,
+    // })
     console.log(statusMap.value)
   })
 }
@@ -125,8 +125,8 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     deliverer: '', // 送样人
-    isUrgent: 2, // 是否加急
-    status: 0, // 接收状态
+    isUrgent: '', // 是否加急 2全部 1是 0否
+    status: '', // 接收状态
     offset: 1,
     limit: 20,
   }
@@ -191,12 +191,12 @@
   })
   if (list.value.length > 0) {
     const params = {
-      orderCode: '', // 委托书编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      deliverer: '', // 送样人
-      isUrgent: 2, // 是否加急
-      status: 0, // 接收状态
+      orderCode: listQuery.value.orderCode, // 委托书编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      deliverer: listQuery.value.deliverer, // 送样人
+      isUrgent: listQuery.value.isUrgent, // 是否加急
+      status: listQuery.value.status, // 接收状态
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 2d92da9..14cd1ce 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -6,7 +6,7 @@
   customerName: string // 委托方名称
   deliverer: string // 送样人
   isUrgent: number | string // 是否加急
-  status: number // 接收状态
+  status: number | string// 接收状态
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 50308c7..25c5cf9 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -53,6 +53,7 @@
   handOutProperty: string // 分发性质-初次分发、退回分发
   id?: string // 实验室id
   customerId?: string // 客户id
+  certificationState?: string // 证书出具
 }
 
 // 实验室检测/我的检测列表
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index 7c17365..7159350 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -1,6 +1,6 @@
 <!-- 任务分发 -->
 <script lang="ts" setup name="TaskEdit">
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
 import ProcessConfig from './components/processConfig.vue'
@@ -11,6 +11,7 @@
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { UploadFile } from '@/api/measure/file'
 import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 interface dictType {
   id: string
@@ -251,16 +252,22 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    // UploadFile(fd).then((res) => {
-    //   if (res.code === 200) {
-    //     sampleForm.value.minioFileName = res.data[0]
-    //     // 重置当前验证
-    //     ElMessage.success('文件上传成功')
-    //   }
-    //   else {
-    //     ElMessage.error(res.message)
-    //   }
-    // })
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        sampleForm.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+        loading.close()
+      }
+      else {
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    })
   }
 }
 const upload = () => {
@@ -402,7 +409,7 @@
               <el-form-item label="校检类别:">
                 <el-select
                   v-model="sampleForm.measureCategory"
-                  :placeholder="roleType === 'detail' ? '' : '请选择校检类别'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择校检类别'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -424,7 +431,7 @@
               <el-form-item label="厂家国别:">
                 <el-select
                   v-model="sampleForm.manufacturerCountry"
-                  :placeholder="roleType === 'detail' ? '' : '请选择厂家国别'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择厂家国别'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -450,7 +457,7 @@
               <el-form-item label="ABC:">
                 <el-select
                   v-model="sampleForm.abc"
-                  :placeholder="roleType === 'detail' ? '' : '请选择ABC'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择ABC'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -504,8 +511,8 @@
               <el-form-item label="备注:">
                 <el-input
                   v-model="sampleForm.remark"
+                  autosize
                   type="textarea"
-                  :rows="2"
                   :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
                   :class="{ 'detail-input': roleType === 'detail' }"
@@ -516,7 +523,7 @@
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="sampleForm.measureType"
-                  :placeholder="roleType === 'detail' ? '' : '请选择检定方式'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择检定方式'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index dfbbf6a..6eeff55 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -81,7 +81,7 @@
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '165px' },
   { text: '样品属性', value: 'sampleBelongName', width: '100', align: 'center' },
   { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '90' },
-  { text: '证书出具', value: 'certificationState', align: 'center', width: '90', filter: (row: ITaskList) => { return `${row.alreadyCertifications}/${row.requireCertifications}` } },
+  { text: '证书出具', value: 'certificationState', align: 'center', width: '90' },
 ])
 // 表格数据
 const list = ref<ITaskList[]>([])
@@ -104,6 +104,7 @@
   getTaskList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: ITaskList) => {
       item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      item.certificationState = `${item.alreadyCertifications}/${item.requireCertifications}`
       return item
     })
     total.value = response.data.total
diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue
index e44dd67..194de53 100644
--- a/src/views/business/subpackage/apply/list.vue
+++ b/src/views/business/subpackage/apply/list.vue
@@ -302,7 +302,7 @@
         <search-item>
           <el-date-picker
             v-model="timeRange" type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="申请开始时间" end-placeholder="申请结束时间"
+            value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="申请开始时间" end-placeholder="申请结束时间" clearable
           />
         </search-item>
       </search-area>
diff --git a/src/views/business/subpackage/check/list.vue b/src/views/business/subpackage/check/list.vue
index 51ea419..a8b6744 100644
--- a/src/views/business/subpackage/check/list.vue
+++ b/src/views/business/subpackage/check/list.vue
@@ -111,8 +111,6 @@
 
 // 时间变更
 watch(timeRange, (val) => {
-  console.log(val[0])
-
   if (val) {
     listQuery.value.checkStartTime = `${val[0]}`
     listQuery.value.checkEndTime = `${val[1]}`
@@ -345,7 +343,8 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="timeRange" type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
+            v-model="timeRange"
+            clearable type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="验收开始时间" end-placeholder="验收结束时间"
           />
         </search-item>
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 98f4a39..a0db900 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -68,6 +68,7 @@
   else {
     listQuery.value.startTime = ''
     listQuery.value.endTime = ''
+    timeRange.value = ['', '']
   }
 })
 // 多选发生改变时
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index 6e41a94..ac98b8a 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -56,7 +56,17 @@
 const checkoutList = ref<string[]>([])
 // 文件上传input
 const fileRef = ref()
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -64,8 +74,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getSampleList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index 92e4b4a..6f465fc 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -67,7 +67,17 @@
     certificationStatusMap.value[`${item.value}`] = item.name
   })
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -75,8 +85,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getSampleList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IOvertimeList) => {
       return {
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index dbaa437..14464bf 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -86,6 +86,17 @@
     width: 160,
   },
 ]) // 表格
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 const fetchData = (isNowPage = false) => {
   loadingTable.value = true
@@ -93,8 +104,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.processResult = active.value
   getApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 60d1454..d0236cc 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -105,7 +105,17 @@
     align: 'center',
   },
 ])
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 const fetchData = (isNowPage = false) => {
   loadingTable.value = true
@@ -113,8 +123,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.approvalStatus = active.value
   getApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index aeb568e..5430b0f 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -103,10 +103,21 @@
 // 装载时间数组
 const checkTime = ref<string>('')
 const loadingTable = ref(false)
+// 时间变更
+watch(checkTime, (val) => {
+  if (val) {
+    listQuery.value.checkStartDate = `${val[0]}`
+    listQuery.value.checkEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.checkStartDate = ''
+    listQuery.value.checkEndDate = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.checkStartDate = checkTime.value[0] || ''
-  listQuery.value.checkEndDate = checkTime.value[1] || ''
+  // listQuery.value.checkStartDate = checkTime.value[0] || ''
+  // listQuery.value.checkEndDate = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 6229abf..9d30934 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -112,10 +112,21 @@
 // 装载时间数组
 const checkTime = ref('')
 const loadingTable = ref(false)
+// 时间变更
+watch(checkTime, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.startTime = checkTime.value[0] || ''
-  listQuery.value.endTime = checkTime.value[1] || ''
+  // listQuery.value.startTime = checkTime.value[0] || ''
+  // listQuery.value.endTime = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index daca294..de18467 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -66,6 +66,17 @@
 const checkoutList = ref<IManageChecklist[]>([])
 // 文件上传input
 const fileRef = ref()
+// 时间变更
+watch(checkDate, (val) => {
+  if (val) {
+    listQuery.value.checkStartDate = `${val[0]}`
+    listQuery.value.checkEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.checkStartDate = ''
+    listQuery.value.checkEndDate = ''
+  }
+})
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
@@ -73,8 +84,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.checkStartDate = checkDate.value[0] || ''
-  listQuery.value.checkEndDate = checkDate.value[1] || ''
+  // listQuery.value.checkStartDate = checkDate.value[0] || ''
+  // listQuery.value.checkEndDate = checkDate.value[1] || ''
   getcheckInfoList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: any) => {
       return {
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 00d283c..50b014c 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -99,6 +99,17 @@
     approvalStatusReserveMap.value[item.name] = `${item.value}`
   })
 }
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -106,8 +117,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.approvalStatus = active.value
   getReceiveApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/receive/solve/solveList.vue b/src/views/device/receive/solve/solveList.vue
index 809c0c1..ec1e8bb 100644
--- a/src/views/device/receive/solve/solveList.vue
+++ b/src/views/device/receive/solve/solveList.vue
@@ -120,7 +120,17 @@
   timeRange.value = ['', ''] // 把时间选择框置空
   fetchData(true)
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -128,8 +138,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getReceiveApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IsolveListType) => {
       return {
diff --git a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
index 4744536..b4fe085 100644
--- a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
@@ -43,7 +43,12 @@
   select.value = -1
   listPageApi(listQuery.value).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows
+      list.value = res.data.rows.map((item: { effectiveStatusName: string }) => {
+        return {
+          ...item,
+          isDisabled: item.effectiveStatusName === '已废止',
+        }
+      })
       total.value = res.data.total
     }
   })
@@ -142,7 +147,7 @@
           </el-table-column>
           <el-table-column label="" width="55" align="center" fixed="left">
             <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
+              <el-radio v-model="select" :disabled="scope.row.isDisabled" :label="scope.$index" class="radio" />
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index a030dcf..0dd5547 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -94,12 +94,34 @@
 const preparation = ref<string>('')
 // 到期开始以及结束
 const validTime = ref<string>('')
+// 筹建日期变更
+watch(preparation, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
+// 有效日期变更
+watch(validTime, (val) => {
+  if (val) {
+    listQuery.value.validStartTime = `${val[0]}`
+    listQuery.value.validEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.validStartTime = ''
+    listQuery.value.validEndTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.preparationStartDate = preparation.value[0] || ''
-  listQuery.value.preparationEndDate = preparation.value[1] || ''
-  listQuery.value.validStartTime = validTime.value[0] || ''
-  listQuery.value.validEndTime = validTime.value[1] || ''
+  // listQuery.value.preparationStartDate = preparation.value[0] || ''
+  // listQuery.value.preparationEndDate = preparation.value[1] || ''
+  // listQuery.value.validStartTime = validTime.value[0] || ''
+  // listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index 39d8683..bb69fe9 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -99,6 +99,17 @@
 const standardManagerStateList = ref<IOptions[]>([])
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
+// 时间变更
+watch(preparationDate, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
@@ -107,8 +118,8 @@
     listQuery.value.offset = 1
   }
   // 筹建日期
-  listQuery.value.preparationStartDate = preparationDate.value[0] || ''
-  listQuery.value.preparationEndDate = preparationDate.value[1] || ''
+  // listQuery.value.preparationStartDate = preparationDate.value[0] || ''
+  // listQuery.value.preparationEndDate = preparationDate.value[1] || ''
   getStandardList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: any) => {
       return {
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 37205fc..edf9dd7 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -793,7 +793,7 @@
             保存
           </el-button>
           <!-- 待审批 -->
-          <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'agree' })">
+          <!-- <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'agree' })">
             同意
           </el-button>
           <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'reject' })">
@@ -801,7 +801,7 @@
           </el-button>
           <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'refuse' })">
             拒绝
-          </el-button>
+          </el-button> -->
           <!-- </template> -->
         </template>
         <el-button v-if="(title === '详情' && $route.query?.approvalStatusName === '草稿箱' && isCancel)" type="primary" @click="editForm">
diff --git a/src/views/finance/businessSettlement/list.vue b/src/views/finance/businessSettlement/list.vue
index e942abb..9543947 100644
--- a/src/views/finance/businessSettlement/list.vue
+++ b/src/views/finance/businessSettlement/list.vue
@@ -43,6 +43,7 @@
 const list = ref<IList[]>([]) // 表格数据
 // 选中的内容
 const checkoutList = ref<string[]>([])
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
diff --git a/src/views/finance/contract/list.vue b/src/views/finance/contract/list.vue
index 7dcdca5..5f8eb4e 100644
--- a/src/views/finance/contract/list.vue
+++ b/src/views/finance/contract/list.vue
@@ -59,6 +59,17 @@
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 选中的内容
 const checkoutList = ref<string[]>([])
+// 时间变更
+watch(dateRange, (val) => {
+  if (val) {
+    listQuery.value.estimateSignStartDate = `${val[0]}`
+    listQuery.value.estimateSignEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.estimateSignStartDate = ''
+    listQuery.value.estimateSignEndDate = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -66,8 +77,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.estimateSignStartDate = dateRange.value[0] as string || ''
-  listQuery.value.estimateSignEndDate = dateRange.value[1] as string || ''
+  // listQuery.value.estimateSignStartDate = dateRange.value[0] as string || ''
+  // listQuery.value.estimateSignEndDate = dateRange.value[1] as string || ''
   getContractList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: { estimateSignDate: string; agreementAmount: number }) => {
       return {

diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..9cf2b29 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -28,6 +28,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    DeptSelectByName: typeof import('./components/DeptSelectByName/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
diff --git a/src/views/business/board/standardReminder/list.vue b/src/views/business/board/standardReminder/list.vue
index 85efbb1..fd60743 100644
--- a/src/views/business/board/standardReminder/list.vue
+++ b/src/views/business/board/standardReminder/list.vue
@@ -94,12 +94,33 @@
 const preparation = ref<string>('')
 // 到期开始以及结束
 const validTime = ref<string>('')
+watch(preparation, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
+// 有效日期变更
+watch(validTime, (val) => {
+  if (val) {
+    listQuery.value.validStartTime = `${val[0]}`
+    listQuery.value.validEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.validStartTime = ''
+    listQuery.value.validEndTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.preparationStartDate = preparation.value[0] || ''
-  listQuery.value.preparationEndDate = preparation.value[1] || ''
-  listQuery.value.validStartTime = validTime.value[0] || ''
-  listQuery.value.validEndTime = validTime.value[1] || ''
+  // listQuery.value.preparationStartDate = preparation.value[0] || ''
+  // listQuery.value.preparationEndDate = preparation.value[1] || ''
+  // listQuery.value.validStartTime = validTime.value[0] || ''
+  // listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -223,16 +244,16 @@
   })
   if (list.value.length > 0) {
     const params = {
-      category: '', // 类别
-      id: '', // 主键id
-      managerState: '', // 管理状态
-      preparationEndDate: '', // 结束时间
-      preparationStartDate: '', // 开始时间
-      standardLaboratory: '', // 标准所在部门
-      standardName: '', // 标准名称
-      standardNo: '', // 标准编号
-      validEndTime: '', // 结束时间
-      validStartTime: '', // 开始时间
+      category: listQuery.value.category, // 类别
+      id: listQuery.value.id, // 主键id
+      managerState: listQuery.value.managerState, // 管理状态
+      preparationEndDate: listQuery.value.preparationEndDate, // 结束时间
+      preparationStartDate: listQuery.value.preparationStartDate, // 开始时间
+      standardLaboratory: listQuery.value.standardLaboratory, // 标准所在部门
+      standardName: listQuery.value.standardName, // 标准名称
+      standardNo: listQuery.value.standardNo, // 标准编号
+      validEndTime: listQuery.value.validEndTime, // 结束时间
+      validStartTime: listQuery.value.validStartTime, // 开始时间
       offset: 1, // 当前页
       limit: 20, // 每页多少条
       ids: checkoutList.value,
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 8666957..37ac73f 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -137,7 +137,7 @@
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  distributeDialogRef.value.initDialog(row.id, row.sampleId, row.orderId)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId, row.sampleStatus)
 }
 // 点击标签绑定
 const barCodeBind = ref()
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 807ea30..4e4eb46 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -37,11 +37,21 @@
   { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
   { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
 ])
-
+// 时间变更
+watch(trainTime, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 查询列表
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.startTime = trainTime.value[0] || ''
-  listQuery.value.endTime = trainTime.value[1] || ''
+  // listQuery.value.startTime = trainTime.value[0] || ''
+  // listQuery.value.endTime = trainTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2f7c1d0..bccde84 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -139,7 +139,17 @@
     id: '2', // 后端规定已收入传2
   })
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -147,8 +157,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.sampleStatus = active.value
   getInterChangeList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IinterchangeList) => {
@@ -280,7 +290,7 @@
       else if (type === 'delete') { // 无需检测
         interchangeStatusChange({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '7' }).then((res) => {
           if (res.code === 200) {
-            ElMessage.success(`已${title}`)
+            ElMessage.success('操作成功')
             fetchData(true)
           }
         })
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList.vue b/src/views/business/schedule/interchangeReceipt/receiptList.vue
index 275a053..83d93f4 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptList.vue
@@ -42,7 +42,17 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -50,8 +60,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getReceiptList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -124,13 +134,13 @@
   })
   if (list.value.length > 0) {
     const params = {
-      interchangeCode: '', // 交接单编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      reciever: '', // 接收人
-      deliverer: '', // 送样人
-      startTime: '', // 交接开始时间
-      endTime: '', // 交接结束时间
+      interchangeCode: listQuery.value.interchangeCode, // 交接单编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      reciever: listQuery.value.reciever, // 接收人
+      deliverer: listQuery.value.deliverer, // 送样人
+      startTime: listQuery.value.startTime, // 交接开始时间
+      endTime: listQuery.value.endTime, // 交接结束时间
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index cf0b532..f2fc852 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -26,8 +26,8 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   deliverer: '', // 送样人
-  isUrgent: 2, // 是否加急 2全部 1是 0否
-  status: 0, // 接收状态
+  isUrgent: '', // 是否加急 2全部 1是 0否
+  status: '', // 接收状态
   offset: 1,
   limit: 20,
 })
@@ -70,11 +70,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    isUrgentMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 2, // 是否加急全部后端定为2
-    })
+    // isUrgentMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 2, // 是否加急全部后端定为2
+    // })
   })
   // 接收状态
   getDictByCode('orderStatus').then((response) => {
@@ -85,11 +85,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    statusMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 0,
-    })
+    // statusMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 0,
+    // })
     console.log(statusMap.value)
   })
 }
@@ -125,8 +125,8 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     deliverer: '', // 送样人
-    isUrgent: 2, // 是否加急
-    status: 0, // 接收状态
+    isUrgent: '', // 是否加急 2全部 1是 0否
+    status: '', // 接收状态
     offset: 1,
     limit: 20,
   }
@@ -191,12 +191,12 @@
   })
   if (list.value.length > 0) {
     const params = {
-      orderCode: '', // 委托书编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      deliverer: '', // 送样人
-      isUrgent: 2, // 是否加急
-      status: 0, // 接收状态
+      orderCode: listQuery.value.orderCode, // 委托书编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      deliverer: listQuery.value.deliverer, // 送样人
+      isUrgent: listQuery.value.isUrgent, // 是否加急
+      status: listQuery.value.status, // 接收状态
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 2d92da9..14cd1ce 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -6,7 +6,7 @@
   customerName: string // 委托方名称
   deliverer: string // 送样人
   isUrgent: number | string // 是否加急
-  status: number // 接收状态
+  status: number | string// 接收状态
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 50308c7..25c5cf9 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -53,6 +53,7 @@
   handOutProperty: string // 分发性质-初次分发、退回分发
   id?: string // 实验室id
   customerId?: string // 客户id
+  certificationState?: string // 证书出具
 }
 
 // 实验室检测/我的检测列表
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index 7c17365..7159350 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -1,6 +1,6 @@
 <!-- 任务分发 -->
 <script lang="ts" setup name="TaskEdit">
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
 import ProcessConfig from './components/processConfig.vue'
@@ -11,6 +11,7 @@
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { UploadFile } from '@/api/measure/file'
 import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 interface dictType {
   id: string
@@ -251,16 +252,22 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    // UploadFile(fd).then((res) => {
-    //   if (res.code === 200) {
-    //     sampleForm.value.minioFileName = res.data[0]
-    //     // 重置当前验证
-    //     ElMessage.success('文件上传成功')
-    //   }
-    //   else {
-    //     ElMessage.error(res.message)
-    //   }
-    // })
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        sampleForm.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+        loading.close()
+      }
+      else {
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    })
   }
 }
 const upload = () => {
@@ -402,7 +409,7 @@
               <el-form-item label="校检类别:">
                 <el-select
                   v-model="sampleForm.measureCategory"
-                  :placeholder="roleType === 'detail' ? '' : '请选择校检类别'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择校检类别'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -424,7 +431,7 @@
               <el-form-item label="厂家国别:">
                 <el-select
                   v-model="sampleForm.manufacturerCountry"
-                  :placeholder="roleType === 'detail' ? '' : '请选择厂家国别'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择厂家国别'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -450,7 +457,7 @@
               <el-form-item label="ABC:">
                 <el-select
                   v-model="sampleForm.abc"
-                  :placeholder="roleType === 'detail' ? '' : '请选择ABC'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择ABC'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -504,8 +511,8 @@
               <el-form-item label="备注:">
                 <el-input
                   v-model="sampleForm.remark"
+                  autosize
                   type="textarea"
-                  :rows="2"
                   :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
                   :class="{ 'detail-input': roleType === 'detail' }"
@@ -516,7 +523,7 @@
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="sampleForm.measureType"
-                  :placeholder="roleType === 'detail' ? '' : '请选择检定方式'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择检定方式'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index dfbbf6a..6eeff55 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -81,7 +81,7 @@
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '165px' },
   { text: '样品属性', value: 'sampleBelongName', width: '100', align: 'center' },
   { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '90' },
-  { text: '证书出具', value: 'certificationState', align: 'center', width: '90', filter: (row: ITaskList) => { return `${row.alreadyCertifications}/${row.requireCertifications}` } },
+  { text: '证书出具', value: 'certificationState', align: 'center', width: '90' },
 ])
 // 表格数据
 const list = ref<ITaskList[]>([])
@@ -104,6 +104,7 @@
   getTaskList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: ITaskList) => {
       item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      item.certificationState = `${item.alreadyCertifications}/${item.requireCertifications}`
       return item
     })
     total.value = response.data.total
diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue
index e44dd67..194de53 100644
--- a/src/views/business/subpackage/apply/list.vue
+++ b/src/views/business/subpackage/apply/list.vue
@@ -302,7 +302,7 @@
         <search-item>
           <el-date-picker
             v-model="timeRange" type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="申请开始时间" end-placeholder="申请结束时间"
+            value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="申请开始时间" end-placeholder="申请结束时间" clearable
           />
         </search-item>
       </search-area>
diff --git a/src/views/business/subpackage/check/list.vue b/src/views/business/subpackage/check/list.vue
index 51ea419..a8b6744 100644
--- a/src/views/business/subpackage/check/list.vue
+++ b/src/views/business/subpackage/check/list.vue
@@ -111,8 +111,6 @@
 
 // 时间变更
 watch(timeRange, (val) => {
-  console.log(val[0])
-
   if (val) {
     listQuery.value.checkStartTime = `${val[0]}`
     listQuery.value.checkEndTime = `${val[1]}`
@@ -345,7 +343,8 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="timeRange" type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
+            v-model="timeRange"
+            clearable type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="验收开始时间" end-placeholder="验收结束时间"
           />
         </search-item>
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 98f4a39..a0db900 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -68,6 +68,7 @@
   else {
     listQuery.value.startTime = ''
     listQuery.value.endTime = ''
+    timeRange.value = ['', '']
   }
 })
 // 多选发生改变时
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index 6e41a94..ac98b8a 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -56,7 +56,17 @@
 const checkoutList = ref<string[]>([])
 // 文件上传input
 const fileRef = ref()
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -64,8 +74,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getSampleList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index 92e4b4a..6f465fc 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -67,7 +67,17 @@
     certificationStatusMap.value[`${item.value}`] = item.name
   })
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -75,8 +85,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getSampleList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IOvertimeList) => {
       return {
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index dbaa437..14464bf 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -86,6 +86,17 @@
     width: 160,
   },
 ]) // 表格
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 const fetchData = (isNowPage = false) => {
   loadingTable.value = true
@@ -93,8 +104,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.processResult = active.value
   getApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 60d1454..d0236cc 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -105,7 +105,17 @@
     align: 'center',
   },
 ])
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 const fetchData = (isNowPage = false) => {
   loadingTable.value = true
@@ -113,8 +123,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.approvalStatus = active.value
   getApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index aeb568e..5430b0f 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -103,10 +103,21 @@
 // 装载时间数组
 const checkTime = ref<string>('')
 const loadingTable = ref(false)
+// 时间变更
+watch(checkTime, (val) => {
+  if (val) {
+    listQuery.value.checkStartDate = `${val[0]}`
+    listQuery.value.checkEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.checkStartDate = ''
+    listQuery.value.checkEndDate = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.checkStartDate = checkTime.value[0] || ''
-  listQuery.value.checkEndDate = checkTime.value[1] || ''
+  // listQuery.value.checkStartDate = checkTime.value[0] || ''
+  // listQuery.value.checkEndDate = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 6229abf..9d30934 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -112,10 +112,21 @@
 // 装载时间数组
 const checkTime = ref('')
 const loadingTable = ref(false)
+// 时间变更
+watch(checkTime, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.startTime = checkTime.value[0] || ''
-  listQuery.value.endTime = checkTime.value[1] || ''
+  // listQuery.value.startTime = checkTime.value[0] || ''
+  // listQuery.value.endTime = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index daca294..de18467 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -66,6 +66,17 @@
 const checkoutList = ref<IManageChecklist[]>([])
 // 文件上传input
 const fileRef = ref()
+// 时间变更
+watch(checkDate, (val) => {
+  if (val) {
+    listQuery.value.checkStartDate = `${val[0]}`
+    listQuery.value.checkEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.checkStartDate = ''
+    listQuery.value.checkEndDate = ''
+  }
+})
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
@@ -73,8 +84,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.checkStartDate = checkDate.value[0] || ''
-  listQuery.value.checkEndDate = checkDate.value[1] || ''
+  // listQuery.value.checkStartDate = checkDate.value[0] || ''
+  // listQuery.value.checkEndDate = checkDate.value[1] || ''
   getcheckInfoList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: any) => {
       return {
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 00d283c..50b014c 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -99,6 +99,17 @@
     approvalStatusReserveMap.value[item.name] = `${item.value}`
   })
 }
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -106,8 +117,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.approvalStatus = active.value
   getReceiveApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/receive/solve/solveList.vue b/src/views/device/receive/solve/solveList.vue
index 809c0c1..ec1e8bb 100644
--- a/src/views/device/receive/solve/solveList.vue
+++ b/src/views/device/receive/solve/solveList.vue
@@ -120,7 +120,17 @@
   timeRange.value = ['', ''] // 把时间选择框置空
   fetchData(true)
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -128,8 +138,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getReceiveApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IsolveListType) => {
       return {
diff --git a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
index 4744536..b4fe085 100644
--- a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
@@ -43,7 +43,12 @@
   select.value = -1
   listPageApi(listQuery.value).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows
+      list.value = res.data.rows.map((item: { effectiveStatusName: string }) => {
+        return {
+          ...item,
+          isDisabled: item.effectiveStatusName === '已废止',
+        }
+      })
       total.value = res.data.total
     }
   })
@@ -142,7 +147,7 @@
           </el-table-column>
           <el-table-column label="" width="55" align="center" fixed="left">
             <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
+              <el-radio v-model="select" :disabled="scope.row.isDisabled" :label="scope.$index" class="radio" />
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index a030dcf..0dd5547 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -94,12 +94,34 @@
 const preparation = ref<string>('')
 // 到期开始以及结束
 const validTime = ref<string>('')
+// 筹建日期变更
+watch(preparation, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
+// 有效日期变更
+watch(validTime, (val) => {
+  if (val) {
+    listQuery.value.validStartTime = `${val[0]}`
+    listQuery.value.validEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.validStartTime = ''
+    listQuery.value.validEndTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.preparationStartDate = preparation.value[0] || ''
-  listQuery.value.preparationEndDate = preparation.value[1] || ''
-  listQuery.value.validStartTime = validTime.value[0] || ''
-  listQuery.value.validEndTime = validTime.value[1] || ''
+  // listQuery.value.preparationStartDate = preparation.value[0] || ''
+  // listQuery.value.preparationEndDate = preparation.value[1] || ''
+  // listQuery.value.validStartTime = validTime.value[0] || ''
+  // listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index 39d8683..bb69fe9 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -99,6 +99,17 @@
 const standardManagerStateList = ref<IOptions[]>([])
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
+// 时间变更
+watch(preparationDate, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
@@ -107,8 +118,8 @@
     listQuery.value.offset = 1
   }
   // 筹建日期
-  listQuery.value.preparationStartDate = preparationDate.value[0] || ''
-  listQuery.value.preparationEndDate = preparationDate.value[1] || ''
+  // listQuery.value.preparationStartDate = preparationDate.value[0] || ''
+  // listQuery.value.preparationEndDate = preparationDate.value[1] || ''
   getStandardList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: any) => {
       return {
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 37205fc..edf9dd7 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -793,7 +793,7 @@
             保存
           </el-button>
           <!-- 待审批 -->
-          <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'agree' })">
+          <!-- <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'agree' })">
             同意
           </el-button>
           <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'reject' })">
@@ -801,7 +801,7 @@
           </el-button>
           <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'refuse' })">
             拒绝
-          </el-button>
+          </el-button> -->
           <!-- </template> -->
         </template>
         <el-button v-if="(title === '详情' && $route.query?.approvalStatusName === '草稿箱' && isCancel)" type="primary" @click="editForm">
diff --git a/src/views/finance/businessSettlement/list.vue b/src/views/finance/businessSettlement/list.vue
index e942abb..9543947 100644
--- a/src/views/finance/businessSettlement/list.vue
+++ b/src/views/finance/businessSettlement/list.vue
@@ -43,6 +43,7 @@
 const list = ref<IList[]>([]) // 表格数据
 // 选中的内容
 const checkoutList = ref<string[]>([])
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
diff --git a/src/views/finance/contract/list.vue b/src/views/finance/contract/list.vue
index 7dcdca5..5f8eb4e 100644
--- a/src/views/finance/contract/list.vue
+++ b/src/views/finance/contract/list.vue
@@ -59,6 +59,17 @@
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 选中的内容
 const checkoutList = ref<string[]>([])
+// 时间变更
+watch(dateRange, (val) => {
+  if (val) {
+    listQuery.value.estimateSignStartDate = `${val[0]}`
+    listQuery.value.estimateSignEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.estimateSignStartDate = ''
+    listQuery.value.estimateSignEndDate = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -66,8 +77,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.estimateSignStartDate = dateRange.value[0] as string || ''
-  listQuery.value.estimateSignEndDate = dateRange.value[1] as string || ''
+  // listQuery.value.estimateSignStartDate = dateRange.value[0] as string || ''
+  // listQuery.value.estimateSignEndDate = dateRange.value[1] as string || ''
   getContractList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: { estimateSignDate: string; agreementAmount: number }) => {
       return {
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 1bce5f9..07b2296 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,7 +1,7 @@
-<!-- 新增或详情弹窗 -->
+<!-- 新增或详情 -->
 <script lang="ts" setup name="addNotice">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
@@ -15,6 +15,7 @@
 import { SCHEDULE } from '@/utils/scheduleDict'
 const $route = useRoute()
 const $router = useRouter()
+const submitId = ref('') // 提交id-保存接口获取
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
 const fileTypeName = ref('')
@@ -40,12 +41,12 @@
   formId: SCHEDULE.FILE_APPROVAL,
 }) // 表单
 const rules = ref<FormRules>({
-  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
-  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
-  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
-  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
-  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+  fileName: [{ required: true, message: '名称必填', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建必填', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位必填', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间必填', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人必填', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号必填', trigger: 'blur' }],
 }) // 表单验证规则
 
 const userList = ref<userType[]>([]) // 可使用人列表
@@ -57,12 +58,14 @@
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
-const PubList = ref<deptType[]>([])
+const PubList = ref([]) as any// 发布单位列表
 const PubListTree = ref([])
 // 获取发布单位列表
 const getPubList = () => {
   getDeptTreeList().then((res) => {
     PubList.value = res.data
+    console.log('0000', 'ppp', PubList.value)
+
     PubListTree.value = toTreeList(res.data, '0', true)
   })
 }
@@ -113,43 +116,57 @@
   effectiveStatusName.value = ''
 }
 // 提交
-const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+const saveForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
-    `确认${flag}吗？`,
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then((res) => {
+        const publisherId = ruleForm.publisher
+        const index = PubList.value.findIndex((item: { id: string }) => item.id === publisherId)
+        if (index !== -1) {
+          ruleForm.publisher = PubList.value[index].name as string
+        }
+        // 保存（草稿箱）
+        confirmDrafts(ruleForm).then((res) => {
+          ruleForm.fileNo = res.data.fileNo
+          submitId.value = res.data.id
+          ElMessage.success('保存成功')
+          // formEl?.resetFields()
+          // $router.go(-1)
+          close()
+        })
+      })
+    }
+  })
+}
+const submitForm = () => {
+  if (!submitId.value) {
+    ElMessage.warning('请先保存')
+    return false
+  }
+  ElMessageBox.confirm(
+    '确认提交吗？',
     '提示',
     {
       confirmButtonText: '确认',
       cancelButtonText: '取消',
       type: 'warning',
     },
-      ).then((res) => {
-        if (flag === '提交') {
-          confirmDrafts(ruleForm).then((res) => {
-            if (res.code === 200) {
-              console.log(res.data, '保存成功')
-              submitFile({ id: res.data.id, formId: SCHEDULE.FILE_APPROVAL }).then((res) => {
-                formEl?.resetFields()
-                ElMessage.success('提交成功')
-                $router.go(-1)
-                close()
-              })
-            }
-          })
-        }
-        else {
-          // 保存（草稿箱）
-          confirmDrafts(ruleForm).then((res) => {
-            ElMessage.success('保存成功')
-            formEl?.resetFields()
-            $router.go(-1)
-            close()
-          })
-        }
-      })
-    }
+  ).then((res) => {
+    submitFile({ id: submitId.value, formId: SCHEDULE.FILE_APPROVAL }).then((res) => {
+    // formEl?.resetFields()
+      ElMessage.success('已提交')
+      $router.go(-1)
+      close()
+    })
   })
 }
 // 取消
@@ -163,9 +180,14 @@
 const onFileChange = (event: any) => {
   // 原生上传
   // console.log(event.target.files)
+
   if (event.target.files?.length !== 0) {
     // 创建formdata对象
     const fd = new FormData()
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
@@ -173,9 +195,11 @@
         // 重置当前验证
         ruleFormRef.value?.clearValidate('minioFileName')
         ElMessage.success('文件上传成功')
+        loading.close()
       }
       else {
         ElMessage.error(res.message)
+        loading.close()
       }
     })
   }
@@ -215,10 +239,10 @@
   <app-container style="overflow: hidden;">
     <detail-page :title="`${fileTypeName}-${title}`">
       <template #btns>
-        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm()">
           提交
         </el-button>
-        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
+        <el-button v-if="title !== '详情'" type="primary" @click="saveForm(ruleFormRef)">
           保存
         </el-button>
         <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -258,7 +282,7 @@
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
                 style="width: 100%;"

diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..9cf2b29 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -28,6 +28,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    DeptSelectByName: typeof import('./components/DeptSelectByName/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
diff --git a/src/views/business/board/standardReminder/list.vue b/src/views/business/board/standardReminder/list.vue
index 85efbb1..fd60743 100644
--- a/src/views/business/board/standardReminder/list.vue
+++ b/src/views/business/board/standardReminder/list.vue
@@ -94,12 +94,33 @@
 const preparation = ref<string>('')
 // 到期开始以及结束
 const validTime = ref<string>('')
+watch(preparation, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
+// 有效日期变更
+watch(validTime, (val) => {
+  if (val) {
+    listQuery.value.validStartTime = `${val[0]}`
+    listQuery.value.validEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.validStartTime = ''
+    listQuery.value.validEndTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.preparationStartDate = preparation.value[0] || ''
-  listQuery.value.preparationEndDate = preparation.value[1] || ''
-  listQuery.value.validStartTime = validTime.value[0] || ''
-  listQuery.value.validEndTime = validTime.value[1] || ''
+  // listQuery.value.preparationStartDate = preparation.value[0] || ''
+  // listQuery.value.preparationEndDate = preparation.value[1] || ''
+  // listQuery.value.validStartTime = validTime.value[0] || ''
+  // listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -223,16 +244,16 @@
   })
   if (list.value.length > 0) {
     const params = {
-      category: '', // 类别
-      id: '', // 主键id
-      managerState: '', // 管理状态
-      preparationEndDate: '', // 结束时间
-      preparationStartDate: '', // 开始时间
-      standardLaboratory: '', // 标准所在部门
-      standardName: '', // 标准名称
-      standardNo: '', // 标准编号
-      validEndTime: '', // 结束时间
-      validStartTime: '', // 开始时间
+      category: listQuery.value.category, // 类别
+      id: listQuery.value.id, // 主键id
+      managerState: listQuery.value.managerState, // 管理状态
+      preparationEndDate: listQuery.value.preparationEndDate, // 结束时间
+      preparationStartDate: listQuery.value.preparationStartDate, // 开始时间
+      standardLaboratory: listQuery.value.standardLaboratory, // 标准所在部门
+      standardName: listQuery.value.standardName, // 标准名称
+      standardNo: listQuery.value.standardNo, // 标准编号
+      validEndTime: listQuery.value.validEndTime, // 结束时间
+      validStartTime: listQuery.value.validStartTime, // 开始时间
       offset: 1, // 当前页
       limit: 20, // 每页多少条
       ids: checkoutList.value,
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 8666957..37ac73f 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -137,7 +137,7 @@
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  distributeDialogRef.value.initDialog(row.id, row.sampleId, row.orderId)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId, row.sampleStatus)
 }
 // 点击标签绑定
 const barCodeBind = ref()
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 807ea30..4e4eb46 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -37,11 +37,21 @@
   { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
   { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
 ])
-
+// 时间变更
+watch(trainTime, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 查询列表
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.startTime = trainTime.value[0] || ''
-  listQuery.value.endTime = trainTime.value[1] || ''
+  // listQuery.value.startTime = trainTime.value[0] || ''
+  // listQuery.value.endTime = trainTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2f7c1d0..bccde84 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -139,7 +139,17 @@
     id: '2', // 后端规定已收入传2
   })
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -147,8 +157,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.sampleStatus = active.value
   getInterChangeList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IinterchangeList) => {
@@ -280,7 +290,7 @@
       else if (type === 'delete') { // 无需检测
         interchangeStatusChange({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '7' }).then((res) => {
           if (res.code === 200) {
-            ElMessage.success(`已${title}`)
+            ElMessage.success('操作成功')
             fetchData(true)
           }
         })
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList.vue b/src/views/business/schedule/interchangeReceipt/receiptList.vue
index 275a053..83d93f4 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptList.vue
@@ -42,7 +42,17 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -50,8 +60,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getReceiptList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -124,13 +134,13 @@
   })
   if (list.value.length > 0) {
     const params = {
-      interchangeCode: '', // 交接单编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      reciever: '', // 接收人
-      deliverer: '', // 送样人
-      startTime: '', // 交接开始时间
-      endTime: '', // 交接结束时间
+      interchangeCode: listQuery.value.interchangeCode, // 交接单编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      reciever: listQuery.value.reciever, // 接收人
+      deliverer: listQuery.value.deliverer, // 送样人
+      startTime: listQuery.value.startTime, // 交接开始时间
+      endTime: listQuery.value.endTime, // 交接结束时间
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index cf0b532..f2fc852 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -26,8 +26,8 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   deliverer: '', // 送样人
-  isUrgent: 2, // 是否加急 2全部 1是 0否
-  status: 0, // 接收状态
+  isUrgent: '', // 是否加急 2全部 1是 0否
+  status: '', // 接收状态
   offset: 1,
   limit: 20,
 })
@@ -70,11 +70,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    isUrgentMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 2, // 是否加急全部后端定为2
-    })
+    // isUrgentMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 2, // 是否加急全部后端定为2
+    // })
   })
   // 接收状态
   getDictByCode('orderStatus').then((response) => {
@@ -85,11 +85,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    statusMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 0,
-    })
+    // statusMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 0,
+    // })
     console.log(statusMap.value)
   })
 }
@@ -125,8 +125,8 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     deliverer: '', // 送样人
-    isUrgent: 2, // 是否加急
-    status: 0, // 接收状态
+    isUrgent: '', // 是否加急 2全部 1是 0否
+    status: '', // 接收状态
     offset: 1,
     limit: 20,
   }
@@ -191,12 +191,12 @@
   })
   if (list.value.length > 0) {
     const params = {
-      orderCode: '', // 委托书编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      deliverer: '', // 送样人
-      isUrgent: 2, // 是否加急
-      status: 0, // 接收状态
+      orderCode: listQuery.value.orderCode, // 委托书编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      deliverer: listQuery.value.deliverer, // 送样人
+      isUrgent: listQuery.value.isUrgent, // 是否加急
+      status: listQuery.value.status, // 接收状态
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 2d92da9..14cd1ce 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -6,7 +6,7 @@
   customerName: string // 委托方名称
   deliverer: string // 送样人
   isUrgent: number | string // 是否加急
-  status: number // 接收状态
+  status: number | string// 接收状态
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 50308c7..25c5cf9 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -53,6 +53,7 @@
   handOutProperty: string // 分发性质-初次分发、退回分发
   id?: string // 实验室id
   customerId?: string // 客户id
+  certificationState?: string // 证书出具
 }
 
 // 实验室检测/我的检测列表
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index 7c17365..7159350 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -1,6 +1,6 @@
 <!-- 任务分发 -->
 <script lang="ts" setup name="TaskEdit">
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
 import ProcessConfig from './components/processConfig.vue'
@@ -11,6 +11,7 @@
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { UploadFile } from '@/api/measure/file'
 import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 interface dictType {
   id: string
@@ -251,16 +252,22 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    // UploadFile(fd).then((res) => {
-    //   if (res.code === 200) {
-    //     sampleForm.value.minioFileName = res.data[0]
-    //     // 重置当前验证
-    //     ElMessage.success('文件上传成功')
-    //   }
-    //   else {
-    //     ElMessage.error(res.message)
-    //   }
-    // })
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        sampleForm.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+        loading.close()
+      }
+      else {
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    })
   }
 }
 const upload = () => {
@@ -402,7 +409,7 @@
               <el-form-item label="校检类别:">
                 <el-select
                   v-model="sampleForm.measureCategory"
-                  :placeholder="roleType === 'detail' ? '' : '请选择校检类别'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择校检类别'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -424,7 +431,7 @@
               <el-form-item label="厂家国别:">
                 <el-select
                   v-model="sampleForm.manufacturerCountry"
-                  :placeholder="roleType === 'detail' ? '' : '请选择厂家国别'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择厂家国别'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -450,7 +457,7 @@
               <el-form-item label="ABC:">
                 <el-select
                   v-model="sampleForm.abc"
-                  :placeholder="roleType === 'detail' ? '' : '请选择ABC'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择ABC'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -504,8 +511,8 @@
               <el-form-item label="备注:">
                 <el-input
                   v-model="sampleForm.remark"
+                  autosize
                   type="textarea"
-                  :rows="2"
                   :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
                   :class="{ 'detail-input': roleType === 'detail' }"
@@ -516,7 +523,7 @@
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="sampleForm.measureType"
-                  :placeholder="roleType === 'detail' ? '' : '请选择检定方式'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择检定方式'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index dfbbf6a..6eeff55 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -81,7 +81,7 @@
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '165px' },
   { text: '样品属性', value: 'sampleBelongName', width: '100', align: 'center' },
   { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '90' },
-  { text: '证书出具', value: 'certificationState', align: 'center', width: '90', filter: (row: ITaskList) => { return `${row.alreadyCertifications}/${row.requireCertifications}` } },
+  { text: '证书出具', value: 'certificationState', align: 'center', width: '90' },
 ])
 // 表格数据
 const list = ref<ITaskList[]>([])
@@ -104,6 +104,7 @@
   getTaskList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: ITaskList) => {
       item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      item.certificationState = `${item.alreadyCertifications}/${item.requireCertifications}`
       return item
     })
     total.value = response.data.total
diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue
index e44dd67..194de53 100644
--- a/src/views/business/subpackage/apply/list.vue
+++ b/src/views/business/subpackage/apply/list.vue
@@ -302,7 +302,7 @@
         <search-item>
           <el-date-picker
             v-model="timeRange" type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="申请开始时间" end-placeholder="申请结束时间"
+            value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="申请开始时间" end-placeholder="申请结束时间" clearable
           />
         </search-item>
       </search-area>
diff --git a/src/views/business/subpackage/check/list.vue b/src/views/business/subpackage/check/list.vue
index 51ea419..a8b6744 100644
--- a/src/views/business/subpackage/check/list.vue
+++ b/src/views/business/subpackage/check/list.vue
@@ -111,8 +111,6 @@
 
 // 时间变更
 watch(timeRange, (val) => {
-  console.log(val[0])
-
   if (val) {
     listQuery.value.checkStartTime = `${val[0]}`
     listQuery.value.checkEndTime = `${val[1]}`
@@ -345,7 +343,8 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="timeRange" type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
+            v-model="timeRange"
+            clearable type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="验收开始时间" end-placeholder="验收结束时间"
           />
         </search-item>
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 98f4a39..a0db900 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -68,6 +68,7 @@
   else {
     listQuery.value.startTime = ''
     listQuery.value.endTime = ''
+    timeRange.value = ['', '']
   }
 })
 // 多选发生改变时
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index 6e41a94..ac98b8a 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -56,7 +56,17 @@
 const checkoutList = ref<string[]>([])
 // 文件上传input
 const fileRef = ref()
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -64,8 +74,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getSampleList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index 92e4b4a..6f465fc 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -67,7 +67,17 @@
     certificationStatusMap.value[`${item.value}`] = item.name
   })
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -75,8 +85,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getSampleList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IOvertimeList) => {
       return {
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index dbaa437..14464bf 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -86,6 +86,17 @@
     width: 160,
   },
 ]) // 表格
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 const fetchData = (isNowPage = false) => {
   loadingTable.value = true
@@ -93,8 +104,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.processResult = active.value
   getApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 60d1454..d0236cc 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -105,7 +105,17 @@
     align: 'center',
   },
 ])
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 const fetchData = (isNowPage = false) => {
   loadingTable.value = true
@@ -113,8 +123,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.approvalStatus = active.value
   getApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index aeb568e..5430b0f 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -103,10 +103,21 @@
 // 装载时间数组
 const checkTime = ref<string>('')
 const loadingTable = ref(false)
+// 时间变更
+watch(checkTime, (val) => {
+  if (val) {
+    listQuery.value.checkStartDate = `${val[0]}`
+    listQuery.value.checkEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.checkStartDate = ''
+    listQuery.value.checkEndDate = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.checkStartDate = checkTime.value[0] || ''
-  listQuery.value.checkEndDate = checkTime.value[1] || ''
+  // listQuery.value.checkStartDate = checkTime.value[0] || ''
+  // listQuery.value.checkEndDate = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 6229abf..9d30934 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -112,10 +112,21 @@
 // 装载时间数组
 const checkTime = ref('')
 const loadingTable = ref(false)
+// 时间变更
+watch(checkTime, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.startTime = checkTime.value[0] || ''
-  listQuery.value.endTime = checkTime.value[1] || ''
+  // listQuery.value.startTime = checkTime.value[0] || ''
+  // listQuery.value.endTime = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index daca294..de18467 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -66,6 +66,17 @@
 const checkoutList = ref<IManageChecklist[]>([])
 // 文件上传input
 const fileRef = ref()
+// 时间变更
+watch(checkDate, (val) => {
+  if (val) {
+    listQuery.value.checkStartDate = `${val[0]}`
+    listQuery.value.checkEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.checkStartDate = ''
+    listQuery.value.checkEndDate = ''
+  }
+})
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
@@ -73,8 +84,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.checkStartDate = checkDate.value[0] || ''
-  listQuery.value.checkEndDate = checkDate.value[1] || ''
+  // listQuery.value.checkStartDate = checkDate.value[0] || ''
+  // listQuery.value.checkEndDate = checkDate.value[1] || ''
   getcheckInfoList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: any) => {
       return {
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 00d283c..50b014c 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -99,6 +99,17 @@
     approvalStatusReserveMap.value[item.name] = `${item.value}`
   })
 }
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -106,8 +117,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.approvalStatus = active.value
   getReceiveApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/receive/solve/solveList.vue b/src/views/device/receive/solve/solveList.vue
index 809c0c1..ec1e8bb 100644
--- a/src/views/device/receive/solve/solveList.vue
+++ b/src/views/device/receive/solve/solveList.vue
@@ -120,7 +120,17 @@
   timeRange.value = ['', ''] // 把时间选择框置空
   fetchData(true)
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -128,8 +138,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getReceiveApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IsolveListType) => {
       return {
diff --git a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
index 4744536..b4fe085 100644
--- a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
@@ -43,7 +43,12 @@
   select.value = -1
   listPageApi(listQuery.value).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows
+      list.value = res.data.rows.map((item: { effectiveStatusName: string }) => {
+        return {
+          ...item,
+          isDisabled: item.effectiveStatusName === '已废止',
+        }
+      })
       total.value = res.data.total
     }
   })
@@ -142,7 +147,7 @@
           </el-table-column>
           <el-table-column label="" width="55" align="center" fixed="left">
             <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
+              <el-radio v-model="select" :disabled="scope.row.isDisabled" :label="scope.$index" class="radio" />
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index a030dcf..0dd5547 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -94,12 +94,34 @@
 const preparation = ref<string>('')
 // 到期开始以及结束
 const validTime = ref<string>('')
+// 筹建日期变更
+watch(preparation, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
+// 有效日期变更
+watch(validTime, (val) => {
+  if (val) {
+    listQuery.value.validStartTime = `${val[0]}`
+    listQuery.value.validEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.validStartTime = ''
+    listQuery.value.validEndTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.preparationStartDate = preparation.value[0] || ''
-  listQuery.value.preparationEndDate = preparation.value[1] || ''
-  listQuery.value.validStartTime = validTime.value[0] || ''
-  listQuery.value.validEndTime = validTime.value[1] || ''
+  // listQuery.value.preparationStartDate = preparation.value[0] || ''
+  // listQuery.value.preparationEndDate = preparation.value[1] || ''
+  // listQuery.value.validStartTime = validTime.value[0] || ''
+  // listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index 39d8683..bb69fe9 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -99,6 +99,17 @@
 const standardManagerStateList = ref<IOptions[]>([])
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
+// 时间变更
+watch(preparationDate, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
@@ -107,8 +118,8 @@
     listQuery.value.offset = 1
   }
   // 筹建日期
-  listQuery.value.preparationStartDate = preparationDate.value[0] || ''
-  listQuery.value.preparationEndDate = preparationDate.value[1] || ''
+  // listQuery.value.preparationStartDate = preparationDate.value[0] || ''
+  // listQuery.value.preparationEndDate = preparationDate.value[1] || ''
   getStandardList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: any) => {
       return {
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 37205fc..edf9dd7 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -793,7 +793,7 @@
             保存
           </el-button>
           <!-- 待审批 -->
-          <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'agree' })">
+          <!-- <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'agree' })">
             同意
           </el-button>
           <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'reject' })">
@@ -801,7 +801,7 @@
           </el-button>
           <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'refuse' })">
             拒绝
-          </el-button>
+          </el-button> -->
           <!-- </template> -->
         </template>
         <el-button v-if="(title === '详情' && $route.query?.approvalStatusName === '草稿箱' && isCancel)" type="primary" @click="editForm">
diff --git a/src/views/finance/businessSettlement/list.vue b/src/views/finance/businessSettlement/list.vue
index e942abb..9543947 100644
--- a/src/views/finance/businessSettlement/list.vue
+++ b/src/views/finance/businessSettlement/list.vue
@@ -43,6 +43,7 @@
 const list = ref<IList[]>([]) // 表格数据
 // 选中的内容
 const checkoutList = ref<string[]>([])
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
diff --git a/src/views/finance/contract/list.vue b/src/views/finance/contract/list.vue
index 7dcdca5..5f8eb4e 100644
--- a/src/views/finance/contract/list.vue
+++ b/src/views/finance/contract/list.vue
@@ -59,6 +59,17 @@
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 选中的内容
 const checkoutList = ref<string[]>([])
+// 时间变更
+watch(dateRange, (val) => {
+  if (val) {
+    listQuery.value.estimateSignStartDate = `${val[0]}`
+    listQuery.value.estimateSignEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.estimateSignStartDate = ''
+    listQuery.value.estimateSignEndDate = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -66,8 +77,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.estimateSignStartDate = dateRange.value[0] as string || ''
-  listQuery.value.estimateSignEndDate = dateRange.value[1] as string || ''
+  // listQuery.value.estimateSignStartDate = dateRange.value[0] as string || ''
+  // listQuery.value.estimateSignEndDate = dateRange.value[1] as string || ''
   getContractList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: { estimateSignDate: string; agreementAmount: number }) => {
       return {
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 1bce5f9..07b2296 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,7 +1,7 @@
-<!-- 新增或详情弹窗 -->
+<!-- 新增或详情 -->
 <script lang="ts" setup name="addNotice">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
@@ -15,6 +15,7 @@
 import { SCHEDULE } from '@/utils/scheduleDict'
 const $route = useRoute()
 const $router = useRouter()
+const submitId = ref('') // 提交id-保存接口获取
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
 const fileTypeName = ref('')
@@ -40,12 +41,12 @@
   formId: SCHEDULE.FILE_APPROVAL,
 }) // 表单
 const rules = ref<FormRules>({
-  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
-  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
-  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
-  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
-  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+  fileName: [{ required: true, message: '名称必填', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建必填', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位必填', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间必填', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人必填', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号必填', trigger: 'blur' }],
 }) // 表单验证规则
 
 const userList = ref<userType[]>([]) // 可使用人列表
@@ -57,12 +58,14 @@
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
-const PubList = ref<deptType[]>([])
+const PubList = ref([]) as any// 发布单位列表
 const PubListTree = ref([])
 // 获取发布单位列表
 const getPubList = () => {
   getDeptTreeList().then((res) => {
     PubList.value = res.data
+    console.log('0000', 'ppp', PubList.value)
+
     PubListTree.value = toTreeList(res.data, '0', true)
   })
 }
@@ -113,43 +116,57 @@
   effectiveStatusName.value = ''
 }
 // 提交
-const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+const saveForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
-    `确认${flag}吗？`,
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then((res) => {
+        const publisherId = ruleForm.publisher
+        const index = PubList.value.findIndex((item: { id: string }) => item.id === publisherId)
+        if (index !== -1) {
+          ruleForm.publisher = PubList.value[index].name as string
+        }
+        // 保存（草稿箱）
+        confirmDrafts(ruleForm).then((res) => {
+          ruleForm.fileNo = res.data.fileNo
+          submitId.value = res.data.id
+          ElMessage.success('保存成功')
+          // formEl?.resetFields()
+          // $router.go(-1)
+          close()
+        })
+      })
+    }
+  })
+}
+const submitForm = () => {
+  if (!submitId.value) {
+    ElMessage.warning('请先保存')
+    return false
+  }
+  ElMessageBox.confirm(
+    '确认提交吗？',
     '提示',
     {
       confirmButtonText: '确认',
       cancelButtonText: '取消',
       type: 'warning',
     },
-      ).then((res) => {
-        if (flag === '提交') {
-          confirmDrafts(ruleForm).then((res) => {
-            if (res.code === 200) {
-              console.log(res.data, '保存成功')
-              submitFile({ id: res.data.id, formId: SCHEDULE.FILE_APPROVAL }).then((res) => {
-                formEl?.resetFields()
-                ElMessage.success('提交成功')
-                $router.go(-1)
-                close()
-              })
-            }
-          })
-        }
-        else {
-          // 保存（草稿箱）
-          confirmDrafts(ruleForm).then((res) => {
-            ElMessage.success('保存成功')
-            formEl?.resetFields()
-            $router.go(-1)
-            close()
-          })
-        }
-      })
-    }
+  ).then((res) => {
+    submitFile({ id: submitId.value, formId: SCHEDULE.FILE_APPROVAL }).then((res) => {
+    // formEl?.resetFields()
+      ElMessage.success('已提交')
+      $router.go(-1)
+      close()
+    })
   })
 }
 // 取消
@@ -163,9 +180,14 @@
 const onFileChange = (event: any) => {
   // 原生上传
   // console.log(event.target.files)
+
   if (event.target.files?.length !== 0) {
     // 创建formdata对象
     const fd = new FormData()
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
@@ -173,9 +195,11 @@
         // 重置当前验证
         ruleFormRef.value?.clearValidate('minioFileName')
         ElMessage.success('文件上传成功')
+        loading.close()
       }
       else {
         ElMessage.error(res.message)
+        loading.close()
       }
     })
   }
@@ -215,10 +239,10 @@
   <app-container style="overflow: hidden;">
     <detail-page :title="`${fileTypeName}-${title}`">
       <template #btns>
-        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm()">
           提交
         </el-button>
-        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
+        <el-button v-if="title !== '详情'" type="primary" @click="saveForm(ruleFormRef)">
           保存
         </el-button>
         <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -258,7 +282,7 @@
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
                 style="width: 100%;"
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 135d059..c2b46c0 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -1,6 +1,7 @@
 <!-- 文件审批公共模板 -->
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { DateModelType } from 'element-plus'
 import type { TableRow } from './approve-interface'
 import type { fileResType } from '@/views/measure/file/file-interface'
 import { printJSON } from '@/utils/printUtils'
@@ -32,12 +33,13 @@
 const approvalStatusReserveMap = ref({ ...props.approvalStatusReserveMap }) // 审批状态字典{草稿箱: 1}
 const activeTitle = ref('') // active对应的审批状态名字
 
-const searchQuery = reactive({
+const searchQuery = ref({
   fileNo: '', // 编号
   fileName: '', // 名称
   fileCode: '', // 文件号
   createUser: '', // 创建人
-  createTime: '', // 创建
+  createStartTime: '', // 创建开始时间
+  createEndTime: '', // 创建结束时间
   approvalStatus: approvalStatus.value, // 审批状态
   limit: 20,
   offset: 1,
@@ -49,18 +51,31 @@
 const total = ref<number>(0) // 数据总条数
 const columns = ref<TableColumn[]>([
   { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
+  { text: '编号', value: 'fileNo', align: 'center', width: '160' },
   { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
+  { text: '类别', value: 'fileTypeName', align: 'center' },
   { text: '创建人', value: 'createUser', align: 'center' },
-  { text: '创建时间', value: 'createTime', align: 'center' },
-  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110' },
 ]) // 表格
 const list = ref<TableRow[]>([]) // 表格数据
+// 筛选时间段数据
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    searchQuery.value.createStartTime = `${val[0]}`
+    searchQuery.value.createEndTime = `${val[1]}`
+  }
+  else {
+    searchQuery.value.createStartTime = ''
+    searchQuery.value.createEndTime = ''
+  }
+})
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
-  approvallistPageApi(searchQuery).then((res) => {
+  approvallistPageApi(searchQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows.map((item: TableRow) => {
         return {
@@ -85,10 +100,10 @@
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
-    searchQuery.limit = val.size
+    searchQuery.value.limit = val.size
   }
   if (val && val.page) {
-    searchQuery.offset = val.page
+    searchQuery.value.offset = val.page
   }
   getList()
 }
@@ -216,12 +231,21 @@
 }
 // 重置
 const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.fileType = ''
-  searchQuery.createTime = ''
-  searchQuery.createUser = ''
+  searchQuery.value = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    fileCode: '', // 文件号
+    createUser: '', // 创建人
+    createStartTime: '', // 创建开始时间
+    createEndTime: '', // 创建结束时间
+    approvalStatus: approvalStatus.value, // 审批状态
+    limit: 20,
+    offset: 1,
+    fileType: '', // 文件类别
+    formId: SCHEDULE.FILE_APPROVAL,
+    ids: [] as string[],
+  }
+  timeRange.value = ['', '']
   getList()
 }
 // 表格被选中的行
@@ -230,27 +254,6 @@
 const multiSelect = (row: TableRow[]) => {
   selectList.value = row
 }
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  searchQuery.ids = []
-  if (selectList.value.length) {
-    selectList.value.forEach((item) => {
-      searchQuery.ids?.push(item.id as string)
-    })
-  }
-  exportFileApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
-    exportFile(res.data, props.name)
-    loading.close()
-    searchQuery.ids = []
-  }).catch((_) => {
-    loading.close()
-  })
-}
 // 打印
 function printList() {
   const selectIds = selectList.value.map(item => item.id)
@@ -278,8 +281,8 @@
   sessionStorage.setItem('approveFileMenu', props.name)
   approvalStatus.value = approvalStatusReserveMap.value[props.name]
   // approvalStatus.value = approvalStatusReserveMap.value[props.name] // 失效
-  searchQuery.approvalStatus = approvalStatusReserveMap.value[props.name] || '0'
-  $router.currentRoute.value.query.cacheActive = searchQuery.approvalStatus
+  searchQuery.value.approvalStatus = approvalStatusReserveMap.value[props.name] || '0'
+  $router.currentRoute.value.query.cacheActive = searchQuery.value.approvalStatus
   getList()
   // 缓存名称
 }, { deep: true, immediate: true })
@@ -312,8 +315,14 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss" placeholder="创建时间"
+            v-model="timeRange"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="创建开始时间"
+            end-placeholder="创建结束时间"
+            clearable
+            style="width: 360px;"
           />
         </search-item>
         <search-item>
@@ -323,10 +332,6 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <icon-button
-            v-if="proxy.hasPerm('/file/approve/export')" icon="icon-export" title="导出"
-            @click="exportExcelBtn"
-          />
           <icon-button v-if="proxy.hasPerm('/file/approve/print')" icon="icon-print" title="打印" @click="printList" />
         </template>
         <!-- 表格区域 -->

diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..9cf2b29 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -28,6 +28,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    DeptSelectByName: typeof import('./components/DeptSelectByName/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
diff --git a/src/views/business/board/standardReminder/list.vue b/src/views/business/board/standardReminder/list.vue
index 85efbb1..fd60743 100644
--- a/src/views/business/board/standardReminder/list.vue
+++ b/src/views/business/board/standardReminder/list.vue
@@ -94,12 +94,33 @@
 const preparation = ref<string>('')
 // 到期开始以及结束
 const validTime = ref<string>('')
+watch(preparation, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
+// 有效日期变更
+watch(validTime, (val) => {
+  if (val) {
+    listQuery.value.validStartTime = `${val[0]}`
+    listQuery.value.validEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.validStartTime = ''
+    listQuery.value.validEndTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.preparationStartDate = preparation.value[0] || ''
-  listQuery.value.preparationEndDate = preparation.value[1] || ''
-  listQuery.value.validStartTime = validTime.value[0] || ''
-  listQuery.value.validEndTime = validTime.value[1] || ''
+  // listQuery.value.preparationStartDate = preparation.value[0] || ''
+  // listQuery.value.preparationEndDate = preparation.value[1] || ''
+  // listQuery.value.validStartTime = validTime.value[0] || ''
+  // listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -223,16 +244,16 @@
   })
   if (list.value.length > 0) {
     const params = {
-      category: '', // 类别
-      id: '', // 主键id
-      managerState: '', // 管理状态
-      preparationEndDate: '', // 结束时间
-      preparationStartDate: '', // 开始时间
-      standardLaboratory: '', // 标准所在部门
-      standardName: '', // 标准名称
-      standardNo: '', // 标准编号
-      validEndTime: '', // 结束时间
-      validStartTime: '', // 开始时间
+      category: listQuery.value.category, // 类别
+      id: listQuery.value.id, // 主键id
+      managerState: listQuery.value.managerState, // 管理状态
+      preparationEndDate: listQuery.value.preparationEndDate, // 结束时间
+      preparationStartDate: listQuery.value.preparationStartDate, // 开始时间
+      standardLaboratory: listQuery.value.standardLaboratory, // 标准所在部门
+      standardName: listQuery.value.standardName, // 标准名称
+      standardNo: listQuery.value.standardNo, // 标准编号
+      validEndTime: listQuery.value.validEndTime, // 结束时间
+      validStartTime: listQuery.value.validStartTime, // 开始时间
       offset: 1, // 当前页
       limit: 20, // 每页多少条
       ids: checkoutList.value,
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 8666957..37ac73f 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -137,7 +137,7 @@
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  distributeDialogRef.value.initDialog(row.id, row.sampleId, row.orderId)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId, row.sampleStatus)
 }
 // 点击标签绑定
 const barCodeBind = ref()
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 807ea30..4e4eb46 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -37,11 +37,21 @@
   { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
   { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
 ])
-
+// 时间变更
+watch(trainTime, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 查询列表
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.startTime = trainTime.value[0] || ''
-  listQuery.value.endTime = trainTime.value[1] || ''
+  // listQuery.value.startTime = trainTime.value[0] || ''
+  // listQuery.value.endTime = trainTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2f7c1d0..bccde84 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -139,7 +139,17 @@
     id: '2', // 后端规定已收入传2
   })
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -147,8 +157,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.sampleStatus = active.value
   getInterChangeList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IinterchangeList) => {
@@ -280,7 +290,7 @@
       else if (type === 'delete') { // 无需检测
         interchangeStatusChange({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '7' }).then((res) => {
           if (res.code === 200) {
-            ElMessage.success(`已${title}`)
+            ElMessage.success('操作成功')
             fetchData(true)
           }
         })
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList.vue b/src/views/business/schedule/interchangeReceipt/receiptList.vue
index 275a053..83d93f4 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptList.vue
@@ -42,7 +42,17 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -50,8 +60,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getReceiptList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -124,13 +134,13 @@
   })
   if (list.value.length > 0) {
     const params = {
-      interchangeCode: '', // 交接单编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      reciever: '', // 接收人
-      deliverer: '', // 送样人
-      startTime: '', // 交接开始时间
-      endTime: '', // 交接结束时间
+      interchangeCode: listQuery.value.interchangeCode, // 交接单编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      reciever: listQuery.value.reciever, // 接收人
+      deliverer: listQuery.value.deliverer, // 送样人
+      startTime: listQuery.value.startTime, // 交接开始时间
+      endTime: listQuery.value.endTime, // 交接结束时间
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index cf0b532..f2fc852 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -26,8 +26,8 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   deliverer: '', // 送样人
-  isUrgent: 2, // 是否加急 2全部 1是 0否
-  status: 0, // 接收状态
+  isUrgent: '', // 是否加急 2全部 1是 0否
+  status: '', // 接收状态
   offset: 1,
   limit: 20,
 })
@@ -70,11 +70,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    isUrgentMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 2, // 是否加急全部后端定为2
-    })
+    // isUrgentMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 2, // 是否加急全部后端定为2
+    // })
   })
   // 接收状态
   getDictByCode('orderStatus').then((response) => {
@@ -85,11 +85,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    statusMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 0,
-    })
+    // statusMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 0,
+    // })
     console.log(statusMap.value)
   })
 }
@@ -125,8 +125,8 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     deliverer: '', // 送样人
-    isUrgent: 2, // 是否加急
-    status: 0, // 接收状态
+    isUrgent: '', // 是否加急 2全部 1是 0否
+    status: '', // 接收状态
     offset: 1,
     limit: 20,
   }
@@ -191,12 +191,12 @@
   })
   if (list.value.length > 0) {
     const params = {
-      orderCode: '', // 委托书编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      deliverer: '', // 送样人
-      isUrgent: 2, // 是否加急
-      status: 0, // 接收状态
+      orderCode: listQuery.value.orderCode, // 委托书编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      deliverer: listQuery.value.deliverer, // 送样人
+      isUrgent: listQuery.value.isUrgent, // 是否加急
+      status: listQuery.value.status, // 接收状态
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 2d92da9..14cd1ce 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -6,7 +6,7 @@
   customerName: string // 委托方名称
   deliverer: string // 送样人
   isUrgent: number | string // 是否加急
-  status: number // 接收状态
+  status: number | string// 接收状态
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 50308c7..25c5cf9 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -53,6 +53,7 @@
   handOutProperty: string // 分发性质-初次分发、退回分发
   id?: string // 实验室id
   customerId?: string // 客户id
+  certificationState?: string // 证书出具
 }
 
 // 实验室检测/我的检测列表
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index 7c17365..7159350 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -1,6 +1,6 @@
 <!-- 任务分发 -->
 <script lang="ts" setup name="TaskEdit">
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
 import ProcessConfig from './components/processConfig.vue'
@@ -11,6 +11,7 @@
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { UploadFile } from '@/api/measure/file'
 import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 interface dictType {
   id: string
@@ -251,16 +252,22 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    // UploadFile(fd).then((res) => {
-    //   if (res.code === 200) {
-    //     sampleForm.value.minioFileName = res.data[0]
-    //     // 重置当前验证
-    //     ElMessage.success('文件上传成功')
-    //   }
-    //   else {
-    //     ElMessage.error(res.message)
-    //   }
-    // })
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        sampleForm.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+        loading.close()
+      }
+      else {
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    })
   }
 }
 const upload = () => {
@@ -402,7 +409,7 @@
               <el-form-item label="校检类别:">
                 <el-select
                   v-model="sampleForm.measureCategory"
-                  :placeholder="roleType === 'detail' ? '' : '请选择校检类别'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择校检类别'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -424,7 +431,7 @@
               <el-form-item label="厂家国别:">
                 <el-select
                   v-model="sampleForm.manufacturerCountry"
-                  :placeholder="roleType === 'detail' ? '' : '请选择厂家国别'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择厂家国别'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -450,7 +457,7 @@
               <el-form-item label="ABC:">
                 <el-select
                   v-model="sampleForm.abc"
-                  :placeholder="roleType === 'detail' ? '' : '请选择ABC'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择ABC'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -504,8 +511,8 @@
               <el-form-item label="备注:">
                 <el-input
                   v-model="sampleForm.remark"
+                  autosize
                   type="textarea"
-                  :rows="2"
                   :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
                   :class="{ 'detail-input': roleType === 'detail' }"
@@ -516,7 +523,7 @@
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="sampleForm.measureType"
-                  :placeholder="roleType === 'detail' ? '' : '请选择检定方式'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择检定方式'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index dfbbf6a..6eeff55 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -81,7 +81,7 @@
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '165px' },
   { text: '样品属性', value: 'sampleBelongName', width: '100', align: 'center' },
   { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '90' },
-  { text: '证书出具', value: 'certificationState', align: 'center', width: '90', filter: (row: ITaskList) => { return `${row.alreadyCertifications}/${row.requireCertifications}` } },
+  { text: '证书出具', value: 'certificationState', align: 'center', width: '90' },
 ])
 // 表格数据
 const list = ref<ITaskList[]>([])
@@ -104,6 +104,7 @@
   getTaskList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: ITaskList) => {
       item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      item.certificationState = `${item.alreadyCertifications}/${item.requireCertifications}`
       return item
     })
     total.value = response.data.total
diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue
index e44dd67..194de53 100644
--- a/src/views/business/subpackage/apply/list.vue
+++ b/src/views/business/subpackage/apply/list.vue
@@ -302,7 +302,7 @@
         <search-item>
           <el-date-picker
             v-model="timeRange" type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="申请开始时间" end-placeholder="申请结束时间"
+            value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="申请开始时间" end-placeholder="申请结束时间" clearable
           />
         </search-item>
       </search-area>
diff --git a/src/views/business/subpackage/check/list.vue b/src/views/business/subpackage/check/list.vue
index 51ea419..a8b6744 100644
--- a/src/views/business/subpackage/check/list.vue
+++ b/src/views/business/subpackage/check/list.vue
@@ -111,8 +111,6 @@
 
 // 时间变更
 watch(timeRange, (val) => {
-  console.log(val[0])
-
   if (val) {
     listQuery.value.checkStartTime = `${val[0]}`
     listQuery.value.checkEndTime = `${val[1]}`
@@ -345,7 +343,8 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="timeRange" type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
+            v-model="timeRange"
+            clearable type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="验收开始时间" end-placeholder="验收结束时间"
           />
         </search-item>
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 98f4a39..a0db900 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -68,6 +68,7 @@
   else {
     listQuery.value.startTime = ''
     listQuery.value.endTime = ''
+    timeRange.value = ['', '']
   }
 })
 // 多选发生改变时
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index 6e41a94..ac98b8a 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -56,7 +56,17 @@
 const checkoutList = ref<string[]>([])
 // 文件上传input
 const fileRef = ref()
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -64,8 +74,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getSampleList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index 92e4b4a..6f465fc 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -67,7 +67,17 @@
     certificationStatusMap.value[`${item.value}`] = item.name
   })
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -75,8 +85,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getSampleList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IOvertimeList) => {
       return {
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index dbaa437..14464bf 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -86,6 +86,17 @@
     width: 160,
   },
 ]) // 表格
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 const fetchData = (isNowPage = false) => {
   loadingTable.value = true
@@ -93,8 +104,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.processResult = active.value
   getApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 60d1454..d0236cc 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -105,7 +105,17 @@
     align: 'center',
   },
 ])
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 const fetchData = (isNowPage = false) => {
   loadingTable.value = true
@@ -113,8 +123,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.approvalStatus = active.value
   getApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index aeb568e..5430b0f 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -103,10 +103,21 @@
 // 装载时间数组
 const checkTime = ref<string>('')
 const loadingTable = ref(false)
+// 时间变更
+watch(checkTime, (val) => {
+  if (val) {
+    listQuery.value.checkStartDate = `${val[0]}`
+    listQuery.value.checkEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.checkStartDate = ''
+    listQuery.value.checkEndDate = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.checkStartDate = checkTime.value[0] || ''
-  listQuery.value.checkEndDate = checkTime.value[1] || ''
+  // listQuery.value.checkStartDate = checkTime.value[0] || ''
+  // listQuery.value.checkEndDate = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 6229abf..9d30934 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -112,10 +112,21 @@
 // 装载时间数组
 const checkTime = ref('')
 const loadingTable = ref(false)
+// 时间变更
+watch(checkTime, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.startTime = checkTime.value[0] || ''
-  listQuery.value.endTime = checkTime.value[1] || ''
+  // listQuery.value.startTime = checkTime.value[0] || ''
+  // listQuery.value.endTime = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index daca294..de18467 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -66,6 +66,17 @@
 const checkoutList = ref<IManageChecklist[]>([])
 // 文件上传input
 const fileRef = ref()
+// 时间变更
+watch(checkDate, (val) => {
+  if (val) {
+    listQuery.value.checkStartDate = `${val[0]}`
+    listQuery.value.checkEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.checkStartDate = ''
+    listQuery.value.checkEndDate = ''
+  }
+})
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
@@ -73,8 +84,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.checkStartDate = checkDate.value[0] || ''
-  listQuery.value.checkEndDate = checkDate.value[1] || ''
+  // listQuery.value.checkStartDate = checkDate.value[0] || ''
+  // listQuery.value.checkEndDate = checkDate.value[1] || ''
   getcheckInfoList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: any) => {
       return {
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 00d283c..50b014c 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -99,6 +99,17 @@
     approvalStatusReserveMap.value[item.name] = `${item.value}`
   })
 }
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -106,8 +117,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.approvalStatus = active.value
   getReceiveApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/receive/solve/solveList.vue b/src/views/device/receive/solve/solveList.vue
index 809c0c1..ec1e8bb 100644
--- a/src/views/device/receive/solve/solveList.vue
+++ b/src/views/device/receive/solve/solveList.vue
@@ -120,7 +120,17 @@
   timeRange.value = ['', ''] // 把时间选择框置空
   fetchData(true)
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -128,8 +138,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getReceiveApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IsolveListType) => {
       return {
diff --git a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
index 4744536..b4fe085 100644
--- a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
@@ -43,7 +43,12 @@
   select.value = -1
   listPageApi(listQuery.value).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows
+      list.value = res.data.rows.map((item: { effectiveStatusName: string }) => {
+        return {
+          ...item,
+          isDisabled: item.effectiveStatusName === '已废止',
+        }
+      })
       total.value = res.data.total
     }
   })
@@ -142,7 +147,7 @@
           </el-table-column>
           <el-table-column label="" width="55" align="center" fixed="left">
             <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
+              <el-radio v-model="select" :disabled="scope.row.isDisabled" :label="scope.$index" class="radio" />
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index a030dcf..0dd5547 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -94,12 +94,34 @@
 const preparation = ref<string>('')
 // 到期开始以及结束
 const validTime = ref<string>('')
+// 筹建日期变更
+watch(preparation, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
+// 有效日期变更
+watch(validTime, (val) => {
+  if (val) {
+    listQuery.value.validStartTime = `${val[0]}`
+    listQuery.value.validEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.validStartTime = ''
+    listQuery.value.validEndTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.preparationStartDate = preparation.value[0] || ''
-  listQuery.value.preparationEndDate = preparation.value[1] || ''
-  listQuery.value.validStartTime = validTime.value[0] || ''
-  listQuery.value.validEndTime = validTime.value[1] || ''
+  // listQuery.value.preparationStartDate = preparation.value[0] || ''
+  // listQuery.value.preparationEndDate = preparation.value[1] || ''
+  // listQuery.value.validStartTime = validTime.value[0] || ''
+  // listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index 39d8683..bb69fe9 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -99,6 +99,17 @@
 const standardManagerStateList = ref<IOptions[]>([])
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
+// 时间变更
+watch(preparationDate, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
@@ -107,8 +118,8 @@
     listQuery.value.offset = 1
   }
   // 筹建日期
-  listQuery.value.preparationStartDate = preparationDate.value[0] || ''
-  listQuery.value.preparationEndDate = preparationDate.value[1] || ''
+  // listQuery.value.preparationStartDate = preparationDate.value[0] || ''
+  // listQuery.value.preparationEndDate = preparationDate.value[1] || ''
   getStandardList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: any) => {
       return {
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 37205fc..edf9dd7 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -793,7 +793,7 @@
             保存
           </el-button>
           <!-- 待审批 -->
-          <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'agree' })">
+          <!-- <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'agree' })">
             同意
           </el-button>
           <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'reject' })">
@@ -801,7 +801,7 @@
           </el-button>
           <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'refuse' })">
             拒绝
-          </el-button>
+          </el-button> -->
           <!-- </template> -->
         </template>
         <el-button v-if="(title === '详情' && $route.query?.approvalStatusName === '草稿箱' && isCancel)" type="primary" @click="editForm">
diff --git a/src/views/finance/businessSettlement/list.vue b/src/views/finance/businessSettlement/list.vue
index e942abb..9543947 100644
--- a/src/views/finance/businessSettlement/list.vue
+++ b/src/views/finance/businessSettlement/list.vue
@@ -43,6 +43,7 @@
 const list = ref<IList[]>([]) // 表格数据
 // 选中的内容
 const checkoutList = ref<string[]>([])
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
diff --git a/src/views/finance/contract/list.vue b/src/views/finance/contract/list.vue
index 7dcdca5..5f8eb4e 100644
--- a/src/views/finance/contract/list.vue
+++ b/src/views/finance/contract/list.vue
@@ -59,6 +59,17 @@
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 选中的内容
 const checkoutList = ref<string[]>([])
+// 时间变更
+watch(dateRange, (val) => {
+  if (val) {
+    listQuery.value.estimateSignStartDate = `${val[0]}`
+    listQuery.value.estimateSignEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.estimateSignStartDate = ''
+    listQuery.value.estimateSignEndDate = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -66,8 +77,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.estimateSignStartDate = dateRange.value[0] as string || ''
-  listQuery.value.estimateSignEndDate = dateRange.value[1] as string || ''
+  // listQuery.value.estimateSignStartDate = dateRange.value[0] as string || ''
+  // listQuery.value.estimateSignEndDate = dateRange.value[1] as string || ''
   getContractList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: { estimateSignDate: string; agreementAmount: number }) => {
       return {
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 1bce5f9..07b2296 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,7 +1,7 @@
-<!-- 新增或详情弹窗 -->
+<!-- 新增或详情 -->
 <script lang="ts" setup name="addNotice">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
@@ -15,6 +15,7 @@
 import { SCHEDULE } from '@/utils/scheduleDict'
 const $route = useRoute()
 const $router = useRouter()
+const submitId = ref('') // 提交id-保存接口获取
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
 const fileTypeName = ref('')
@@ -40,12 +41,12 @@
   formId: SCHEDULE.FILE_APPROVAL,
 }) // 表单
 const rules = ref<FormRules>({
-  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
-  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
-  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
-  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
-  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+  fileName: [{ required: true, message: '名称必填', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建必填', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位必填', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间必填', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人必填', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号必填', trigger: 'blur' }],
 }) // 表单验证规则
 
 const userList = ref<userType[]>([]) // 可使用人列表
@@ -57,12 +58,14 @@
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
-const PubList = ref<deptType[]>([])
+const PubList = ref([]) as any// 发布单位列表
 const PubListTree = ref([])
 // 获取发布单位列表
 const getPubList = () => {
   getDeptTreeList().then((res) => {
     PubList.value = res.data
+    console.log('0000', 'ppp', PubList.value)
+
     PubListTree.value = toTreeList(res.data, '0', true)
   })
 }
@@ -113,43 +116,57 @@
   effectiveStatusName.value = ''
 }
 // 提交
-const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+const saveForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
-    `确认${flag}吗？`,
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then((res) => {
+        const publisherId = ruleForm.publisher
+        const index = PubList.value.findIndex((item: { id: string }) => item.id === publisherId)
+        if (index !== -1) {
+          ruleForm.publisher = PubList.value[index].name as string
+        }
+        // 保存（草稿箱）
+        confirmDrafts(ruleForm).then((res) => {
+          ruleForm.fileNo = res.data.fileNo
+          submitId.value = res.data.id
+          ElMessage.success('保存成功')
+          // formEl?.resetFields()
+          // $router.go(-1)
+          close()
+        })
+      })
+    }
+  })
+}
+const submitForm = () => {
+  if (!submitId.value) {
+    ElMessage.warning('请先保存')
+    return false
+  }
+  ElMessageBox.confirm(
+    '确认提交吗？',
     '提示',
     {
       confirmButtonText: '确认',
       cancelButtonText: '取消',
       type: 'warning',
     },
-      ).then((res) => {
-        if (flag === '提交') {
-          confirmDrafts(ruleForm).then((res) => {
-            if (res.code === 200) {
-              console.log(res.data, '保存成功')
-              submitFile({ id: res.data.id, formId: SCHEDULE.FILE_APPROVAL }).then((res) => {
-                formEl?.resetFields()
-                ElMessage.success('提交成功')
-                $router.go(-1)
-                close()
-              })
-            }
-          })
-        }
-        else {
-          // 保存（草稿箱）
-          confirmDrafts(ruleForm).then((res) => {
-            ElMessage.success('保存成功')
-            formEl?.resetFields()
-            $router.go(-1)
-            close()
-          })
-        }
-      })
-    }
+  ).then((res) => {
+    submitFile({ id: submitId.value, formId: SCHEDULE.FILE_APPROVAL }).then((res) => {
+    // formEl?.resetFields()
+      ElMessage.success('已提交')
+      $router.go(-1)
+      close()
+    })
   })
 }
 // 取消
@@ -163,9 +180,14 @@
 const onFileChange = (event: any) => {
   // 原生上传
   // console.log(event.target.files)
+
   if (event.target.files?.length !== 0) {
     // 创建formdata对象
     const fd = new FormData()
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
@@ -173,9 +195,11 @@
         // 重置当前验证
         ruleFormRef.value?.clearValidate('minioFileName')
         ElMessage.success('文件上传成功')
+        loading.close()
       }
       else {
         ElMessage.error(res.message)
+        loading.close()
       }
     })
   }
@@ -215,10 +239,10 @@
   <app-container style="overflow: hidden;">
     <detail-page :title="`${fileTypeName}-${title}`">
       <template #btns>
-        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm()">
           提交
         </el-button>
-        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
+        <el-button v-if="title !== '详情'" type="primary" @click="saveForm(ruleFormRef)">
           保存
         </el-button>
         <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -258,7 +282,7 @@
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
                 style="width: 100%;"
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 135d059..c2b46c0 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -1,6 +1,7 @@
 <!-- 文件审批公共模板 -->
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { DateModelType } from 'element-plus'
 import type { TableRow } from './approve-interface'
 import type { fileResType } from '@/views/measure/file/file-interface'
 import { printJSON } from '@/utils/printUtils'
@@ -32,12 +33,13 @@
 const approvalStatusReserveMap = ref({ ...props.approvalStatusReserveMap }) // 审批状态字典{草稿箱: 1}
 const activeTitle = ref('') // active对应的审批状态名字
 
-const searchQuery = reactive({
+const searchQuery = ref({
   fileNo: '', // 编号
   fileName: '', // 名称
   fileCode: '', // 文件号
   createUser: '', // 创建人
-  createTime: '', // 创建
+  createStartTime: '', // 创建开始时间
+  createEndTime: '', // 创建结束时间
   approvalStatus: approvalStatus.value, // 审批状态
   limit: 20,
   offset: 1,
@@ -49,18 +51,31 @@
 const total = ref<number>(0) // 数据总条数
 const columns = ref<TableColumn[]>([
   { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
+  { text: '编号', value: 'fileNo', align: 'center', width: '160' },
   { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
+  { text: '类别', value: 'fileTypeName', align: 'center' },
   { text: '创建人', value: 'createUser', align: 'center' },
-  { text: '创建时间', value: 'createTime', align: 'center' },
-  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110' },
 ]) // 表格
 const list = ref<TableRow[]>([]) // 表格数据
+// 筛选时间段数据
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    searchQuery.value.createStartTime = `${val[0]}`
+    searchQuery.value.createEndTime = `${val[1]}`
+  }
+  else {
+    searchQuery.value.createStartTime = ''
+    searchQuery.value.createEndTime = ''
+  }
+})
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
-  approvallistPageApi(searchQuery).then((res) => {
+  approvallistPageApi(searchQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows.map((item: TableRow) => {
         return {
@@ -85,10 +100,10 @@
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
-    searchQuery.limit = val.size
+    searchQuery.value.limit = val.size
   }
   if (val && val.page) {
-    searchQuery.offset = val.page
+    searchQuery.value.offset = val.page
   }
   getList()
 }
@@ -216,12 +231,21 @@
 }
 // 重置
 const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.fileType = ''
-  searchQuery.createTime = ''
-  searchQuery.createUser = ''
+  searchQuery.value = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    fileCode: '', // 文件号
+    createUser: '', // 创建人
+    createStartTime: '', // 创建开始时间
+    createEndTime: '', // 创建结束时间
+    approvalStatus: approvalStatus.value, // 审批状态
+    limit: 20,
+    offset: 1,
+    fileType: '', // 文件类别
+    formId: SCHEDULE.FILE_APPROVAL,
+    ids: [] as string[],
+  }
+  timeRange.value = ['', '']
   getList()
 }
 // 表格被选中的行
@@ -230,27 +254,6 @@
 const multiSelect = (row: TableRow[]) => {
   selectList.value = row
 }
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  searchQuery.ids = []
-  if (selectList.value.length) {
-    selectList.value.forEach((item) => {
-      searchQuery.ids?.push(item.id as string)
-    })
-  }
-  exportFileApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
-    exportFile(res.data, props.name)
-    loading.close()
-    searchQuery.ids = []
-  }).catch((_) => {
-    loading.close()
-  })
-}
 // 打印
 function printList() {
   const selectIds = selectList.value.map(item => item.id)
@@ -278,8 +281,8 @@
   sessionStorage.setItem('approveFileMenu', props.name)
   approvalStatus.value = approvalStatusReserveMap.value[props.name]
   // approvalStatus.value = approvalStatusReserveMap.value[props.name] // 失效
-  searchQuery.approvalStatus = approvalStatusReserveMap.value[props.name] || '0'
-  $router.currentRoute.value.query.cacheActive = searchQuery.approvalStatus
+  searchQuery.value.approvalStatus = approvalStatusReserveMap.value[props.name] || '0'
+  $router.currentRoute.value.query.cacheActive = searchQuery.value.approvalStatus
   getList()
   // 缓存名称
 }, { deep: true, immediate: true })
@@ -312,8 +315,14 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss" placeholder="创建时间"
+            v-model="timeRange"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="创建开始时间"
+            end-placeholder="创建结束时间"
+            clearable
+            style="width: 360px;"
           />
         </search-item>
         <search-item>
@@ -323,10 +332,6 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <icon-button
-            v-if="proxy.hasPerm('/file/approve/export')" icon="icon-export" title="导出"
-            @click="exportExcelBtn"
-          />
           <icon-button v-if="proxy.hasPerm('/file/approve/print')" icon="icon-print" title="打印" @click="printList" />
         </template>
         <!-- 表格区域 -->
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 9dd3633..de9e080 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -85,7 +85,7 @@
 const getStatus = () => {
   getDictByCode('effectiveStatus').then((res) => {
     if (res.code === 200) {
-      effectiveStatusSelect.value = [...res.data, { name: '全部', value: '', id: 'quanbu' }]
+      effectiveStatusSelect.value = res.data
     }
   })
 }
@@ -373,8 +373,8 @@
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/add`)" icon="icon-add" title="新建" @click="add" />
-          <icon-button v-if="proxy.hasPerm(`/file/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
-          <icon-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <!-- <icon-button v-if="proxy.hasPerm(`/file/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" /> -->
+          <!-- <icon-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" /> -->
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/print`)" icon="icon-print" title="打印" @click="printList" />
         </template>

diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..9cf2b29 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -28,6 +28,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    DeptSelectByName: typeof import('./components/DeptSelectByName/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
diff --git a/src/views/business/board/standardReminder/list.vue b/src/views/business/board/standardReminder/list.vue
index 85efbb1..fd60743 100644
--- a/src/views/business/board/standardReminder/list.vue
+++ b/src/views/business/board/standardReminder/list.vue
@@ -94,12 +94,33 @@
 const preparation = ref<string>('')
 // 到期开始以及结束
 const validTime = ref<string>('')
+watch(preparation, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
+// 有效日期变更
+watch(validTime, (val) => {
+  if (val) {
+    listQuery.value.validStartTime = `${val[0]}`
+    listQuery.value.validEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.validStartTime = ''
+    listQuery.value.validEndTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.preparationStartDate = preparation.value[0] || ''
-  listQuery.value.preparationEndDate = preparation.value[1] || ''
-  listQuery.value.validStartTime = validTime.value[0] || ''
-  listQuery.value.validEndTime = validTime.value[1] || ''
+  // listQuery.value.preparationStartDate = preparation.value[0] || ''
+  // listQuery.value.preparationEndDate = preparation.value[1] || ''
+  // listQuery.value.validStartTime = validTime.value[0] || ''
+  // listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -223,16 +244,16 @@
   })
   if (list.value.length > 0) {
     const params = {
-      category: '', // 类别
-      id: '', // 主键id
-      managerState: '', // 管理状态
-      preparationEndDate: '', // 结束时间
-      preparationStartDate: '', // 开始时间
-      standardLaboratory: '', // 标准所在部门
-      standardName: '', // 标准名称
-      standardNo: '', // 标准编号
-      validEndTime: '', // 结束时间
-      validStartTime: '', // 开始时间
+      category: listQuery.value.category, // 类别
+      id: listQuery.value.id, // 主键id
+      managerState: listQuery.value.managerState, // 管理状态
+      preparationEndDate: listQuery.value.preparationEndDate, // 结束时间
+      preparationStartDate: listQuery.value.preparationStartDate, // 开始时间
+      standardLaboratory: listQuery.value.standardLaboratory, // 标准所在部门
+      standardName: listQuery.value.standardName, // 标准名称
+      standardNo: listQuery.value.standardNo, // 标准编号
+      validEndTime: listQuery.value.validEndTime, // 结束时间
+      validStartTime: listQuery.value.validStartTime, // 开始时间
       offset: 1, // 当前页
       limit: 20, // 每页多少条
       ids: checkoutList.value,
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 8666957..37ac73f 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -137,7 +137,7 @@
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  distributeDialogRef.value.initDialog(row.id, row.sampleId, row.orderId)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId, row.sampleStatus)
 }
 // 点击标签绑定
 const barCodeBind = ref()
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 807ea30..4e4eb46 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -37,11 +37,21 @@
   { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
   { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
 ])
-
+// 时间变更
+watch(trainTime, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 查询列表
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.startTime = trainTime.value[0] || ''
-  listQuery.value.endTime = trainTime.value[1] || ''
+  // listQuery.value.startTime = trainTime.value[0] || ''
+  // listQuery.value.endTime = trainTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2f7c1d0..bccde84 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -139,7 +139,17 @@
     id: '2', // 后端规定已收入传2
   })
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -147,8 +157,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.sampleStatus = active.value
   getInterChangeList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IinterchangeList) => {
@@ -280,7 +290,7 @@
       else if (type === 'delete') { // 无需检测
         interchangeStatusChange({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '7' }).then((res) => {
           if (res.code === 200) {
-            ElMessage.success(`已${title}`)
+            ElMessage.success('操作成功')
             fetchData(true)
           }
         })
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList.vue b/src/views/business/schedule/interchangeReceipt/receiptList.vue
index 275a053..83d93f4 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptList.vue
@@ -42,7 +42,17 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -50,8 +60,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getReceiptList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -124,13 +134,13 @@
   })
   if (list.value.length > 0) {
     const params = {
-      interchangeCode: '', // 交接单编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      reciever: '', // 接收人
-      deliverer: '', // 送样人
-      startTime: '', // 交接开始时间
-      endTime: '', // 交接结束时间
+      interchangeCode: listQuery.value.interchangeCode, // 交接单编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      reciever: listQuery.value.reciever, // 接收人
+      deliverer: listQuery.value.deliverer, // 送样人
+      startTime: listQuery.value.startTime, // 交接开始时间
+      endTime: listQuery.value.endTime, // 交接结束时间
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index cf0b532..f2fc852 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -26,8 +26,8 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   deliverer: '', // 送样人
-  isUrgent: 2, // 是否加急 2全部 1是 0否
-  status: 0, // 接收状态
+  isUrgent: '', // 是否加急 2全部 1是 0否
+  status: '', // 接收状态
   offset: 1,
   limit: 20,
 })
@@ -70,11 +70,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    isUrgentMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 2, // 是否加急全部后端定为2
-    })
+    // isUrgentMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 2, // 是否加急全部后端定为2
+    // })
   })
   // 接收状态
   getDictByCode('orderStatus').then((response) => {
@@ -85,11 +85,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    statusMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 0,
-    })
+    // statusMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 0,
+    // })
     console.log(statusMap.value)
   })
 }
@@ -125,8 +125,8 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     deliverer: '', // 送样人
-    isUrgent: 2, // 是否加急
-    status: 0, // 接收状态
+    isUrgent: '', // 是否加急 2全部 1是 0否
+    status: '', // 接收状态
     offset: 1,
     limit: 20,
   }
@@ -191,12 +191,12 @@
   })
   if (list.value.length > 0) {
     const params = {
-      orderCode: '', // 委托书编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      deliverer: '', // 送样人
-      isUrgent: 2, // 是否加急
-      status: 0, // 接收状态
+      orderCode: listQuery.value.orderCode, // 委托书编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      deliverer: listQuery.value.deliverer, // 送样人
+      isUrgent: listQuery.value.isUrgent, // 是否加急
+      status: listQuery.value.status, // 接收状态
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 2d92da9..14cd1ce 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -6,7 +6,7 @@
   customerName: string // 委托方名称
   deliverer: string // 送样人
   isUrgent: number | string // 是否加急
-  status: number // 接收状态
+  status: number | string// 接收状态
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 50308c7..25c5cf9 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -53,6 +53,7 @@
   handOutProperty: string // 分发性质-初次分发、退回分发
   id?: string // 实验室id
   customerId?: string // 客户id
+  certificationState?: string // 证书出具
 }
 
 // 实验室检测/我的检测列表
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index 7c17365..7159350 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -1,6 +1,6 @@
 <!-- 任务分发 -->
 <script lang="ts" setup name="TaskEdit">
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
 import ProcessConfig from './components/processConfig.vue'
@@ -11,6 +11,7 @@
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { UploadFile } from '@/api/measure/file'
 import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 interface dictType {
   id: string
@@ -251,16 +252,22 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    // UploadFile(fd).then((res) => {
-    //   if (res.code === 200) {
-    //     sampleForm.value.minioFileName = res.data[0]
-    //     // 重置当前验证
-    //     ElMessage.success('文件上传成功')
-    //   }
-    //   else {
-    //     ElMessage.error(res.message)
-    //   }
-    // })
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        sampleForm.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+        loading.close()
+      }
+      else {
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    })
   }
 }
 const upload = () => {
@@ -402,7 +409,7 @@
               <el-form-item label="校检类别:">
                 <el-select
                   v-model="sampleForm.measureCategory"
-                  :placeholder="roleType === 'detail' ? '' : '请选择校检类别'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择校检类别'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -424,7 +431,7 @@
               <el-form-item label="厂家国别:">
                 <el-select
                   v-model="sampleForm.manufacturerCountry"
-                  :placeholder="roleType === 'detail' ? '' : '请选择厂家国别'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择厂家国别'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -450,7 +457,7 @@
               <el-form-item label="ABC:">
                 <el-select
                   v-model="sampleForm.abc"
-                  :placeholder="roleType === 'detail' ? '' : '请选择ABC'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择ABC'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -504,8 +511,8 @@
               <el-form-item label="备注:">
                 <el-input
                   v-model="sampleForm.remark"
+                  autosize
                   type="textarea"
-                  :rows="2"
                   :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
                   :class="{ 'detail-input': roleType === 'detail' }"
@@ -516,7 +523,7 @@
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="sampleForm.measureType"
-                  :placeholder="roleType === 'detail' ? '' : '请选择检定方式'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择检定方式'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index dfbbf6a..6eeff55 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -81,7 +81,7 @@
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '165px' },
   { text: '样品属性', value: 'sampleBelongName', width: '100', align: 'center' },
   { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '90' },
-  { text: '证书出具', value: 'certificationState', align: 'center', width: '90', filter: (row: ITaskList) => { return `${row.alreadyCertifications}/${row.requireCertifications}` } },
+  { text: '证书出具', value: 'certificationState', align: 'center', width: '90' },
 ])
 // 表格数据
 const list = ref<ITaskList[]>([])
@@ -104,6 +104,7 @@
   getTaskList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: ITaskList) => {
       item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      item.certificationState = `${item.alreadyCertifications}/${item.requireCertifications}`
       return item
     })
     total.value = response.data.total
diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue
index e44dd67..194de53 100644
--- a/src/views/business/subpackage/apply/list.vue
+++ b/src/views/business/subpackage/apply/list.vue
@@ -302,7 +302,7 @@
         <search-item>
           <el-date-picker
             v-model="timeRange" type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="申请开始时间" end-placeholder="申请结束时间"
+            value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="申请开始时间" end-placeholder="申请结束时间" clearable
           />
         </search-item>
       </search-area>
diff --git a/src/views/business/subpackage/check/list.vue b/src/views/business/subpackage/check/list.vue
index 51ea419..a8b6744 100644
--- a/src/views/business/subpackage/check/list.vue
+++ b/src/views/business/subpackage/check/list.vue
@@ -111,8 +111,6 @@
 
 // 时间变更
 watch(timeRange, (val) => {
-  console.log(val[0])
-
   if (val) {
     listQuery.value.checkStartTime = `${val[0]}`
     listQuery.value.checkEndTime = `${val[1]}`
@@ -345,7 +343,8 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="timeRange" type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
+            v-model="timeRange"
+            clearable type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="验收开始时间" end-placeholder="验收结束时间"
           />
         </search-item>
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 98f4a39..a0db900 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -68,6 +68,7 @@
   else {
     listQuery.value.startTime = ''
     listQuery.value.endTime = ''
+    timeRange.value = ['', '']
   }
 })
 // 多选发生改变时
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index 6e41a94..ac98b8a 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -56,7 +56,17 @@
 const checkoutList = ref<string[]>([])
 // 文件上传input
 const fileRef = ref()
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -64,8 +74,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getSampleList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index 92e4b4a..6f465fc 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -67,7 +67,17 @@
     certificationStatusMap.value[`${item.value}`] = item.name
   })
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -75,8 +85,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getSampleList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IOvertimeList) => {
       return {
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index dbaa437..14464bf 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -86,6 +86,17 @@
     width: 160,
   },
 ]) // 表格
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 const fetchData = (isNowPage = false) => {
   loadingTable.value = true
@@ -93,8 +104,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.processResult = active.value
   getApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 60d1454..d0236cc 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -105,7 +105,17 @@
     align: 'center',
   },
 ])
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 const fetchData = (isNowPage = false) => {
   loadingTable.value = true
@@ -113,8 +123,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.approvalStatus = active.value
   getApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index aeb568e..5430b0f 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -103,10 +103,21 @@
 // 装载时间数组
 const checkTime = ref<string>('')
 const loadingTable = ref(false)
+// 时间变更
+watch(checkTime, (val) => {
+  if (val) {
+    listQuery.value.checkStartDate = `${val[0]}`
+    listQuery.value.checkEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.checkStartDate = ''
+    listQuery.value.checkEndDate = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.checkStartDate = checkTime.value[0] || ''
-  listQuery.value.checkEndDate = checkTime.value[1] || ''
+  // listQuery.value.checkStartDate = checkTime.value[0] || ''
+  // listQuery.value.checkEndDate = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 6229abf..9d30934 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -112,10 +112,21 @@
 // 装载时间数组
 const checkTime = ref('')
 const loadingTable = ref(false)
+// 时间变更
+watch(checkTime, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.startTime = checkTime.value[0] || ''
-  listQuery.value.endTime = checkTime.value[1] || ''
+  // listQuery.value.startTime = checkTime.value[0] || ''
+  // listQuery.value.endTime = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index daca294..de18467 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -66,6 +66,17 @@
 const checkoutList = ref<IManageChecklist[]>([])
 // 文件上传input
 const fileRef = ref()
+// 时间变更
+watch(checkDate, (val) => {
+  if (val) {
+    listQuery.value.checkStartDate = `${val[0]}`
+    listQuery.value.checkEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.checkStartDate = ''
+    listQuery.value.checkEndDate = ''
+  }
+})
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
@@ -73,8 +84,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.checkStartDate = checkDate.value[0] || ''
-  listQuery.value.checkEndDate = checkDate.value[1] || ''
+  // listQuery.value.checkStartDate = checkDate.value[0] || ''
+  // listQuery.value.checkEndDate = checkDate.value[1] || ''
   getcheckInfoList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: any) => {
       return {
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 00d283c..50b014c 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -99,6 +99,17 @@
     approvalStatusReserveMap.value[item.name] = `${item.value}`
   })
 }
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -106,8 +117,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.approvalStatus = active.value
   getReceiveApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/receive/solve/solveList.vue b/src/views/device/receive/solve/solveList.vue
index 809c0c1..ec1e8bb 100644
--- a/src/views/device/receive/solve/solveList.vue
+++ b/src/views/device/receive/solve/solveList.vue
@@ -120,7 +120,17 @@
   timeRange.value = ['', ''] // 把时间选择框置空
   fetchData(true)
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -128,8 +138,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getReceiveApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IsolveListType) => {
       return {
diff --git a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
index 4744536..b4fe085 100644
--- a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
@@ -43,7 +43,12 @@
   select.value = -1
   listPageApi(listQuery.value).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows
+      list.value = res.data.rows.map((item: { effectiveStatusName: string }) => {
+        return {
+          ...item,
+          isDisabled: item.effectiveStatusName === '已废止',
+        }
+      })
       total.value = res.data.total
     }
   })
@@ -142,7 +147,7 @@
           </el-table-column>
           <el-table-column label="" width="55" align="center" fixed="left">
             <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
+              <el-radio v-model="select" :disabled="scope.row.isDisabled" :label="scope.$index" class="radio" />
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index a030dcf..0dd5547 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -94,12 +94,34 @@
 const preparation = ref<string>('')
 // 到期开始以及结束
 const validTime = ref<string>('')
+// 筹建日期变更
+watch(preparation, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
+// 有效日期变更
+watch(validTime, (val) => {
+  if (val) {
+    listQuery.value.validStartTime = `${val[0]}`
+    listQuery.value.validEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.validStartTime = ''
+    listQuery.value.validEndTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.preparationStartDate = preparation.value[0] || ''
-  listQuery.value.preparationEndDate = preparation.value[1] || ''
-  listQuery.value.validStartTime = validTime.value[0] || ''
-  listQuery.value.validEndTime = validTime.value[1] || ''
+  // listQuery.value.preparationStartDate = preparation.value[0] || ''
+  // listQuery.value.preparationEndDate = preparation.value[1] || ''
+  // listQuery.value.validStartTime = validTime.value[0] || ''
+  // listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index 39d8683..bb69fe9 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -99,6 +99,17 @@
 const standardManagerStateList = ref<IOptions[]>([])
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
+// 时间变更
+watch(preparationDate, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
@@ -107,8 +118,8 @@
     listQuery.value.offset = 1
   }
   // 筹建日期
-  listQuery.value.preparationStartDate = preparationDate.value[0] || ''
-  listQuery.value.preparationEndDate = preparationDate.value[1] || ''
+  // listQuery.value.preparationStartDate = preparationDate.value[0] || ''
+  // listQuery.value.preparationEndDate = preparationDate.value[1] || ''
   getStandardList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: any) => {
       return {
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 37205fc..edf9dd7 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -793,7 +793,7 @@
             保存
           </el-button>
           <!-- 待审批 -->
-          <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'agree' })">
+          <!-- <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'agree' })">
             同意
           </el-button>
           <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'reject' })">
@@ -801,7 +801,7 @@
           </el-button>
           <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'refuse' })">
             拒绝
-          </el-button>
+          </el-button> -->
           <!-- </template> -->
         </template>
         <el-button v-if="(title === '详情' && $route.query?.approvalStatusName === '草稿箱' && isCancel)" type="primary" @click="editForm">
diff --git a/src/views/finance/businessSettlement/list.vue b/src/views/finance/businessSettlement/list.vue
index e942abb..9543947 100644
--- a/src/views/finance/businessSettlement/list.vue
+++ b/src/views/finance/businessSettlement/list.vue
@@ -43,6 +43,7 @@
 const list = ref<IList[]>([]) // 表格数据
 // 选中的内容
 const checkoutList = ref<string[]>([])
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
diff --git a/src/views/finance/contract/list.vue b/src/views/finance/contract/list.vue
index 7dcdca5..5f8eb4e 100644
--- a/src/views/finance/contract/list.vue
+++ b/src/views/finance/contract/list.vue
@@ -59,6 +59,17 @@
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 选中的内容
 const checkoutList = ref<string[]>([])
+// 时间变更
+watch(dateRange, (val) => {
+  if (val) {
+    listQuery.value.estimateSignStartDate = `${val[0]}`
+    listQuery.value.estimateSignEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.estimateSignStartDate = ''
+    listQuery.value.estimateSignEndDate = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -66,8 +77,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.estimateSignStartDate = dateRange.value[0] as string || ''
-  listQuery.value.estimateSignEndDate = dateRange.value[1] as string || ''
+  // listQuery.value.estimateSignStartDate = dateRange.value[0] as string || ''
+  // listQuery.value.estimateSignEndDate = dateRange.value[1] as string || ''
   getContractList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: { estimateSignDate: string; agreementAmount: number }) => {
       return {
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 1bce5f9..07b2296 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,7 +1,7 @@
-<!-- 新增或详情弹窗 -->
+<!-- 新增或详情 -->
 <script lang="ts" setup name="addNotice">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
@@ -15,6 +15,7 @@
 import { SCHEDULE } from '@/utils/scheduleDict'
 const $route = useRoute()
 const $router = useRouter()
+const submitId = ref('') // 提交id-保存接口获取
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
 const fileTypeName = ref('')
@@ -40,12 +41,12 @@
   formId: SCHEDULE.FILE_APPROVAL,
 }) // 表单
 const rules = ref<FormRules>({
-  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
-  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
-  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
-  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
-  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+  fileName: [{ required: true, message: '名称必填', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建必填', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位必填', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间必填', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人必填', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号必填', trigger: 'blur' }],
 }) // 表单验证规则
 
 const userList = ref<userType[]>([]) // 可使用人列表
@@ -57,12 +58,14 @@
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
-const PubList = ref<deptType[]>([])
+const PubList = ref([]) as any// 发布单位列表
 const PubListTree = ref([])
 // 获取发布单位列表
 const getPubList = () => {
   getDeptTreeList().then((res) => {
     PubList.value = res.data
+    console.log('0000', 'ppp', PubList.value)
+
     PubListTree.value = toTreeList(res.data, '0', true)
   })
 }
@@ -113,43 +116,57 @@
   effectiveStatusName.value = ''
 }
 // 提交
-const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+const saveForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
-    `确认${flag}吗？`,
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then((res) => {
+        const publisherId = ruleForm.publisher
+        const index = PubList.value.findIndex((item: { id: string }) => item.id === publisherId)
+        if (index !== -1) {
+          ruleForm.publisher = PubList.value[index].name as string
+        }
+        // 保存（草稿箱）
+        confirmDrafts(ruleForm).then((res) => {
+          ruleForm.fileNo = res.data.fileNo
+          submitId.value = res.data.id
+          ElMessage.success('保存成功')
+          // formEl?.resetFields()
+          // $router.go(-1)
+          close()
+        })
+      })
+    }
+  })
+}
+const submitForm = () => {
+  if (!submitId.value) {
+    ElMessage.warning('请先保存')
+    return false
+  }
+  ElMessageBox.confirm(
+    '确认提交吗？',
     '提示',
     {
       confirmButtonText: '确认',
       cancelButtonText: '取消',
       type: 'warning',
     },
-      ).then((res) => {
-        if (flag === '提交') {
-          confirmDrafts(ruleForm).then((res) => {
-            if (res.code === 200) {
-              console.log(res.data, '保存成功')
-              submitFile({ id: res.data.id, formId: SCHEDULE.FILE_APPROVAL }).then((res) => {
-                formEl?.resetFields()
-                ElMessage.success('提交成功')
-                $router.go(-1)
-                close()
-              })
-            }
-          })
-        }
-        else {
-          // 保存（草稿箱）
-          confirmDrafts(ruleForm).then((res) => {
-            ElMessage.success('保存成功')
-            formEl?.resetFields()
-            $router.go(-1)
-            close()
-          })
-        }
-      })
-    }
+  ).then((res) => {
+    submitFile({ id: submitId.value, formId: SCHEDULE.FILE_APPROVAL }).then((res) => {
+    // formEl?.resetFields()
+      ElMessage.success('已提交')
+      $router.go(-1)
+      close()
+    })
   })
 }
 // 取消
@@ -163,9 +180,14 @@
 const onFileChange = (event: any) => {
   // 原生上传
   // console.log(event.target.files)
+
   if (event.target.files?.length !== 0) {
     // 创建formdata对象
     const fd = new FormData()
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
@@ -173,9 +195,11 @@
         // 重置当前验证
         ruleFormRef.value?.clearValidate('minioFileName')
         ElMessage.success('文件上传成功')
+        loading.close()
       }
       else {
         ElMessage.error(res.message)
+        loading.close()
       }
     })
   }
@@ -215,10 +239,10 @@
   <app-container style="overflow: hidden;">
     <detail-page :title="`${fileTypeName}-${title}`">
       <template #btns>
-        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm()">
           提交
         </el-button>
-        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
+        <el-button v-if="title !== '详情'" type="primary" @click="saveForm(ruleFormRef)">
           保存
         </el-button>
         <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -258,7 +282,7 @@
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
                 style="width: 100%;"
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 135d059..c2b46c0 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -1,6 +1,7 @@
 <!-- 文件审批公共模板 -->
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { DateModelType } from 'element-plus'
 import type { TableRow } from './approve-interface'
 import type { fileResType } from '@/views/measure/file/file-interface'
 import { printJSON } from '@/utils/printUtils'
@@ -32,12 +33,13 @@
 const approvalStatusReserveMap = ref({ ...props.approvalStatusReserveMap }) // 审批状态字典{草稿箱: 1}
 const activeTitle = ref('') // active对应的审批状态名字
 
-const searchQuery = reactive({
+const searchQuery = ref({
   fileNo: '', // 编号
   fileName: '', // 名称
   fileCode: '', // 文件号
   createUser: '', // 创建人
-  createTime: '', // 创建
+  createStartTime: '', // 创建开始时间
+  createEndTime: '', // 创建结束时间
   approvalStatus: approvalStatus.value, // 审批状态
   limit: 20,
   offset: 1,
@@ -49,18 +51,31 @@
 const total = ref<number>(0) // 数据总条数
 const columns = ref<TableColumn[]>([
   { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
+  { text: '编号', value: 'fileNo', align: 'center', width: '160' },
   { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
+  { text: '类别', value: 'fileTypeName', align: 'center' },
   { text: '创建人', value: 'createUser', align: 'center' },
-  { text: '创建时间', value: 'createTime', align: 'center' },
-  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110' },
 ]) // 表格
 const list = ref<TableRow[]>([]) // 表格数据
+// 筛选时间段数据
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    searchQuery.value.createStartTime = `${val[0]}`
+    searchQuery.value.createEndTime = `${val[1]}`
+  }
+  else {
+    searchQuery.value.createStartTime = ''
+    searchQuery.value.createEndTime = ''
+  }
+})
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
-  approvallistPageApi(searchQuery).then((res) => {
+  approvallistPageApi(searchQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows.map((item: TableRow) => {
         return {
@@ -85,10 +100,10 @@
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
-    searchQuery.limit = val.size
+    searchQuery.value.limit = val.size
   }
   if (val && val.page) {
-    searchQuery.offset = val.page
+    searchQuery.value.offset = val.page
   }
   getList()
 }
@@ -216,12 +231,21 @@
 }
 // 重置
 const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.fileType = ''
-  searchQuery.createTime = ''
-  searchQuery.createUser = ''
+  searchQuery.value = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    fileCode: '', // 文件号
+    createUser: '', // 创建人
+    createStartTime: '', // 创建开始时间
+    createEndTime: '', // 创建结束时间
+    approvalStatus: approvalStatus.value, // 审批状态
+    limit: 20,
+    offset: 1,
+    fileType: '', // 文件类别
+    formId: SCHEDULE.FILE_APPROVAL,
+    ids: [] as string[],
+  }
+  timeRange.value = ['', '']
   getList()
 }
 // 表格被选中的行
@@ -230,27 +254,6 @@
 const multiSelect = (row: TableRow[]) => {
   selectList.value = row
 }
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  searchQuery.ids = []
-  if (selectList.value.length) {
-    selectList.value.forEach((item) => {
-      searchQuery.ids?.push(item.id as string)
-    })
-  }
-  exportFileApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
-    exportFile(res.data, props.name)
-    loading.close()
-    searchQuery.ids = []
-  }).catch((_) => {
-    loading.close()
-  })
-}
 // 打印
 function printList() {
   const selectIds = selectList.value.map(item => item.id)
@@ -278,8 +281,8 @@
   sessionStorage.setItem('approveFileMenu', props.name)
   approvalStatus.value = approvalStatusReserveMap.value[props.name]
   // approvalStatus.value = approvalStatusReserveMap.value[props.name] // 失效
-  searchQuery.approvalStatus = approvalStatusReserveMap.value[props.name] || '0'
-  $router.currentRoute.value.query.cacheActive = searchQuery.approvalStatus
+  searchQuery.value.approvalStatus = approvalStatusReserveMap.value[props.name] || '0'
+  $router.currentRoute.value.query.cacheActive = searchQuery.value.approvalStatus
   getList()
   // 缓存名称
 }, { deep: true, immediate: true })
@@ -312,8 +315,14 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss" placeholder="创建时间"
+            v-model="timeRange"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="创建开始时间"
+            end-placeholder="创建结束时间"
+            clearable
+            style="width: 360px;"
           />
         </search-item>
         <search-item>
@@ -323,10 +332,6 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <icon-button
-            v-if="proxy.hasPerm('/file/approve/export')" icon="icon-export" title="导出"
-            @click="exportExcelBtn"
-          />
           <icon-button v-if="proxy.hasPerm('/file/approve/print')" icon="icon-print" title="打印" @click="printList" />
         </template>
         <!-- 表格区域 -->
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 9dd3633..de9e080 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -85,7 +85,7 @@
 const getStatus = () => {
   getDictByCode('effectiveStatus').then((res) => {
     if (res.code === 200) {
-      effectiveStatusSelect.value = [...res.data, { name: '全部', value: '', id: 'quanbu' }]
+      effectiveStatusSelect.value = res.data
     }
   })
 }
@@ -373,8 +373,8 @@
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/add`)" icon="icon-add" title="新建" @click="add" />
-          <icon-button v-if="proxy.hasPerm(`/file/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
-          <icon-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <!-- <icon-button v-if="proxy.hasPerm(`/file/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" /> -->
+          <!-- <icon-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" /> -->
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/print`)" icon="icon-print" title="打印" @click="printList" />
         </template>
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 3510056..ed3ab8c 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -282,8 +282,8 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/measure/price/import')" icon="icon-import" title="批量导入" type="primary" />
-        <icon-button v-if="proxy.hasPerm('/measure/price/mould')" icon="icon-template" title="模板下载" type="primary" />
+        <!-- <icon-button v-if="proxy.hasPerm('/measure/price/import')" icon="icon-import" title="批量导入" type="primary" /> -->
+        <!-- <icon-button v-if="proxy.hasPerm('/measure/price/mould')" icon="icon-template" title="模板下载" type="primary" /> -->
         <icon-button v-if="proxy.hasPerm('/measure/price/add')" icon="icon-add" title="新建" type="primary" @click="add" />
         <icon-button v-if="proxy.hasPerm('/measure/price/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/measure/price/print')" icon="icon-print" title="打印" type="primary" @click="printList" />

diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..9cf2b29 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -28,6 +28,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    DeptSelectByName: typeof import('./components/DeptSelectByName/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
diff --git a/src/views/business/board/standardReminder/list.vue b/src/views/business/board/standardReminder/list.vue
index 85efbb1..fd60743 100644
--- a/src/views/business/board/standardReminder/list.vue
+++ b/src/views/business/board/standardReminder/list.vue
@@ -94,12 +94,33 @@
 const preparation = ref<string>('')
 // 到期开始以及结束
 const validTime = ref<string>('')
+watch(preparation, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
+// 有效日期变更
+watch(validTime, (val) => {
+  if (val) {
+    listQuery.value.validStartTime = `${val[0]}`
+    listQuery.value.validEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.validStartTime = ''
+    listQuery.value.validEndTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.preparationStartDate = preparation.value[0] || ''
-  listQuery.value.preparationEndDate = preparation.value[1] || ''
-  listQuery.value.validStartTime = validTime.value[0] || ''
-  listQuery.value.validEndTime = validTime.value[1] || ''
+  // listQuery.value.preparationStartDate = preparation.value[0] || ''
+  // listQuery.value.preparationEndDate = preparation.value[1] || ''
+  // listQuery.value.validStartTime = validTime.value[0] || ''
+  // listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -223,16 +244,16 @@
   })
   if (list.value.length > 0) {
     const params = {
-      category: '', // 类别
-      id: '', // 主键id
-      managerState: '', // 管理状态
-      preparationEndDate: '', // 结束时间
-      preparationStartDate: '', // 开始时间
-      standardLaboratory: '', // 标准所在部门
-      standardName: '', // 标准名称
-      standardNo: '', // 标准编号
-      validEndTime: '', // 结束时间
-      validStartTime: '', // 开始时间
+      category: listQuery.value.category, // 类别
+      id: listQuery.value.id, // 主键id
+      managerState: listQuery.value.managerState, // 管理状态
+      preparationEndDate: listQuery.value.preparationEndDate, // 结束时间
+      preparationStartDate: listQuery.value.preparationStartDate, // 开始时间
+      standardLaboratory: listQuery.value.standardLaboratory, // 标准所在部门
+      standardName: listQuery.value.standardName, // 标准名称
+      standardNo: listQuery.value.standardNo, // 标准编号
+      validEndTime: listQuery.value.validEndTime, // 结束时间
+      validStartTime: listQuery.value.validStartTime, // 开始时间
       offset: 1, // 当前页
       limit: 20, // 每页多少条
       ids: checkoutList.value,
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 8666957..37ac73f 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -137,7 +137,7 @@
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  distributeDialogRef.value.initDialog(row.id, row.sampleId, row.orderId)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId, row.sampleStatus)
 }
 // 点击标签绑定
 const barCodeBind = ref()
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 807ea30..4e4eb46 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -37,11 +37,21 @@
   { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
   { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
 ])
-
+// 时间变更
+watch(trainTime, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 查询列表
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.startTime = trainTime.value[0] || ''
-  listQuery.value.endTime = trainTime.value[1] || ''
+  // listQuery.value.startTime = trainTime.value[0] || ''
+  // listQuery.value.endTime = trainTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2f7c1d0..bccde84 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -139,7 +139,17 @@
     id: '2', // 后端规定已收入传2
   })
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -147,8 +157,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.sampleStatus = active.value
   getInterChangeList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IinterchangeList) => {
@@ -280,7 +290,7 @@
       else if (type === 'delete') { // 无需检测
         interchangeStatusChange({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '7' }).then((res) => {
           if (res.code === 200) {
-            ElMessage.success(`已${title}`)
+            ElMessage.success('操作成功')
             fetchData(true)
           }
         })
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList.vue b/src/views/business/schedule/interchangeReceipt/receiptList.vue
index 275a053..83d93f4 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptList.vue
@@ -42,7 +42,17 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -50,8 +60,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getReceiptList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -124,13 +134,13 @@
   })
   if (list.value.length > 0) {
     const params = {
-      interchangeCode: '', // 交接单编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      reciever: '', // 接收人
-      deliverer: '', // 送样人
-      startTime: '', // 交接开始时间
-      endTime: '', // 交接结束时间
+      interchangeCode: listQuery.value.interchangeCode, // 交接单编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      reciever: listQuery.value.reciever, // 接收人
+      deliverer: listQuery.value.deliverer, // 送样人
+      startTime: listQuery.value.startTime, // 交接开始时间
+      endTime: listQuery.value.endTime, // 交接结束时间
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index cf0b532..f2fc852 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -26,8 +26,8 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   deliverer: '', // 送样人
-  isUrgent: 2, // 是否加急 2全部 1是 0否
-  status: 0, // 接收状态
+  isUrgent: '', // 是否加急 2全部 1是 0否
+  status: '', // 接收状态
   offset: 1,
   limit: 20,
 })
@@ -70,11 +70,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    isUrgentMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 2, // 是否加急全部后端定为2
-    })
+    // isUrgentMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 2, // 是否加急全部后端定为2
+    // })
   })
   // 接收状态
   getDictByCode('orderStatus').then((response) => {
@@ -85,11 +85,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    statusMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 0,
-    })
+    // statusMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 0,
+    // })
     console.log(statusMap.value)
   })
 }
@@ -125,8 +125,8 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     deliverer: '', // 送样人
-    isUrgent: 2, // 是否加急
-    status: 0, // 接收状态
+    isUrgent: '', // 是否加急 2全部 1是 0否
+    status: '', // 接收状态
     offset: 1,
     limit: 20,
   }
@@ -191,12 +191,12 @@
   })
   if (list.value.length > 0) {
     const params = {
-      orderCode: '', // 委托书编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      deliverer: '', // 送样人
-      isUrgent: 2, // 是否加急
-      status: 0, // 接收状态
+      orderCode: listQuery.value.orderCode, // 委托书编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      deliverer: listQuery.value.deliverer, // 送样人
+      isUrgent: listQuery.value.isUrgent, // 是否加急
+      status: listQuery.value.status, // 接收状态
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 2d92da9..14cd1ce 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -6,7 +6,7 @@
   customerName: string // 委托方名称
   deliverer: string // 送样人
   isUrgent: number | string // 是否加急
-  status: number // 接收状态
+  status: number | string// 接收状态
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 50308c7..25c5cf9 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -53,6 +53,7 @@
   handOutProperty: string // 分发性质-初次分发、退回分发
   id?: string // 实验室id
   customerId?: string // 客户id
+  certificationState?: string // 证书出具
 }
 
 // 实验室检测/我的检测列表
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index 7c17365..7159350 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -1,6 +1,6 @@
 <!-- 任务分发 -->
 <script lang="ts" setup name="TaskEdit">
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
 import ProcessConfig from './components/processConfig.vue'
@@ -11,6 +11,7 @@
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { UploadFile } from '@/api/measure/file'
 import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 interface dictType {
   id: string
@@ -251,16 +252,22 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    // UploadFile(fd).then((res) => {
-    //   if (res.code === 200) {
-    //     sampleForm.value.minioFileName = res.data[0]
-    //     // 重置当前验证
-    //     ElMessage.success('文件上传成功')
-    //   }
-    //   else {
-    //     ElMessage.error(res.message)
-    //   }
-    // })
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        sampleForm.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+        loading.close()
+      }
+      else {
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    })
   }
 }
 const upload = () => {
@@ -402,7 +409,7 @@
               <el-form-item label="校检类别:">
                 <el-select
                   v-model="sampleForm.measureCategory"
-                  :placeholder="roleType === 'detail' ? '' : '请选择校检类别'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择校检类别'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -424,7 +431,7 @@
               <el-form-item label="厂家国别:">
                 <el-select
                   v-model="sampleForm.manufacturerCountry"
-                  :placeholder="roleType === 'detail' ? '' : '请选择厂家国别'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择厂家国别'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -450,7 +457,7 @@
               <el-form-item label="ABC:">
                 <el-select
                   v-model="sampleForm.abc"
-                  :placeholder="roleType === 'detail' ? '' : '请选择ABC'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择ABC'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -504,8 +511,8 @@
               <el-form-item label="备注:">
                 <el-input
                   v-model="sampleForm.remark"
+                  autosize
                   type="textarea"
-                  :rows="2"
                   :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
                   :class="{ 'detail-input': roleType === 'detail' }"
@@ -516,7 +523,7 @@
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="sampleForm.measureType"
-                  :placeholder="roleType === 'detail' ? '' : '请选择检定方式'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择检定方式'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index dfbbf6a..6eeff55 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -81,7 +81,7 @@
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '165px' },
   { text: '样品属性', value: 'sampleBelongName', width: '100', align: 'center' },
   { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '90' },
-  { text: '证书出具', value: 'certificationState', align: 'center', width: '90', filter: (row: ITaskList) => { return `${row.alreadyCertifications}/${row.requireCertifications}` } },
+  { text: '证书出具', value: 'certificationState', align: 'center', width: '90' },
 ])
 // 表格数据
 const list = ref<ITaskList[]>([])
@@ -104,6 +104,7 @@
   getTaskList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: ITaskList) => {
       item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      item.certificationState = `${item.alreadyCertifications}/${item.requireCertifications}`
       return item
     })
     total.value = response.data.total
diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue
index e44dd67..194de53 100644
--- a/src/views/business/subpackage/apply/list.vue
+++ b/src/views/business/subpackage/apply/list.vue
@@ -302,7 +302,7 @@
         <search-item>
           <el-date-picker
             v-model="timeRange" type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="申请开始时间" end-placeholder="申请结束时间"
+            value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="申请开始时间" end-placeholder="申请结束时间" clearable
           />
         </search-item>
       </search-area>
diff --git a/src/views/business/subpackage/check/list.vue b/src/views/business/subpackage/check/list.vue
index 51ea419..a8b6744 100644
--- a/src/views/business/subpackage/check/list.vue
+++ b/src/views/business/subpackage/check/list.vue
@@ -111,8 +111,6 @@
 
 // 时间变更
 watch(timeRange, (val) => {
-  console.log(val[0])
-
   if (val) {
     listQuery.value.checkStartTime = `${val[0]}`
     listQuery.value.checkEndTime = `${val[1]}`
@@ -345,7 +343,8 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="timeRange" type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
+            v-model="timeRange"
+            clearable type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="验收开始时间" end-placeholder="验收结束时间"
           />
         </search-item>
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 98f4a39..a0db900 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -68,6 +68,7 @@
   else {
     listQuery.value.startTime = ''
     listQuery.value.endTime = ''
+    timeRange.value = ['', '']
   }
 })
 // 多选发生改变时
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index 6e41a94..ac98b8a 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -56,7 +56,17 @@
 const checkoutList = ref<string[]>([])
 // 文件上传input
 const fileRef = ref()
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -64,8 +74,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getSampleList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index 92e4b4a..6f465fc 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -67,7 +67,17 @@
     certificationStatusMap.value[`${item.value}`] = item.name
   })
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -75,8 +85,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getSampleList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IOvertimeList) => {
       return {
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index dbaa437..14464bf 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -86,6 +86,17 @@
     width: 160,
   },
 ]) // 表格
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 const fetchData = (isNowPage = false) => {
   loadingTable.value = true
@@ -93,8 +104,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.processResult = active.value
   getApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 60d1454..d0236cc 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -105,7 +105,17 @@
     align: 'center',
   },
 ])
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 const fetchData = (isNowPage = false) => {
   loadingTable.value = true
@@ -113,8 +123,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.approvalStatus = active.value
   getApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index aeb568e..5430b0f 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -103,10 +103,21 @@
 // 装载时间数组
 const checkTime = ref<string>('')
 const loadingTable = ref(false)
+// 时间变更
+watch(checkTime, (val) => {
+  if (val) {
+    listQuery.value.checkStartDate = `${val[0]}`
+    listQuery.value.checkEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.checkStartDate = ''
+    listQuery.value.checkEndDate = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.checkStartDate = checkTime.value[0] || ''
-  listQuery.value.checkEndDate = checkTime.value[1] || ''
+  // listQuery.value.checkStartDate = checkTime.value[0] || ''
+  // listQuery.value.checkEndDate = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 6229abf..9d30934 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -112,10 +112,21 @@
 // 装载时间数组
 const checkTime = ref('')
 const loadingTable = ref(false)
+// 时间变更
+watch(checkTime, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.startTime = checkTime.value[0] || ''
-  listQuery.value.endTime = checkTime.value[1] || ''
+  // listQuery.value.startTime = checkTime.value[0] || ''
+  // listQuery.value.endTime = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index daca294..de18467 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -66,6 +66,17 @@
 const checkoutList = ref<IManageChecklist[]>([])
 // 文件上传input
 const fileRef = ref()
+// 时间变更
+watch(checkDate, (val) => {
+  if (val) {
+    listQuery.value.checkStartDate = `${val[0]}`
+    listQuery.value.checkEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.checkStartDate = ''
+    listQuery.value.checkEndDate = ''
+  }
+})
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
@@ -73,8 +84,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.checkStartDate = checkDate.value[0] || ''
-  listQuery.value.checkEndDate = checkDate.value[1] || ''
+  // listQuery.value.checkStartDate = checkDate.value[0] || ''
+  // listQuery.value.checkEndDate = checkDate.value[1] || ''
   getcheckInfoList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: any) => {
       return {
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 00d283c..50b014c 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -99,6 +99,17 @@
     approvalStatusReserveMap.value[item.name] = `${item.value}`
   })
 }
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -106,8 +117,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.approvalStatus = active.value
   getReceiveApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/receive/solve/solveList.vue b/src/views/device/receive/solve/solveList.vue
index 809c0c1..ec1e8bb 100644
--- a/src/views/device/receive/solve/solveList.vue
+++ b/src/views/device/receive/solve/solveList.vue
@@ -120,7 +120,17 @@
   timeRange.value = ['', ''] // 把时间选择框置空
   fetchData(true)
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -128,8 +138,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getReceiveApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IsolveListType) => {
       return {
diff --git a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
index 4744536..b4fe085 100644
--- a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
@@ -43,7 +43,12 @@
   select.value = -1
   listPageApi(listQuery.value).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows
+      list.value = res.data.rows.map((item: { effectiveStatusName: string }) => {
+        return {
+          ...item,
+          isDisabled: item.effectiveStatusName === '已废止',
+        }
+      })
       total.value = res.data.total
     }
   })
@@ -142,7 +147,7 @@
           </el-table-column>
           <el-table-column label="" width="55" align="center" fixed="left">
             <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
+              <el-radio v-model="select" :disabled="scope.row.isDisabled" :label="scope.$index" class="radio" />
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index a030dcf..0dd5547 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -94,12 +94,34 @@
 const preparation = ref<string>('')
 // 到期开始以及结束
 const validTime = ref<string>('')
+// 筹建日期变更
+watch(preparation, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
+// 有效日期变更
+watch(validTime, (val) => {
+  if (val) {
+    listQuery.value.validStartTime = `${val[0]}`
+    listQuery.value.validEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.validStartTime = ''
+    listQuery.value.validEndTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.preparationStartDate = preparation.value[0] || ''
-  listQuery.value.preparationEndDate = preparation.value[1] || ''
-  listQuery.value.validStartTime = validTime.value[0] || ''
-  listQuery.value.validEndTime = validTime.value[1] || ''
+  // listQuery.value.preparationStartDate = preparation.value[0] || ''
+  // listQuery.value.preparationEndDate = preparation.value[1] || ''
+  // listQuery.value.validStartTime = validTime.value[0] || ''
+  // listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index 39d8683..bb69fe9 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -99,6 +99,17 @@
 const standardManagerStateList = ref<IOptions[]>([])
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
+// 时间变更
+watch(preparationDate, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
@@ -107,8 +118,8 @@
     listQuery.value.offset = 1
   }
   // 筹建日期
-  listQuery.value.preparationStartDate = preparationDate.value[0] || ''
-  listQuery.value.preparationEndDate = preparationDate.value[1] || ''
+  // listQuery.value.preparationStartDate = preparationDate.value[0] || ''
+  // listQuery.value.preparationEndDate = preparationDate.value[1] || ''
   getStandardList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: any) => {
       return {
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 37205fc..edf9dd7 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -793,7 +793,7 @@
             保存
           </el-button>
           <!-- 待审批 -->
-          <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'agree' })">
+          <!-- <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'agree' })">
             同意
           </el-button>
           <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'reject' })">
@@ -801,7 +801,7 @@
           </el-button>
           <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'refuse' })">
             拒绝
-          </el-button>
+          </el-button> -->
           <!-- </template> -->
         </template>
         <el-button v-if="(title === '详情' && $route.query?.approvalStatusName === '草稿箱' && isCancel)" type="primary" @click="editForm">
diff --git a/src/views/finance/businessSettlement/list.vue b/src/views/finance/businessSettlement/list.vue
index e942abb..9543947 100644
--- a/src/views/finance/businessSettlement/list.vue
+++ b/src/views/finance/businessSettlement/list.vue
@@ -43,6 +43,7 @@
 const list = ref<IList[]>([]) // 表格数据
 // 选中的内容
 const checkoutList = ref<string[]>([])
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
diff --git a/src/views/finance/contract/list.vue b/src/views/finance/contract/list.vue
index 7dcdca5..5f8eb4e 100644
--- a/src/views/finance/contract/list.vue
+++ b/src/views/finance/contract/list.vue
@@ -59,6 +59,17 @@
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 选中的内容
 const checkoutList = ref<string[]>([])
+// 时间变更
+watch(dateRange, (val) => {
+  if (val) {
+    listQuery.value.estimateSignStartDate = `${val[0]}`
+    listQuery.value.estimateSignEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.estimateSignStartDate = ''
+    listQuery.value.estimateSignEndDate = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -66,8 +77,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.estimateSignStartDate = dateRange.value[0] as string || ''
-  listQuery.value.estimateSignEndDate = dateRange.value[1] as string || ''
+  // listQuery.value.estimateSignStartDate = dateRange.value[0] as string || ''
+  // listQuery.value.estimateSignEndDate = dateRange.value[1] as string || ''
   getContractList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: { estimateSignDate: string; agreementAmount: number }) => {
       return {
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 1bce5f9..07b2296 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,7 +1,7 @@
-<!-- 新增或详情弹窗 -->
+<!-- 新增或详情 -->
 <script lang="ts" setup name="addNotice">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
@@ -15,6 +15,7 @@
 import { SCHEDULE } from '@/utils/scheduleDict'
 const $route = useRoute()
 const $router = useRouter()
+const submitId = ref('') // 提交id-保存接口获取
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
 const fileTypeName = ref('')
@@ -40,12 +41,12 @@
   formId: SCHEDULE.FILE_APPROVAL,
 }) // 表单
 const rules = ref<FormRules>({
-  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
-  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
-  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
-  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
-  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+  fileName: [{ required: true, message: '名称必填', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建必填', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位必填', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间必填', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人必填', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号必填', trigger: 'blur' }],
 }) // 表单验证规则
 
 const userList = ref<userType[]>([]) // 可使用人列表
@@ -57,12 +58,14 @@
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
-const PubList = ref<deptType[]>([])
+const PubList = ref([]) as any// 发布单位列表
 const PubListTree = ref([])
 // 获取发布单位列表
 const getPubList = () => {
   getDeptTreeList().then((res) => {
     PubList.value = res.data
+    console.log('0000', 'ppp', PubList.value)
+
     PubListTree.value = toTreeList(res.data, '0', true)
   })
 }
@@ -113,43 +116,57 @@
   effectiveStatusName.value = ''
 }
 // 提交
-const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+const saveForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
-    `确认${flag}吗？`,
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then((res) => {
+        const publisherId = ruleForm.publisher
+        const index = PubList.value.findIndex((item: { id: string }) => item.id === publisherId)
+        if (index !== -1) {
+          ruleForm.publisher = PubList.value[index].name as string
+        }
+        // 保存（草稿箱）
+        confirmDrafts(ruleForm).then((res) => {
+          ruleForm.fileNo = res.data.fileNo
+          submitId.value = res.data.id
+          ElMessage.success('保存成功')
+          // formEl?.resetFields()
+          // $router.go(-1)
+          close()
+        })
+      })
+    }
+  })
+}
+const submitForm = () => {
+  if (!submitId.value) {
+    ElMessage.warning('请先保存')
+    return false
+  }
+  ElMessageBox.confirm(
+    '确认提交吗？',
     '提示',
     {
       confirmButtonText: '确认',
       cancelButtonText: '取消',
       type: 'warning',
     },
-      ).then((res) => {
-        if (flag === '提交') {
-          confirmDrafts(ruleForm).then((res) => {
-            if (res.code === 200) {
-              console.log(res.data, '保存成功')
-              submitFile({ id: res.data.id, formId: SCHEDULE.FILE_APPROVAL }).then((res) => {
-                formEl?.resetFields()
-                ElMessage.success('提交成功')
-                $router.go(-1)
-                close()
-              })
-            }
-          })
-        }
-        else {
-          // 保存（草稿箱）
-          confirmDrafts(ruleForm).then((res) => {
-            ElMessage.success('保存成功')
-            formEl?.resetFields()
-            $router.go(-1)
-            close()
-          })
-        }
-      })
-    }
+  ).then((res) => {
+    submitFile({ id: submitId.value, formId: SCHEDULE.FILE_APPROVAL }).then((res) => {
+    // formEl?.resetFields()
+      ElMessage.success('已提交')
+      $router.go(-1)
+      close()
+    })
   })
 }
 // 取消
@@ -163,9 +180,14 @@
 const onFileChange = (event: any) => {
   // 原生上传
   // console.log(event.target.files)
+
   if (event.target.files?.length !== 0) {
     // 创建formdata对象
     const fd = new FormData()
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
@@ -173,9 +195,11 @@
         // 重置当前验证
         ruleFormRef.value?.clearValidate('minioFileName')
         ElMessage.success('文件上传成功')
+        loading.close()
       }
       else {
         ElMessage.error(res.message)
+        loading.close()
       }
     })
   }
@@ -215,10 +239,10 @@
   <app-container style="overflow: hidden;">
     <detail-page :title="`${fileTypeName}-${title}`">
       <template #btns>
-        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm()">
           提交
         </el-button>
-        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
+        <el-button v-if="title !== '详情'" type="primary" @click="saveForm(ruleFormRef)">
           保存
         </el-button>
         <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -258,7 +282,7 @@
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
                 style="width: 100%;"
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 135d059..c2b46c0 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -1,6 +1,7 @@
 <!-- 文件审批公共模板 -->
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { DateModelType } from 'element-plus'
 import type { TableRow } from './approve-interface'
 import type { fileResType } from '@/views/measure/file/file-interface'
 import { printJSON } from '@/utils/printUtils'
@@ -32,12 +33,13 @@
 const approvalStatusReserveMap = ref({ ...props.approvalStatusReserveMap }) // 审批状态字典{草稿箱: 1}
 const activeTitle = ref('') // active对应的审批状态名字
 
-const searchQuery = reactive({
+const searchQuery = ref({
   fileNo: '', // 编号
   fileName: '', // 名称
   fileCode: '', // 文件号
   createUser: '', // 创建人
-  createTime: '', // 创建
+  createStartTime: '', // 创建开始时间
+  createEndTime: '', // 创建结束时间
   approvalStatus: approvalStatus.value, // 审批状态
   limit: 20,
   offset: 1,
@@ -49,18 +51,31 @@
 const total = ref<number>(0) // 数据总条数
 const columns = ref<TableColumn[]>([
   { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
+  { text: '编号', value: 'fileNo', align: 'center', width: '160' },
   { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
+  { text: '类别', value: 'fileTypeName', align: 'center' },
   { text: '创建人', value: 'createUser', align: 'center' },
-  { text: '创建时间', value: 'createTime', align: 'center' },
-  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110' },
 ]) // 表格
 const list = ref<TableRow[]>([]) // 表格数据
+// 筛选时间段数据
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    searchQuery.value.createStartTime = `${val[0]}`
+    searchQuery.value.createEndTime = `${val[1]}`
+  }
+  else {
+    searchQuery.value.createStartTime = ''
+    searchQuery.value.createEndTime = ''
+  }
+})
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
-  approvallistPageApi(searchQuery).then((res) => {
+  approvallistPageApi(searchQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows.map((item: TableRow) => {
         return {
@@ -85,10 +100,10 @@
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
-    searchQuery.limit = val.size
+    searchQuery.value.limit = val.size
   }
   if (val && val.page) {
-    searchQuery.offset = val.page
+    searchQuery.value.offset = val.page
   }
   getList()
 }
@@ -216,12 +231,21 @@
 }
 // 重置
 const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.fileType = ''
-  searchQuery.createTime = ''
-  searchQuery.createUser = ''
+  searchQuery.value = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    fileCode: '', // 文件号
+    createUser: '', // 创建人
+    createStartTime: '', // 创建开始时间
+    createEndTime: '', // 创建结束时间
+    approvalStatus: approvalStatus.value, // 审批状态
+    limit: 20,
+    offset: 1,
+    fileType: '', // 文件类别
+    formId: SCHEDULE.FILE_APPROVAL,
+    ids: [] as string[],
+  }
+  timeRange.value = ['', '']
   getList()
 }
 // 表格被选中的行
@@ -230,27 +254,6 @@
 const multiSelect = (row: TableRow[]) => {
   selectList.value = row
 }
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  searchQuery.ids = []
-  if (selectList.value.length) {
-    selectList.value.forEach((item) => {
-      searchQuery.ids?.push(item.id as string)
-    })
-  }
-  exportFileApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
-    exportFile(res.data, props.name)
-    loading.close()
-    searchQuery.ids = []
-  }).catch((_) => {
-    loading.close()
-  })
-}
 // 打印
 function printList() {
   const selectIds = selectList.value.map(item => item.id)
@@ -278,8 +281,8 @@
   sessionStorage.setItem('approveFileMenu', props.name)
   approvalStatus.value = approvalStatusReserveMap.value[props.name]
   // approvalStatus.value = approvalStatusReserveMap.value[props.name] // 失效
-  searchQuery.approvalStatus = approvalStatusReserveMap.value[props.name] || '0'
-  $router.currentRoute.value.query.cacheActive = searchQuery.approvalStatus
+  searchQuery.value.approvalStatus = approvalStatusReserveMap.value[props.name] || '0'
+  $router.currentRoute.value.query.cacheActive = searchQuery.value.approvalStatus
   getList()
   // 缓存名称
 }, { deep: true, immediate: true })
@@ -312,8 +315,14 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss" placeholder="创建时间"
+            v-model="timeRange"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="创建开始时间"
+            end-placeholder="创建结束时间"
+            clearable
+            style="width: 360px;"
           />
         </search-item>
         <search-item>
@@ -323,10 +332,6 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <icon-button
-            v-if="proxy.hasPerm('/file/approve/export')" icon="icon-export" title="导出"
-            @click="exportExcelBtn"
-          />
           <icon-button v-if="proxy.hasPerm('/file/approve/print')" icon="icon-print" title="打印" @click="printList" />
         </template>
         <!-- 表格区域 -->
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 9dd3633..de9e080 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -85,7 +85,7 @@
 const getStatus = () => {
   getDictByCode('effectiveStatus').then((res) => {
     if (res.code === 200) {
-      effectiveStatusSelect.value = [...res.data, { name: '全部', value: '', id: 'quanbu' }]
+      effectiveStatusSelect.value = res.data
     }
   })
 }
@@ -373,8 +373,8 @@
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/add`)" icon="icon-add" title="新建" @click="add" />
-          <icon-button v-if="proxy.hasPerm(`/file/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
-          <icon-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <!-- <icon-button v-if="proxy.hasPerm(`/file/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" /> -->
+          <!-- <icon-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" /> -->
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/print`)" icon="icon-print" title="打印" @click="printList" />
         </template>
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 3510056..ed3ab8c 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -282,8 +282,8 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/measure/price/import')" icon="icon-import" title="批量导入" type="primary" />
-        <icon-button v-if="proxy.hasPerm('/measure/price/mould')" icon="icon-template" title="模板下载" type="primary" />
+        <!-- <icon-button v-if="proxy.hasPerm('/measure/price/import')" icon="icon-import" title="批量导入" type="primary" /> -->
+        <!-- <icon-button v-if="proxy.hasPerm('/measure/price/mould')" icon="icon-template" title="模板下载" type="primary" /> -->
         <icon-button v-if="proxy.hasPerm('/measure/price/add')" icon="icon-add" title="新建" type="primary" @click="add" />
         <icon-button v-if="proxy.hasPerm('/measure/price/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/measure/price/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 60eeebb..7b6f4ec 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -61,7 +61,8 @@
   categoryName: [{ required: true, message: '类别不能为空', trigger: ['blur', 'change'] }],
   itemName: [{ required: true, message: '项目不能为空', trigger: ['blur', 'change'] }],
   priceStandardName: [{ required: true, message: '依据标准不能为空', trigger: ['blur', 'change'] }],
-  price: [{ required: true, message: '标准价格不能为空', trigger: ['blur', 'change'] }],
+  price: [{ required: true, message: '标准价格不能为空', trigger: ['blur', 'change'] },
+    { pattern: /^(?!0+(?:\.0+)?$)(?:[1-9]\d*|0)(?:\.\d{1,2})?$/, message: '要求不小于0，且最多保留两位小数', trigger: ['blur', 'change'] }],
   operatorDiscountPermission: [{ required: true, message: '业务员折扣权限不能为空', trigger: ['blur', 'change'] }],
   directorDiscountPermission: [{ required: true, message: '负责人折扣权限不能为空', trigger: ['blur', 'change'] }],
 })
@@ -255,7 +256,7 @@
                   v-model.trim="formInline.priceStandardName"
                   clearable
                   :placeholder="pageType === 'detail' ? '' : '依据标准'"
-                  :disabled="pageType === 'detail'"
+                  disabled
                 >
                   <template v-if="pageType !== 'detail'" #append>
                     <el-button

diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..9cf2b29 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -28,6 +28,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    DeptSelectByName: typeof import('./components/DeptSelectByName/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
diff --git a/src/views/business/board/standardReminder/list.vue b/src/views/business/board/standardReminder/list.vue
index 85efbb1..fd60743 100644
--- a/src/views/business/board/standardReminder/list.vue
+++ b/src/views/business/board/standardReminder/list.vue
@@ -94,12 +94,33 @@
 const preparation = ref<string>('')
 // 到期开始以及结束
 const validTime = ref<string>('')
+watch(preparation, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
+// 有效日期变更
+watch(validTime, (val) => {
+  if (val) {
+    listQuery.value.validStartTime = `${val[0]}`
+    listQuery.value.validEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.validStartTime = ''
+    listQuery.value.validEndTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.preparationStartDate = preparation.value[0] || ''
-  listQuery.value.preparationEndDate = preparation.value[1] || ''
-  listQuery.value.validStartTime = validTime.value[0] || ''
-  listQuery.value.validEndTime = validTime.value[1] || ''
+  // listQuery.value.preparationStartDate = preparation.value[0] || ''
+  // listQuery.value.preparationEndDate = preparation.value[1] || ''
+  // listQuery.value.validStartTime = validTime.value[0] || ''
+  // listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -223,16 +244,16 @@
   })
   if (list.value.length > 0) {
     const params = {
-      category: '', // 类别
-      id: '', // 主键id
-      managerState: '', // 管理状态
-      preparationEndDate: '', // 结束时间
-      preparationStartDate: '', // 开始时间
-      standardLaboratory: '', // 标准所在部门
-      standardName: '', // 标准名称
-      standardNo: '', // 标准编号
-      validEndTime: '', // 结束时间
-      validStartTime: '', // 开始时间
+      category: listQuery.value.category, // 类别
+      id: listQuery.value.id, // 主键id
+      managerState: listQuery.value.managerState, // 管理状态
+      preparationEndDate: listQuery.value.preparationEndDate, // 结束时间
+      preparationStartDate: listQuery.value.preparationStartDate, // 开始时间
+      standardLaboratory: listQuery.value.standardLaboratory, // 标准所在部门
+      standardName: listQuery.value.standardName, // 标准名称
+      standardNo: listQuery.value.standardNo, // 标准编号
+      validEndTime: listQuery.value.validEndTime, // 结束时间
+      validStartTime: listQuery.value.validStartTime, // 开始时间
       offset: 1, // 当前页
       limit: 20, // 每页多少条
       ids: checkoutList.value,
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 8666957..37ac73f 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -137,7 +137,7 @@
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  distributeDialogRef.value.initDialog(row.id, row.sampleId, row.orderId)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId, row.sampleStatus)
 }
 // 点击标签绑定
 const barCodeBind = ref()
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 807ea30..4e4eb46 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -37,11 +37,21 @@
   { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
   { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
 ])
-
+// 时间变更
+watch(trainTime, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 查询列表
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.startTime = trainTime.value[0] || ''
-  listQuery.value.endTime = trainTime.value[1] || ''
+  // listQuery.value.startTime = trainTime.value[0] || ''
+  // listQuery.value.endTime = trainTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2f7c1d0..bccde84 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -139,7 +139,17 @@
     id: '2', // 后端规定已收入传2
   })
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -147,8 +157,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.sampleStatus = active.value
   getInterChangeList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IinterchangeList) => {
@@ -280,7 +290,7 @@
       else if (type === 'delete') { // 无需检测
         interchangeStatusChange({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '7' }).then((res) => {
           if (res.code === 200) {
-            ElMessage.success(`已${title}`)
+            ElMessage.success('操作成功')
             fetchData(true)
           }
         })
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList.vue b/src/views/business/schedule/interchangeReceipt/receiptList.vue
index 275a053..83d93f4 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptList.vue
@@ -42,7 +42,17 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -50,8 +60,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getReceiptList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -124,13 +134,13 @@
   })
   if (list.value.length > 0) {
     const params = {
-      interchangeCode: '', // 交接单编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      reciever: '', // 接收人
-      deliverer: '', // 送样人
-      startTime: '', // 交接开始时间
-      endTime: '', // 交接结束时间
+      interchangeCode: listQuery.value.interchangeCode, // 交接单编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      reciever: listQuery.value.reciever, // 接收人
+      deliverer: listQuery.value.deliverer, // 送样人
+      startTime: listQuery.value.startTime, // 交接开始时间
+      endTime: listQuery.value.endTime, // 交接结束时间
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index cf0b532..f2fc852 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -26,8 +26,8 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   deliverer: '', // 送样人
-  isUrgent: 2, // 是否加急 2全部 1是 0否
-  status: 0, // 接收状态
+  isUrgent: '', // 是否加急 2全部 1是 0否
+  status: '', // 接收状态
   offset: 1,
   limit: 20,
 })
@@ -70,11 +70,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    isUrgentMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 2, // 是否加急全部后端定为2
-    })
+    // isUrgentMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 2, // 是否加急全部后端定为2
+    // })
   })
   // 接收状态
   getDictByCode('orderStatus').then((response) => {
@@ -85,11 +85,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    statusMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 0,
-    })
+    // statusMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 0,
+    // })
     console.log(statusMap.value)
   })
 }
@@ -125,8 +125,8 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     deliverer: '', // 送样人
-    isUrgent: 2, // 是否加急
-    status: 0, // 接收状态
+    isUrgent: '', // 是否加急 2全部 1是 0否
+    status: '', // 接收状态
     offset: 1,
     limit: 20,
   }
@@ -191,12 +191,12 @@
   })
   if (list.value.length > 0) {
     const params = {
-      orderCode: '', // 委托书编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      deliverer: '', // 送样人
-      isUrgent: 2, // 是否加急
-      status: 0, // 接收状态
+      orderCode: listQuery.value.orderCode, // 委托书编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      deliverer: listQuery.value.deliverer, // 送样人
+      isUrgent: listQuery.value.isUrgent, // 是否加急
+      status: listQuery.value.status, // 接收状态
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 2d92da9..14cd1ce 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -6,7 +6,7 @@
   customerName: string // 委托方名称
   deliverer: string // 送样人
   isUrgent: number | string // 是否加急
-  status: number // 接收状态
+  status: number | string// 接收状态
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 50308c7..25c5cf9 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -53,6 +53,7 @@
   handOutProperty: string // 分发性质-初次分发、退回分发
   id?: string // 实验室id
   customerId?: string // 客户id
+  certificationState?: string // 证书出具
 }
 
 // 实验室检测/我的检测列表
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index 7c17365..7159350 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -1,6 +1,6 @@
 <!-- 任务分发 -->
 <script lang="ts" setup name="TaskEdit">
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
 import ProcessConfig from './components/processConfig.vue'
@@ -11,6 +11,7 @@
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { UploadFile } from '@/api/measure/file'
 import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 interface dictType {
   id: string
@@ -251,16 +252,22 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    // UploadFile(fd).then((res) => {
-    //   if (res.code === 200) {
-    //     sampleForm.value.minioFileName = res.data[0]
-    //     // 重置当前验证
-    //     ElMessage.success('文件上传成功')
-    //   }
-    //   else {
-    //     ElMessage.error(res.message)
-    //   }
-    // })
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        sampleForm.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+        loading.close()
+      }
+      else {
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    })
   }
 }
 const upload = () => {
@@ -402,7 +409,7 @@
               <el-form-item label="校检类别:">
                 <el-select
                   v-model="sampleForm.measureCategory"
-                  :placeholder="roleType === 'detail' ? '' : '请选择校检类别'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择校检类别'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -424,7 +431,7 @@
               <el-form-item label="厂家国别:">
                 <el-select
                   v-model="sampleForm.manufacturerCountry"
-                  :placeholder="roleType === 'detail' ? '' : '请选择厂家国别'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择厂家国别'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -450,7 +457,7 @@
               <el-form-item label="ABC:">
                 <el-select
                   v-model="sampleForm.abc"
-                  :placeholder="roleType === 'detail' ? '' : '请选择ABC'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择ABC'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -504,8 +511,8 @@
               <el-form-item label="备注:">
                 <el-input
                   v-model="sampleForm.remark"
+                  autosize
                   type="textarea"
-                  :rows="2"
                   :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
                   :class="{ 'detail-input': roleType === 'detail' }"
@@ -516,7 +523,7 @@
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="sampleForm.measureType"
-                  :placeholder="roleType === 'detail' ? '' : '请选择检定方式'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择检定方式'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index dfbbf6a..6eeff55 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -81,7 +81,7 @@
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '165px' },
   { text: '样品属性', value: 'sampleBelongName', width: '100', align: 'center' },
   { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '90' },
-  { text: '证书出具', value: 'certificationState', align: 'center', width: '90', filter: (row: ITaskList) => { return `${row.alreadyCertifications}/${row.requireCertifications}` } },
+  { text: '证书出具', value: 'certificationState', align: 'center', width: '90' },
 ])
 // 表格数据
 const list = ref<ITaskList[]>([])
@@ -104,6 +104,7 @@
   getTaskList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: ITaskList) => {
       item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      item.certificationState = `${item.alreadyCertifications}/${item.requireCertifications}`
       return item
     })
     total.value = response.data.total
diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue
index e44dd67..194de53 100644
--- a/src/views/business/subpackage/apply/list.vue
+++ b/src/views/business/subpackage/apply/list.vue
@@ -302,7 +302,7 @@
         <search-item>
           <el-date-picker
             v-model="timeRange" type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="申请开始时间" end-placeholder="申请结束时间"
+            value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="申请开始时间" end-placeholder="申请结束时间" clearable
           />
         </search-item>
       </search-area>
diff --git a/src/views/business/subpackage/check/list.vue b/src/views/business/subpackage/check/list.vue
index 51ea419..a8b6744 100644
--- a/src/views/business/subpackage/check/list.vue
+++ b/src/views/business/subpackage/check/list.vue
@@ -111,8 +111,6 @@
 
 // 时间变更
 watch(timeRange, (val) => {
-  console.log(val[0])
-
   if (val) {
     listQuery.value.checkStartTime = `${val[0]}`
     listQuery.value.checkEndTime = `${val[1]}`
@@ -345,7 +343,8 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="timeRange" type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
+            v-model="timeRange"
+            clearable type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="验收开始时间" end-placeholder="验收结束时间"
           />
         </search-item>
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 98f4a39..a0db900 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -68,6 +68,7 @@
   else {
     listQuery.value.startTime = ''
     listQuery.value.endTime = ''
+    timeRange.value = ['', '']
   }
 })
 // 多选发生改变时
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index 6e41a94..ac98b8a 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -56,7 +56,17 @@
 const checkoutList = ref<string[]>([])
 // 文件上传input
 const fileRef = ref()
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -64,8 +74,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getSampleList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index 92e4b4a..6f465fc 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -67,7 +67,17 @@
     certificationStatusMap.value[`${item.value}`] = item.name
   })
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -75,8 +85,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getSampleList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IOvertimeList) => {
       return {
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index dbaa437..14464bf 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -86,6 +86,17 @@
     width: 160,
   },
 ]) // 表格
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 const fetchData = (isNowPage = false) => {
   loadingTable.value = true
@@ -93,8 +104,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.processResult = active.value
   getApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 60d1454..d0236cc 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -105,7 +105,17 @@
     align: 'center',
   },
 ])
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 const fetchData = (isNowPage = false) => {
   loadingTable.value = true
@@ -113,8 +123,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.approvalStatus = active.value
   getApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index aeb568e..5430b0f 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -103,10 +103,21 @@
 // 装载时间数组
 const checkTime = ref<string>('')
 const loadingTable = ref(false)
+// 时间变更
+watch(checkTime, (val) => {
+  if (val) {
+    listQuery.value.checkStartDate = `${val[0]}`
+    listQuery.value.checkEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.checkStartDate = ''
+    listQuery.value.checkEndDate = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.checkStartDate = checkTime.value[0] || ''
-  listQuery.value.checkEndDate = checkTime.value[1] || ''
+  // listQuery.value.checkStartDate = checkTime.value[0] || ''
+  // listQuery.value.checkEndDate = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 6229abf..9d30934 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -112,10 +112,21 @@
 // 装载时间数组
 const checkTime = ref('')
 const loadingTable = ref(false)
+// 时间变更
+watch(checkTime, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.startTime = checkTime.value[0] || ''
-  listQuery.value.endTime = checkTime.value[1] || ''
+  // listQuery.value.startTime = checkTime.value[0] || ''
+  // listQuery.value.endTime = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index daca294..de18467 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -66,6 +66,17 @@
 const checkoutList = ref<IManageChecklist[]>([])
 // 文件上传input
 const fileRef = ref()
+// 时间变更
+watch(checkDate, (val) => {
+  if (val) {
+    listQuery.value.checkStartDate = `${val[0]}`
+    listQuery.value.checkEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.checkStartDate = ''
+    listQuery.value.checkEndDate = ''
+  }
+})
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
@@ -73,8 +84,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.checkStartDate = checkDate.value[0] || ''
-  listQuery.value.checkEndDate = checkDate.value[1] || ''
+  // listQuery.value.checkStartDate = checkDate.value[0] || ''
+  // listQuery.value.checkEndDate = checkDate.value[1] || ''
   getcheckInfoList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: any) => {
       return {
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 00d283c..50b014c 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -99,6 +99,17 @@
     approvalStatusReserveMap.value[item.name] = `${item.value}`
   })
 }
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -106,8 +117,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.approvalStatus = active.value
   getReceiveApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/receive/solve/solveList.vue b/src/views/device/receive/solve/solveList.vue
index 809c0c1..ec1e8bb 100644
--- a/src/views/device/receive/solve/solveList.vue
+++ b/src/views/device/receive/solve/solveList.vue
@@ -120,7 +120,17 @@
   timeRange.value = ['', ''] // 把时间选择框置空
   fetchData(true)
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -128,8 +138,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getReceiveApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IsolveListType) => {
       return {
diff --git a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
index 4744536..b4fe085 100644
--- a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
@@ -43,7 +43,12 @@
   select.value = -1
   listPageApi(listQuery.value).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows
+      list.value = res.data.rows.map((item: { effectiveStatusName: string }) => {
+        return {
+          ...item,
+          isDisabled: item.effectiveStatusName === '已废止',
+        }
+      })
       total.value = res.data.total
     }
   })
@@ -142,7 +147,7 @@
           </el-table-column>
           <el-table-column label="" width="55" align="center" fixed="left">
             <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
+              <el-radio v-model="select" :disabled="scope.row.isDisabled" :label="scope.$index" class="radio" />
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index a030dcf..0dd5547 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -94,12 +94,34 @@
 const preparation = ref<string>('')
 // 到期开始以及结束
 const validTime = ref<string>('')
+// 筹建日期变更
+watch(preparation, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
+// 有效日期变更
+watch(validTime, (val) => {
+  if (val) {
+    listQuery.value.validStartTime = `${val[0]}`
+    listQuery.value.validEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.validStartTime = ''
+    listQuery.value.validEndTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.preparationStartDate = preparation.value[0] || ''
-  listQuery.value.preparationEndDate = preparation.value[1] || ''
-  listQuery.value.validStartTime = validTime.value[0] || ''
-  listQuery.value.validEndTime = validTime.value[1] || ''
+  // listQuery.value.preparationStartDate = preparation.value[0] || ''
+  // listQuery.value.preparationEndDate = preparation.value[1] || ''
+  // listQuery.value.validStartTime = validTime.value[0] || ''
+  // listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index 39d8683..bb69fe9 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -99,6 +99,17 @@
 const standardManagerStateList = ref<IOptions[]>([])
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
+// 时间变更
+watch(preparationDate, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
@@ -107,8 +118,8 @@
     listQuery.value.offset = 1
   }
   // 筹建日期
-  listQuery.value.preparationStartDate = preparationDate.value[0] || ''
-  listQuery.value.preparationEndDate = preparationDate.value[1] || ''
+  // listQuery.value.preparationStartDate = preparationDate.value[0] || ''
+  // listQuery.value.preparationEndDate = preparationDate.value[1] || ''
   getStandardList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: any) => {
       return {
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 37205fc..edf9dd7 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -793,7 +793,7 @@
             保存
           </el-button>
           <!-- 待审批 -->
-          <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'agree' })">
+          <!-- <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'agree' })">
             同意
           </el-button>
           <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'reject' })">
@@ -801,7 +801,7 @@
           </el-button>
           <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'refuse' })">
             拒绝
-          </el-button>
+          </el-button> -->
           <!-- </template> -->
         </template>
         <el-button v-if="(title === '详情' && $route.query?.approvalStatusName === '草稿箱' && isCancel)" type="primary" @click="editForm">
diff --git a/src/views/finance/businessSettlement/list.vue b/src/views/finance/businessSettlement/list.vue
index e942abb..9543947 100644
--- a/src/views/finance/businessSettlement/list.vue
+++ b/src/views/finance/businessSettlement/list.vue
@@ -43,6 +43,7 @@
 const list = ref<IList[]>([]) // 表格数据
 // 选中的内容
 const checkoutList = ref<string[]>([])
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
diff --git a/src/views/finance/contract/list.vue b/src/views/finance/contract/list.vue
index 7dcdca5..5f8eb4e 100644
--- a/src/views/finance/contract/list.vue
+++ b/src/views/finance/contract/list.vue
@@ -59,6 +59,17 @@
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 选中的内容
 const checkoutList = ref<string[]>([])
+// 时间变更
+watch(dateRange, (val) => {
+  if (val) {
+    listQuery.value.estimateSignStartDate = `${val[0]}`
+    listQuery.value.estimateSignEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.estimateSignStartDate = ''
+    listQuery.value.estimateSignEndDate = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -66,8 +77,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.estimateSignStartDate = dateRange.value[0] as string || ''
-  listQuery.value.estimateSignEndDate = dateRange.value[1] as string || ''
+  // listQuery.value.estimateSignStartDate = dateRange.value[0] as string || ''
+  // listQuery.value.estimateSignEndDate = dateRange.value[1] as string || ''
   getContractList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: { estimateSignDate: string; agreementAmount: number }) => {
       return {
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 1bce5f9..07b2296 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,7 +1,7 @@
-<!-- 新增或详情弹窗 -->
+<!-- 新增或详情 -->
 <script lang="ts" setup name="addNotice">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
@@ -15,6 +15,7 @@
 import { SCHEDULE } from '@/utils/scheduleDict'
 const $route = useRoute()
 const $router = useRouter()
+const submitId = ref('') // 提交id-保存接口获取
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
 const fileTypeName = ref('')
@@ -40,12 +41,12 @@
   formId: SCHEDULE.FILE_APPROVAL,
 }) // 表单
 const rules = ref<FormRules>({
-  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
-  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
-  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
-  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
-  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+  fileName: [{ required: true, message: '名称必填', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建必填', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位必填', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间必填', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人必填', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号必填', trigger: 'blur' }],
 }) // 表单验证规则
 
 const userList = ref<userType[]>([]) // 可使用人列表
@@ -57,12 +58,14 @@
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
-const PubList = ref<deptType[]>([])
+const PubList = ref([]) as any// 发布单位列表
 const PubListTree = ref([])
 // 获取发布单位列表
 const getPubList = () => {
   getDeptTreeList().then((res) => {
     PubList.value = res.data
+    console.log('0000', 'ppp', PubList.value)
+
     PubListTree.value = toTreeList(res.data, '0', true)
   })
 }
@@ -113,43 +116,57 @@
   effectiveStatusName.value = ''
 }
 // 提交
-const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+const saveForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
-    `确认${flag}吗？`,
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then((res) => {
+        const publisherId = ruleForm.publisher
+        const index = PubList.value.findIndex((item: { id: string }) => item.id === publisherId)
+        if (index !== -1) {
+          ruleForm.publisher = PubList.value[index].name as string
+        }
+        // 保存（草稿箱）
+        confirmDrafts(ruleForm).then((res) => {
+          ruleForm.fileNo = res.data.fileNo
+          submitId.value = res.data.id
+          ElMessage.success('保存成功')
+          // formEl?.resetFields()
+          // $router.go(-1)
+          close()
+        })
+      })
+    }
+  })
+}
+const submitForm = () => {
+  if (!submitId.value) {
+    ElMessage.warning('请先保存')
+    return false
+  }
+  ElMessageBox.confirm(
+    '确认提交吗？',
     '提示',
     {
       confirmButtonText: '确认',
       cancelButtonText: '取消',
       type: 'warning',
     },
-      ).then((res) => {
-        if (flag === '提交') {
-          confirmDrafts(ruleForm).then((res) => {
-            if (res.code === 200) {
-              console.log(res.data, '保存成功')
-              submitFile({ id: res.data.id, formId: SCHEDULE.FILE_APPROVAL }).then((res) => {
-                formEl?.resetFields()
-                ElMessage.success('提交成功')
-                $router.go(-1)
-                close()
-              })
-            }
-          })
-        }
-        else {
-          // 保存（草稿箱）
-          confirmDrafts(ruleForm).then((res) => {
-            ElMessage.success('保存成功')
-            formEl?.resetFields()
-            $router.go(-1)
-            close()
-          })
-        }
-      })
-    }
+  ).then((res) => {
+    submitFile({ id: submitId.value, formId: SCHEDULE.FILE_APPROVAL }).then((res) => {
+    // formEl?.resetFields()
+      ElMessage.success('已提交')
+      $router.go(-1)
+      close()
+    })
   })
 }
 // 取消
@@ -163,9 +180,14 @@
 const onFileChange = (event: any) => {
   // 原生上传
   // console.log(event.target.files)
+
   if (event.target.files?.length !== 0) {
     // 创建formdata对象
     const fd = new FormData()
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
@@ -173,9 +195,11 @@
         // 重置当前验证
         ruleFormRef.value?.clearValidate('minioFileName')
         ElMessage.success('文件上传成功')
+        loading.close()
       }
       else {
         ElMessage.error(res.message)
+        loading.close()
       }
     })
   }
@@ -215,10 +239,10 @@
   <app-container style="overflow: hidden;">
     <detail-page :title="`${fileTypeName}-${title}`">
       <template #btns>
-        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm()">
           提交
         </el-button>
-        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
+        <el-button v-if="title !== '详情'" type="primary" @click="saveForm(ruleFormRef)">
           保存
         </el-button>
         <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -258,7 +282,7 @@
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
                 style="width: 100%;"
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 135d059..c2b46c0 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -1,6 +1,7 @@
 <!-- 文件审批公共模板 -->
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { DateModelType } from 'element-plus'
 import type { TableRow } from './approve-interface'
 import type { fileResType } from '@/views/measure/file/file-interface'
 import { printJSON } from '@/utils/printUtils'
@@ -32,12 +33,13 @@
 const approvalStatusReserveMap = ref({ ...props.approvalStatusReserveMap }) // 审批状态字典{草稿箱: 1}
 const activeTitle = ref('') // active对应的审批状态名字
 
-const searchQuery = reactive({
+const searchQuery = ref({
   fileNo: '', // 编号
   fileName: '', // 名称
   fileCode: '', // 文件号
   createUser: '', // 创建人
-  createTime: '', // 创建
+  createStartTime: '', // 创建开始时间
+  createEndTime: '', // 创建结束时间
   approvalStatus: approvalStatus.value, // 审批状态
   limit: 20,
   offset: 1,
@@ -49,18 +51,31 @@
 const total = ref<number>(0) // 数据总条数
 const columns = ref<TableColumn[]>([
   { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
+  { text: '编号', value: 'fileNo', align: 'center', width: '160' },
   { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
+  { text: '类别', value: 'fileTypeName', align: 'center' },
   { text: '创建人', value: 'createUser', align: 'center' },
-  { text: '创建时间', value: 'createTime', align: 'center' },
-  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110' },
 ]) // 表格
 const list = ref<TableRow[]>([]) // 表格数据
+// 筛选时间段数据
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    searchQuery.value.createStartTime = `${val[0]}`
+    searchQuery.value.createEndTime = `${val[1]}`
+  }
+  else {
+    searchQuery.value.createStartTime = ''
+    searchQuery.value.createEndTime = ''
+  }
+})
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
-  approvallistPageApi(searchQuery).then((res) => {
+  approvallistPageApi(searchQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows.map((item: TableRow) => {
         return {
@@ -85,10 +100,10 @@
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
-    searchQuery.limit = val.size
+    searchQuery.value.limit = val.size
   }
   if (val && val.page) {
-    searchQuery.offset = val.page
+    searchQuery.value.offset = val.page
   }
   getList()
 }
@@ -216,12 +231,21 @@
 }
 // 重置
 const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.fileType = ''
-  searchQuery.createTime = ''
-  searchQuery.createUser = ''
+  searchQuery.value = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    fileCode: '', // 文件号
+    createUser: '', // 创建人
+    createStartTime: '', // 创建开始时间
+    createEndTime: '', // 创建结束时间
+    approvalStatus: approvalStatus.value, // 审批状态
+    limit: 20,
+    offset: 1,
+    fileType: '', // 文件类别
+    formId: SCHEDULE.FILE_APPROVAL,
+    ids: [] as string[],
+  }
+  timeRange.value = ['', '']
   getList()
 }
 // 表格被选中的行
@@ -230,27 +254,6 @@
 const multiSelect = (row: TableRow[]) => {
   selectList.value = row
 }
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  searchQuery.ids = []
-  if (selectList.value.length) {
-    selectList.value.forEach((item) => {
-      searchQuery.ids?.push(item.id as string)
-    })
-  }
-  exportFileApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
-    exportFile(res.data, props.name)
-    loading.close()
-    searchQuery.ids = []
-  }).catch((_) => {
-    loading.close()
-  })
-}
 // 打印
 function printList() {
   const selectIds = selectList.value.map(item => item.id)
@@ -278,8 +281,8 @@
   sessionStorage.setItem('approveFileMenu', props.name)
   approvalStatus.value = approvalStatusReserveMap.value[props.name]
   // approvalStatus.value = approvalStatusReserveMap.value[props.name] // 失效
-  searchQuery.approvalStatus = approvalStatusReserveMap.value[props.name] || '0'
-  $router.currentRoute.value.query.cacheActive = searchQuery.approvalStatus
+  searchQuery.value.approvalStatus = approvalStatusReserveMap.value[props.name] || '0'
+  $router.currentRoute.value.query.cacheActive = searchQuery.value.approvalStatus
   getList()
   // 缓存名称
 }, { deep: true, immediate: true })
@@ -312,8 +315,14 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss" placeholder="创建时间"
+            v-model="timeRange"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="创建开始时间"
+            end-placeholder="创建结束时间"
+            clearable
+            style="width: 360px;"
           />
         </search-item>
         <search-item>
@@ -323,10 +332,6 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <icon-button
-            v-if="proxy.hasPerm('/file/approve/export')" icon="icon-export" title="导出"
-            @click="exportExcelBtn"
-          />
           <icon-button v-if="proxy.hasPerm('/file/approve/print')" icon="icon-print" title="打印" @click="printList" />
         </template>
         <!-- 表格区域 -->
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 9dd3633..de9e080 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -85,7 +85,7 @@
 const getStatus = () => {
   getDictByCode('effectiveStatus').then((res) => {
     if (res.code === 200) {
-      effectiveStatusSelect.value = [...res.data, { name: '全部', value: '', id: 'quanbu' }]
+      effectiveStatusSelect.value = res.data
     }
   })
 }
@@ -373,8 +373,8 @@
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/add`)" icon="icon-add" title="新建" @click="add" />
-          <icon-button v-if="proxy.hasPerm(`/file/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
-          <icon-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <!-- <icon-button v-if="proxy.hasPerm(`/file/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" /> -->
+          <!-- <icon-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" /> -->
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/print`)" icon="icon-print" title="打印" @click="printList" />
         </template>
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 3510056..ed3ab8c 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -282,8 +282,8 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/measure/price/import')" icon="icon-import" title="批量导入" type="primary" />
-        <icon-button v-if="proxy.hasPerm('/measure/price/mould')" icon="icon-template" title="模板下载" type="primary" />
+        <!-- <icon-button v-if="proxy.hasPerm('/measure/price/import')" icon="icon-import" title="批量导入" type="primary" /> -->
+        <!-- <icon-button v-if="proxy.hasPerm('/measure/price/mould')" icon="icon-template" title="模板下载" type="primary" /> -->
         <icon-button v-if="proxy.hasPerm('/measure/price/add')" icon="icon-add" title="新建" type="primary" @click="add" />
         <icon-button v-if="proxy.hasPerm('/measure/price/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/measure/price/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 60eeebb..7b6f4ec 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -61,7 +61,8 @@
   categoryName: [{ required: true, message: '类别不能为空', trigger: ['blur', 'change'] }],
   itemName: [{ required: true, message: '项目不能为空', trigger: ['blur', 'change'] }],
   priceStandardName: [{ required: true, message: '依据标准不能为空', trigger: ['blur', 'change'] }],
-  price: [{ required: true, message: '标准价格不能为空', trigger: ['blur', 'change'] }],
+  price: [{ required: true, message: '标准价格不能为空', trigger: ['blur', 'change'] },
+    { pattern: /^(?!0+(?:\.0+)?$)(?:[1-9]\d*|0)(?:\.\d{1,2})?$/, message: '要求不小于0，且最多保留两位小数', trigger: ['blur', 'change'] }],
   operatorDiscountPermission: [{ required: true, message: '业务员折扣权限不能为空', trigger: ['blur', 'change'] }],
   directorDiscountPermission: [{ required: true, message: '负责人折扣权限不能为空', trigger: ['blur', 'change'] }],
 })
@@ -255,7 +256,7 @@
                   v-model.trim="formInline.priceStandardName"
                   clearable
                   :placeholder="pageType === 'detail' ? '' : '依据标准'"
-                  :disabled="pageType === 'detail'"
+                  disabled
                 >
                   <template v-if="pageType !== 'detail'" #append>
                     <el-button
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 5e62137..22d1d8a 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -24,16 +24,16 @@
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    // { name: '删除', type: 'danger' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    // { name: '删除', type: 'danger' },
     { name: '取消', type: 'info' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    // { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
+    { name: '删除', type: 'danger' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
@@ -41,9 +41,10 @@
   ],
   已取消: [
     { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
     { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
-
 }
 // 当前tab
 const currentTab = ref('全部')

diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..9cf2b29 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -28,6 +28,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    DeptSelectByName: typeof import('./components/DeptSelectByName/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
diff --git a/src/views/business/board/standardReminder/list.vue b/src/views/business/board/standardReminder/list.vue
index 85efbb1..fd60743 100644
--- a/src/views/business/board/standardReminder/list.vue
+++ b/src/views/business/board/standardReminder/list.vue
@@ -94,12 +94,33 @@
 const preparation = ref<string>('')
 // 到期开始以及结束
 const validTime = ref<string>('')
+watch(preparation, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
+// 有效日期变更
+watch(validTime, (val) => {
+  if (val) {
+    listQuery.value.validStartTime = `${val[0]}`
+    listQuery.value.validEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.validStartTime = ''
+    listQuery.value.validEndTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.preparationStartDate = preparation.value[0] || ''
-  listQuery.value.preparationEndDate = preparation.value[1] || ''
-  listQuery.value.validStartTime = validTime.value[0] || ''
-  listQuery.value.validEndTime = validTime.value[1] || ''
+  // listQuery.value.preparationStartDate = preparation.value[0] || ''
+  // listQuery.value.preparationEndDate = preparation.value[1] || ''
+  // listQuery.value.validStartTime = validTime.value[0] || ''
+  // listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -223,16 +244,16 @@
   })
   if (list.value.length > 0) {
     const params = {
-      category: '', // 类别
-      id: '', // 主键id
-      managerState: '', // 管理状态
-      preparationEndDate: '', // 结束时间
-      preparationStartDate: '', // 开始时间
-      standardLaboratory: '', // 标准所在部门
-      standardName: '', // 标准名称
-      standardNo: '', // 标准编号
-      validEndTime: '', // 结束时间
-      validStartTime: '', // 开始时间
+      category: listQuery.value.category, // 类别
+      id: listQuery.value.id, // 主键id
+      managerState: listQuery.value.managerState, // 管理状态
+      preparationEndDate: listQuery.value.preparationEndDate, // 结束时间
+      preparationStartDate: listQuery.value.preparationStartDate, // 开始时间
+      standardLaboratory: listQuery.value.standardLaboratory, // 标准所在部门
+      standardName: listQuery.value.standardName, // 标准名称
+      standardNo: listQuery.value.standardNo, // 标准编号
+      validEndTime: listQuery.value.validEndTime, // 结束时间
+      validStartTime: listQuery.value.validStartTime, // 开始时间
       offset: 1, // 当前页
       limit: 20, // 每页多少条
       ids: checkoutList.value,
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 8666957..37ac73f 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -137,7 +137,7 @@
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  distributeDialogRef.value.initDialog(row.id, row.sampleId, row.orderId)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId, row.sampleStatus)
 }
 // 点击标签绑定
 const barCodeBind = ref()
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 807ea30..4e4eb46 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -37,11 +37,21 @@
   { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
   { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
 ])
-
+// 时间变更
+watch(trainTime, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 查询列表
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.startTime = trainTime.value[0] || ''
-  listQuery.value.endTime = trainTime.value[1] || ''
+  // listQuery.value.startTime = trainTime.value[0] || ''
+  // listQuery.value.endTime = trainTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2f7c1d0..bccde84 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -139,7 +139,17 @@
     id: '2', // 后端规定已收入传2
   })
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -147,8 +157,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.sampleStatus = active.value
   getInterChangeList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IinterchangeList) => {
@@ -280,7 +290,7 @@
       else if (type === 'delete') { // 无需检测
         interchangeStatusChange({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '7' }).then((res) => {
           if (res.code === 200) {
-            ElMessage.success(`已${title}`)
+            ElMessage.success('操作成功')
             fetchData(true)
           }
         })
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList.vue b/src/views/business/schedule/interchangeReceipt/receiptList.vue
index 275a053..83d93f4 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptList.vue
@@ -42,7 +42,17 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -50,8 +60,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getReceiptList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -124,13 +134,13 @@
   })
   if (list.value.length > 0) {
     const params = {
-      interchangeCode: '', // 交接单编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      reciever: '', // 接收人
-      deliverer: '', // 送样人
-      startTime: '', // 交接开始时间
-      endTime: '', // 交接结束时间
+      interchangeCode: listQuery.value.interchangeCode, // 交接单编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      reciever: listQuery.value.reciever, // 接收人
+      deliverer: listQuery.value.deliverer, // 送样人
+      startTime: listQuery.value.startTime, // 交接开始时间
+      endTime: listQuery.value.endTime, // 交接结束时间
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index cf0b532..f2fc852 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -26,8 +26,8 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   deliverer: '', // 送样人
-  isUrgent: 2, // 是否加急 2全部 1是 0否
-  status: 0, // 接收状态
+  isUrgent: '', // 是否加急 2全部 1是 0否
+  status: '', // 接收状态
   offset: 1,
   limit: 20,
 })
@@ -70,11 +70,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    isUrgentMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 2, // 是否加急全部后端定为2
-    })
+    // isUrgentMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 2, // 是否加急全部后端定为2
+    // })
   })
   // 接收状态
   getDictByCode('orderStatus').then((response) => {
@@ -85,11 +85,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    statusMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 0,
-    })
+    // statusMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 0,
+    // })
     console.log(statusMap.value)
   })
 }
@@ -125,8 +125,8 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     deliverer: '', // 送样人
-    isUrgent: 2, // 是否加急
-    status: 0, // 接收状态
+    isUrgent: '', // 是否加急 2全部 1是 0否
+    status: '', // 接收状态
     offset: 1,
     limit: 20,
   }
@@ -191,12 +191,12 @@
   })
   if (list.value.length > 0) {
     const params = {
-      orderCode: '', // 委托书编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      deliverer: '', // 送样人
-      isUrgent: 2, // 是否加急
-      status: 0, // 接收状态
+      orderCode: listQuery.value.orderCode, // 委托书编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      deliverer: listQuery.value.deliverer, // 送样人
+      isUrgent: listQuery.value.isUrgent, // 是否加急
+      status: listQuery.value.status, // 接收状态
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 2d92da9..14cd1ce 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -6,7 +6,7 @@
   customerName: string // 委托方名称
   deliverer: string // 送样人
   isUrgent: number | string // 是否加急
-  status: number // 接收状态
+  status: number | string// 接收状态
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 50308c7..25c5cf9 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -53,6 +53,7 @@
   handOutProperty: string // 分发性质-初次分发、退回分发
   id?: string // 实验室id
   customerId?: string // 客户id
+  certificationState?: string // 证书出具
 }
 
 // 实验室检测/我的检测列表
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index 7c17365..7159350 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -1,6 +1,6 @@
 <!-- 任务分发 -->
 <script lang="ts" setup name="TaskEdit">
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
 import ProcessConfig from './components/processConfig.vue'
@@ -11,6 +11,7 @@
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { UploadFile } from '@/api/measure/file'
 import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 interface dictType {
   id: string
@@ -251,16 +252,22 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    // UploadFile(fd).then((res) => {
-    //   if (res.code === 200) {
-    //     sampleForm.value.minioFileName = res.data[0]
-    //     // 重置当前验证
-    //     ElMessage.success('文件上传成功')
-    //   }
-    //   else {
-    //     ElMessage.error(res.message)
-    //   }
-    // })
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        sampleForm.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+        loading.close()
+      }
+      else {
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    })
   }
 }
 const upload = () => {
@@ -402,7 +409,7 @@
               <el-form-item label="校检类别:">
                 <el-select
                   v-model="sampleForm.measureCategory"
-                  :placeholder="roleType === 'detail' ? '' : '请选择校检类别'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择校检类别'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -424,7 +431,7 @@
               <el-form-item label="厂家国别:">
                 <el-select
                   v-model="sampleForm.manufacturerCountry"
-                  :placeholder="roleType === 'detail' ? '' : '请选择厂家国别'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择厂家国别'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -450,7 +457,7 @@
               <el-form-item label="ABC:">
                 <el-select
                   v-model="sampleForm.abc"
-                  :placeholder="roleType === 'detail' ? '' : '请选择ABC'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择ABC'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -504,8 +511,8 @@
               <el-form-item label="备注:">
                 <el-input
                   v-model="sampleForm.remark"
+                  autosize
                   type="textarea"
-                  :rows="2"
                   :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
                   :class="{ 'detail-input': roleType === 'detail' }"
@@ -516,7 +523,7 @@
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="sampleForm.measureType"
-                  :placeholder="roleType === 'detail' ? '' : '请选择检定方式'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择检定方式'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index dfbbf6a..6eeff55 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -81,7 +81,7 @@
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '165px' },
   { text: '样品属性', value: 'sampleBelongName', width: '100', align: 'center' },
   { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '90' },
-  { text: '证书出具', value: 'certificationState', align: 'center', width: '90', filter: (row: ITaskList) => { return `${row.alreadyCertifications}/${row.requireCertifications}` } },
+  { text: '证书出具', value: 'certificationState', align: 'center', width: '90' },
 ])
 // 表格数据
 const list = ref<ITaskList[]>([])
@@ -104,6 +104,7 @@
   getTaskList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: ITaskList) => {
       item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      item.certificationState = `${item.alreadyCertifications}/${item.requireCertifications}`
       return item
     })
     total.value = response.data.total
diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue
index e44dd67..194de53 100644
--- a/src/views/business/subpackage/apply/list.vue
+++ b/src/views/business/subpackage/apply/list.vue
@@ -302,7 +302,7 @@
         <search-item>
           <el-date-picker
             v-model="timeRange" type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="申请开始时间" end-placeholder="申请结束时间"
+            value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="申请开始时间" end-placeholder="申请结束时间" clearable
           />
         </search-item>
       </search-area>
diff --git a/src/views/business/subpackage/check/list.vue b/src/views/business/subpackage/check/list.vue
index 51ea419..a8b6744 100644
--- a/src/views/business/subpackage/check/list.vue
+++ b/src/views/business/subpackage/check/list.vue
@@ -111,8 +111,6 @@
 
 // 时间变更
 watch(timeRange, (val) => {
-  console.log(val[0])
-
   if (val) {
     listQuery.value.checkStartTime = `${val[0]}`
     listQuery.value.checkEndTime = `${val[1]}`
@@ -345,7 +343,8 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="timeRange" type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
+            v-model="timeRange"
+            clearable type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="验收开始时间" end-placeholder="验收结束时间"
           />
         </search-item>
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 98f4a39..a0db900 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -68,6 +68,7 @@
   else {
     listQuery.value.startTime = ''
     listQuery.value.endTime = ''
+    timeRange.value = ['', '']
   }
 })
 // 多选发生改变时
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index 6e41a94..ac98b8a 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -56,7 +56,17 @@
 const checkoutList = ref<string[]>([])
 // 文件上传input
 const fileRef = ref()
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -64,8 +74,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getSampleList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index 92e4b4a..6f465fc 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -67,7 +67,17 @@
     certificationStatusMap.value[`${item.value}`] = item.name
   })
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -75,8 +85,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getSampleList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IOvertimeList) => {
       return {
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index dbaa437..14464bf 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -86,6 +86,17 @@
     width: 160,
   },
 ]) // 表格
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 const fetchData = (isNowPage = false) => {
   loadingTable.value = true
@@ -93,8 +104,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.processResult = active.value
   getApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 60d1454..d0236cc 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -105,7 +105,17 @@
     align: 'center',
   },
 ])
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 const fetchData = (isNowPage = false) => {
   loadingTable.value = true
@@ -113,8 +123,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.approvalStatus = active.value
   getApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index aeb568e..5430b0f 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -103,10 +103,21 @@
 // 装载时间数组
 const checkTime = ref<string>('')
 const loadingTable = ref(false)
+// 时间变更
+watch(checkTime, (val) => {
+  if (val) {
+    listQuery.value.checkStartDate = `${val[0]}`
+    listQuery.value.checkEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.checkStartDate = ''
+    listQuery.value.checkEndDate = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.checkStartDate = checkTime.value[0] || ''
-  listQuery.value.checkEndDate = checkTime.value[1] || ''
+  // listQuery.value.checkStartDate = checkTime.value[0] || ''
+  // listQuery.value.checkEndDate = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 6229abf..9d30934 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -112,10 +112,21 @@
 // 装载时间数组
 const checkTime = ref('')
 const loadingTable = ref(false)
+// 时间变更
+watch(checkTime, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.startTime = checkTime.value[0] || ''
-  listQuery.value.endTime = checkTime.value[1] || ''
+  // listQuery.value.startTime = checkTime.value[0] || ''
+  // listQuery.value.endTime = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index daca294..de18467 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -66,6 +66,17 @@
 const checkoutList = ref<IManageChecklist[]>([])
 // 文件上传input
 const fileRef = ref()
+// 时间变更
+watch(checkDate, (val) => {
+  if (val) {
+    listQuery.value.checkStartDate = `${val[0]}`
+    listQuery.value.checkEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.checkStartDate = ''
+    listQuery.value.checkEndDate = ''
+  }
+})
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
@@ -73,8 +84,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.checkStartDate = checkDate.value[0] || ''
-  listQuery.value.checkEndDate = checkDate.value[1] || ''
+  // listQuery.value.checkStartDate = checkDate.value[0] || ''
+  // listQuery.value.checkEndDate = checkDate.value[1] || ''
   getcheckInfoList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: any) => {
       return {
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 00d283c..50b014c 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -99,6 +99,17 @@
     approvalStatusReserveMap.value[item.name] = `${item.value}`
   })
 }
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -106,8 +117,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.approvalStatus = active.value
   getReceiveApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/receive/solve/solveList.vue b/src/views/device/receive/solve/solveList.vue
index 809c0c1..ec1e8bb 100644
--- a/src/views/device/receive/solve/solveList.vue
+++ b/src/views/device/receive/solve/solveList.vue
@@ -120,7 +120,17 @@
   timeRange.value = ['', ''] // 把时间选择框置空
   fetchData(true)
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -128,8 +138,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getReceiveApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IsolveListType) => {
       return {
diff --git a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
index 4744536..b4fe085 100644
--- a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
@@ -43,7 +43,12 @@
   select.value = -1
   listPageApi(listQuery.value).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows
+      list.value = res.data.rows.map((item: { effectiveStatusName: string }) => {
+        return {
+          ...item,
+          isDisabled: item.effectiveStatusName === '已废止',
+        }
+      })
       total.value = res.data.total
     }
   })
@@ -142,7 +147,7 @@
           </el-table-column>
           <el-table-column label="" width="55" align="center" fixed="left">
             <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
+              <el-radio v-model="select" :disabled="scope.row.isDisabled" :label="scope.$index" class="radio" />
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index a030dcf..0dd5547 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -94,12 +94,34 @@
 const preparation = ref<string>('')
 // 到期开始以及结束
 const validTime = ref<string>('')
+// 筹建日期变更
+watch(preparation, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
+// 有效日期变更
+watch(validTime, (val) => {
+  if (val) {
+    listQuery.value.validStartTime = `${val[0]}`
+    listQuery.value.validEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.validStartTime = ''
+    listQuery.value.validEndTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.preparationStartDate = preparation.value[0] || ''
-  listQuery.value.preparationEndDate = preparation.value[1] || ''
-  listQuery.value.validStartTime = validTime.value[0] || ''
-  listQuery.value.validEndTime = validTime.value[1] || ''
+  // listQuery.value.preparationStartDate = preparation.value[0] || ''
+  // listQuery.value.preparationEndDate = preparation.value[1] || ''
+  // listQuery.value.validStartTime = validTime.value[0] || ''
+  // listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index 39d8683..bb69fe9 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -99,6 +99,17 @@
 const standardManagerStateList = ref<IOptions[]>([])
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
+// 时间变更
+watch(preparationDate, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
@@ -107,8 +118,8 @@
     listQuery.value.offset = 1
   }
   // 筹建日期
-  listQuery.value.preparationStartDate = preparationDate.value[0] || ''
-  listQuery.value.preparationEndDate = preparationDate.value[1] || ''
+  // listQuery.value.preparationStartDate = preparationDate.value[0] || ''
+  // listQuery.value.preparationEndDate = preparationDate.value[1] || ''
   getStandardList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: any) => {
       return {
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 37205fc..edf9dd7 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -793,7 +793,7 @@
             保存
           </el-button>
           <!-- 待审批 -->
-          <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'agree' })">
+          <!-- <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'agree' })">
             同意
           </el-button>
           <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'reject' })">
@@ -801,7 +801,7 @@
           </el-button>
           <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'refuse' })">
             拒绝
-          </el-button>
+          </el-button> -->
           <!-- </template> -->
         </template>
         <el-button v-if="(title === '详情' && $route.query?.approvalStatusName === '草稿箱' && isCancel)" type="primary" @click="editForm">
diff --git a/src/views/finance/businessSettlement/list.vue b/src/views/finance/businessSettlement/list.vue
index e942abb..9543947 100644
--- a/src/views/finance/businessSettlement/list.vue
+++ b/src/views/finance/businessSettlement/list.vue
@@ -43,6 +43,7 @@
 const list = ref<IList[]>([]) // 表格数据
 // 选中的内容
 const checkoutList = ref<string[]>([])
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
diff --git a/src/views/finance/contract/list.vue b/src/views/finance/contract/list.vue
index 7dcdca5..5f8eb4e 100644
--- a/src/views/finance/contract/list.vue
+++ b/src/views/finance/contract/list.vue
@@ -59,6 +59,17 @@
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 选中的内容
 const checkoutList = ref<string[]>([])
+// 时间变更
+watch(dateRange, (val) => {
+  if (val) {
+    listQuery.value.estimateSignStartDate = `${val[0]}`
+    listQuery.value.estimateSignEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.estimateSignStartDate = ''
+    listQuery.value.estimateSignEndDate = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -66,8 +77,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.estimateSignStartDate = dateRange.value[0] as string || ''
-  listQuery.value.estimateSignEndDate = dateRange.value[1] as string || ''
+  // listQuery.value.estimateSignStartDate = dateRange.value[0] as string || ''
+  // listQuery.value.estimateSignEndDate = dateRange.value[1] as string || ''
   getContractList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: { estimateSignDate: string; agreementAmount: number }) => {
       return {
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 1bce5f9..07b2296 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,7 +1,7 @@
-<!-- 新增或详情弹窗 -->
+<!-- 新增或详情 -->
 <script lang="ts" setup name="addNotice">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
@@ -15,6 +15,7 @@
 import { SCHEDULE } from '@/utils/scheduleDict'
 const $route = useRoute()
 const $router = useRouter()
+const submitId = ref('') // 提交id-保存接口获取
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
 const fileTypeName = ref('')
@@ -40,12 +41,12 @@
   formId: SCHEDULE.FILE_APPROVAL,
 }) // 表单
 const rules = ref<FormRules>({
-  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
-  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
-  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
-  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
-  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+  fileName: [{ required: true, message: '名称必填', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建必填', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位必填', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间必填', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人必填', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号必填', trigger: 'blur' }],
 }) // 表单验证规则
 
 const userList = ref<userType[]>([]) // 可使用人列表
@@ -57,12 +58,14 @@
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
-const PubList = ref<deptType[]>([])
+const PubList = ref([]) as any// 发布单位列表
 const PubListTree = ref([])
 // 获取发布单位列表
 const getPubList = () => {
   getDeptTreeList().then((res) => {
     PubList.value = res.data
+    console.log('0000', 'ppp', PubList.value)
+
     PubListTree.value = toTreeList(res.data, '0', true)
   })
 }
@@ -113,43 +116,57 @@
   effectiveStatusName.value = ''
 }
 // 提交
-const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+const saveForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
-    `确认${flag}吗？`,
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then((res) => {
+        const publisherId = ruleForm.publisher
+        const index = PubList.value.findIndex((item: { id: string }) => item.id === publisherId)
+        if (index !== -1) {
+          ruleForm.publisher = PubList.value[index].name as string
+        }
+        // 保存（草稿箱）
+        confirmDrafts(ruleForm).then((res) => {
+          ruleForm.fileNo = res.data.fileNo
+          submitId.value = res.data.id
+          ElMessage.success('保存成功')
+          // formEl?.resetFields()
+          // $router.go(-1)
+          close()
+        })
+      })
+    }
+  })
+}
+const submitForm = () => {
+  if (!submitId.value) {
+    ElMessage.warning('请先保存')
+    return false
+  }
+  ElMessageBox.confirm(
+    '确认提交吗？',
     '提示',
     {
       confirmButtonText: '确认',
       cancelButtonText: '取消',
       type: 'warning',
     },
-      ).then((res) => {
-        if (flag === '提交') {
-          confirmDrafts(ruleForm).then((res) => {
-            if (res.code === 200) {
-              console.log(res.data, '保存成功')
-              submitFile({ id: res.data.id, formId: SCHEDULE.FILE_APPROVAL }).then((res) => {
-                formEl?.resetFields()
-                ElMessage.success('提交成功')
-                $router.go(-1)
-                close()
-              })
-            }
-          })
-        }
-        else {
-          // 保存（草稿箱）
-          confirmDrafts(ruleForm).then((res) => {
-            ElMessage.success('保存成功')
-            formEl?.resetFields()
-            $router.go(-1)
-            close()
-          })
-        }
-      })
-    }
+  ).then((res) => {
+    submitFile({ id: submitId.value, formId: SCHEDULE.FILE_APPROVAL }).then((res) => {
+    // formEl?.resetFields()
+      ElMessage.success('已提交')
+      $router.go(-1)
+      close()
+    })
   })
 }
 // 取消
@@ -163,9 +180,14 @@
 const onFileChange = (event: any) => {
   // 原生上传
   // console.log(event.target.files)
+
   if (event.target.files?.length !== 0) {
     // 创建formdata对象
     const fd = new FormData()
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
@@ -173,9 +195,11 @@
         // 重置当前验证
         ruleFormRef.value?.clearValidate('minioFileName')
         ElMessage.success('文件上传成功')
+        loading.close()
       }
       else {
         ElMessage.error(res.message)
+        loading.close()
       }
     })
   }
@@ -215,10 +239,10 @@
   <app-container style="overflow: hidden;">
     <detail-page :title="`${fileTypeName}-${title}`">
       <template #btns>
-        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm()">
           提交
         </el-button>
-        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
+        <el-button v-if="title !== '详情'" type="primary" @click="saveForm(ruleFormRef)">
           保存
         </el-button>
         <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -258,7 +282,7 @@
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
                 style="width: 100%;"
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 135d059..c2b46c0 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -1,6 +1,7 @@
 <!-- 文件审批公共模板 -->
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { DateModelType } from 'element-plus'
 import type { TableRow } from './approve-interface'
 import type { fileResType } from '@/views/measure/file/file-interface'
 import { printJSON } from '@/utils/printUtils'
@@ -32,12 +33,13 @@
 const approvalStatusReserveMap = ref({ ...props.approvalStatusReserveMap }) // 审批状态字典{草稿箱: 1}
 const activeTitle = ref('') // active对应的审批状态名字
 
-const searchQuery = reactive({
+const searchQuery = ref({
   fileNo: '', // 编号
   fileName: '', // 名称
   fileCode: '', // 文件号
   createUser: '', // 创建人
-  createTime: '', // 创建
+  createStartTime: '', // 创建开始时间
+  createEndTime: '', // 创建结束时间
   approvalStatus: approvalStatus.value, // 审批状态
   limit: 20,
   offset: 1,
@@ -49,18 +51,31 @@
 const total = ref<number>(0) // 数据总条数
 const columns = ref<TableColumn[]>([
   { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
+  { text: '编号', value: 'fileNo', align: 'center', width: '160' },
   { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
+  { text: '类别', value: 'fileTypeName', align: 'center' },
   { text: '创建人', value: 'createUser', align: 'center' },
-  { text: '创建时间', value: 'createTime', align: 'center' },
-  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110' },
 ]) // 表格
 const list = ref<TableRow[]>([]) // 表格数据
+// 筛选时间段数据
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    searchQuery.value.createStartTime = `${val[0]}`
+    searchQuery.value.createEndTime = `${val[1]}`
+  }
+  else {
+    searchQuery.value.createStartTime = ''
+    searchQuery.value.createEndTime = ''
+  }
+})
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
-  approvallistPageApi(searchQuery).then((res) => {
+  approvallistPageApi(searchQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows.map((item: TableRow) => {
         return {
@@ -85,10 +100,10 @@
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
-    searchQuery.limit = val.size
+    searchQuery.value.limit = val.size
   }
   if (val && val.page) {
-    searchQuery.offset = val.page
+    searchQuery.value.offset = val.page
   }
   getList()
 }
@@ -216,12 +231,21 @@
 }
 // 重置
 const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.fileType = ''
-  searchQuery.createTime = ''
-  searchQuery.createUser = ''
+  searchQuery.value = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    fileCode: '', // 文件号
+    createUser: '', // 创建人
+    createStartTime: '', // 创建开始时间
+    createEndTime: '', // 创建结束时间
+    approvalStatus: approvalStatus.value, // 审批状态
+    limit: 20,
+    offset: 1,
+    fileType: '', // 文件类别
+    formId: SCHEDULE.FILE_APPROVAL,
+    ids: [] as string[],
+  }
+  timeRange.value = ['', '']
   getList()
 }
 // 表格被选中的行
@@ -230,27 +254,6 @@
 const multiSelect = (row: TableRow[]) => {
   selectList.value = row
 }
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  searchQuery.ids = []
-  if (selectList.value.length) {
-    selectList.value.forEach((item) => {
-      searchQuery.ids?.push(item.id as string)
-    })
-  }
-  exportFileApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
-    exportFile(res.data, props.name)
-    loading.close()
-    searchQuery.ids = []
-  }).catch((_) => {
-    loading.close()
-  })
-}
 // 打印
 function printList() {
   const selectIds = selectList.value.map(item => item.id)
@@ -278,8 +281,8 @@
   sessionStorage.setItem('approveFileMenu', props.name)
   approvalStatus.value = approvalStatusReserveMap.value[props.name]
   // approvalStatus.value = approvalStatusReserveMap.value[props.name] // 失效
-  searchQuery.approvalStatus = approvalStatusReserveMap.value[props.name] || '0'
-  $router.currentRoute.value.query.cacheActive = searchQuery.approvalStatus
+  searchQuery.value.approvalStatus = approvalStatusReserveMap.value[props.name] || '0'
+  $router.currentRoute.value.query.cacheActive = searchQuery.value.approvalStatus
   getList()
   // 缓存名称
 }, { deep: true, immediate: true })
@@ -312,8 +315,14 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss" placeholder="创建时间"
+            v-model="timeRange"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="创建开始时间"
+            end-placeholder="创建结束时间"
+            clearable
+            style="width: 360px;"
           />
         </search-item>
         <search-item>
@@ -323,10 +332,6 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <icon-button
-            v-if="proxy.hasPerm('/file/approve/export')" icon="icon-export" title="导出"
-            @click="exportExcelBtn"
-          />
           <icon-button v-if="proxy.hasPerm('/file/approve/print')" icon="icon-print" title="打印" @click="printList" />
         </template>
         <!-- 表格区域 -->
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 9dd3633..de9e080 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -85,7 +85,7 @@
 const getStatus = () => {
   getDictByCode('effectiveStatus').then((res) => {
     if (res.code === 200) {
-      effectiveStatusSelect.value = [...res.data, { name: '全部', value: '', id: 'quanbu' }]
+      effectiveStatusSelect.value = res.data
     }
   })
 }
@@ -373,8 +373,8 @@
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/add`)" icon="icon-add" title="新建" @click="add" />
-          <icon-button v-if="proxy.hasPerm(`/file/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
-          <icon-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <!-- <icon-button v-if="proxy.hasPerm(`/file/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" /> -->
+          <!-- <icon-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" /> -->
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/print`)" icon="icon-print" title="打印" @click="printList" />
         </template>
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 3510056..ed3ab8c 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -282,8 +282,8 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/measure/price/import')" icon="icon-import" title="批量导入" type="primary" />
-        <icon-button v-if="proxy.hasPerm('/measure/price/mould')" icon="icon-template" title="模板下载" type="primary" />
+        <!-- <icon-button v-if="proxy.hasPerm('/measure/price/import')" icon="icon-import" title="批量导入" type="primary" /> -->
+        <!-- <icon-button v-if="proxy.hasPerm('/measure/price/mould')" icon="icon-template" title="模板下载" type="primary" /> -->
         <icon-button v-if="proxy.hasPerm('/measure/price/add')" icon="icon-add" title="新建" type="primary" @click="add" />
         <icon-button v-if="proxy.hasPerm('/measure/price/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/measure/price/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 60eeebb..7b6f4ec 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -61,7 +61,8 @@
   categoryName: [{ required: true, message: '类别不能为空', trigger: ['blur', 'change'] }],
   itemName: [{ required: true, message: '项目不能为空', trigger: ['blur', 'change'] }],
   priceStandardName: [{ required: true, message: '依据标准不能为空', trigger: ['blur', 'change'] }],
-  price: [{ required: true, message: '标准价格不能为空', trigger: ['blur', 'change'] }],
+  price: [{ required: true, message: '标准价格不能为空', trigger: ['blur', 'change'] },
+    { pattern: /^(?!0+(?:\.0+)?$)(?:[1-9]\d*|0)(?:\.\d{1,2})?$/, message: '要求不小于0，且最多保留两位小数', trigger: ['blur', 'change'] }],
   operatorDiscountPermission: [{ required: true, message: '业务员折扣权限不能为空', trigger: ['blur', 'change'] }],
   directorDiscountPermission: [{ required: true, message: '负责人折扣权限不能为空', trigger: ['blur', 'change'] }],
 })
@@ -255,7 +256,7 @@
                   v-model.trim="formInline.priceStandardName"
                   clearable
                   :placeholder="pageType === 'detail' ? '' : '依据标准'"
-                  :disabled="pageType === 'detail'"
+                  disabled
                 >
                   <template v-if="pageType !== 'detail'" #append>
                     <el-button
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 5e62137..22d1d8a 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -24,16 +24,16 @@
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    // { name: '删除', type: 'danger' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    // { name: '删除', type: 'danger' },
     { name: '取消', type: 'info' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    // { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
+    { name: '删除', type: 'danger' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
@@ -41,9 +41,10 @@
   ],
   已取消: [
     { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
     { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
-
 }
 // 当前tab
 const currentTab = ref('全部')
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index d2fad4c..004b856 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -28,10 +28,6 @@
 const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  // 审批中状态时候长度返回错误
-  if (props.status === '3' || props.status === '6') {
-    props.buttons.length = 4 // 传递长度 + 判断条件下显示按钮长度
-  }
   return props.buttons.length * 40 + 23
 })
 
@@ -63,13 +59,13 @@
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '溯源供方编号', value: 'supplierNo', width: '160', align: 'center' },
-  { text: '溯源供方名称', value: 'supplierName', width: '120', align: 'center' },
+  { text: '溯源供方名称', value: 'supplierName', align: 'center' },
   { text: '业务内容', value: 'businessContent', align: 'center' },
   { text: '业务范围', value: 'businessScope', align: 'center' },
   { text: '负责人', value: 'director', align: 'center' },
   { text: '联系方式', value: 'phone', align: 'center' },
   { text: '地址', value: 'address', align: 'center' },
-  { text: '创建时间', value: 'name', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
   { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110px' },
 ])
 // 初始化路由
@@ -86,15 +82,20 @@
     listQuery.value.offset = 1
   }
   getapprovalListPage(listQuery.value).then((response) => {
-    list.value = response.data.rows
-    if (!companyAddress.value) {
-      companyAddress.value = [response.data.rows[0].companyCountry, response.data.rows[0].companyProvince, response.data.rows[0].companyCity, response.data.rows[0].companyArea, response.data.rows[0].companyAddress]
-    }
-    else if (isReset) {
-      companyAddress.value = [response.data.rows[0].companyCountry, response.data.rows[0].companyProvince, response.data.rows[0].companyCity, response.data.rows[0].companyArea, response.data.rows[0].companyAddress]
+    list.value = response.data.rows.map((item: { companyProvinceName: string; companyCityName: string }) => {
+      return {
+        ...item,
+        address: item.companyProvinceName === item.companyCityName ? item.companyCityName : item.companyProvinceName + item.companyCityName,
+      }
+    })
+    // if (!companyAddress.value) {
+    //   companyAddress.value = [response.data.rows[0].companyCountry, response.data.rows[0].companyProvince, response.data.rows[0].companyCity, response.data.rows[0].companyArea, response.data.rows[0].companyAddress]
+    // }
+    if (isReset) {
+      companyAddress.value = ['', '', '', '', '']
+      // companyAddress.value = [response.data.rows[0].companyCountry, response.data.rows[0].companyProvince, response.data.rows[0].companyCity, response.data.rows[0].companyArea, response.data.rows[0].companyAddress]
     }
     total.value = parseInt(response.data.total)
-    console.log(companyAddress.value)
     loadingTable.value = false
   }).catch((_) => {
     loadingTable.value = false
@@ -107,6 +108,7 @@
 }
 // 公司地址变化后给对象赋值
 function companyAddressChange(addressObj: IAddress) {
+  console.log('公司地址变化后给对象赋值')
   listQuery.value.companyCountry = addressObj.country
   listQuery.value.companyProvince = addressObj.province
   listQuery.value.companyCity = addressObj.city
@@ -191,30 +193,6 @@
   }
   fetchData(true, true)
 }
-// 导出
-const exportExcelBtn = () => {
-  const params: supplierExportQuery = {
-    approvalStatus: listQuery.value.approvalStatus,
-    businessContent: listQuery.value.businessContent,
-    companyArea: listQuery.value.companyArea,
-    companyCity: listQuery.value.companyCity,
-    companyProvince: listQuery.value.companyProvince,
-    formId: listQuery.value.formId,
-    supplierName: listQuery.value.supplierName,
-    supplierNo: listQuery.value.supplierNo,
-  }
-  if (checkoutList.value.length > 0) {
-    params.ids = checkoutList.value
-  }
-  // TODO: 审批列表导出
-  console.log(params)
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  loading.close()
-}
 
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -237,10 +215,7 @@
 const add = () => {
   $router.push('/source/add')
 }
-// 批量导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 审批结束回调
 const approvalSuccess = () => {
   fetchData(true)
@@ -259,7 +234,7 @@
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    sourceSubmit({ id: row.id, formId: SCHEDULE.SUPPLIER_APPROVAL }).then((res) => {
+    sourceSubmit({ id: row.id, formId: SCHEDULE.SUPPLIER_APPROVAL, processId: row.processId }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
@@ -311,7 +286,7 @@
   (newVal: string) => {
     console.log('change status', newVal)
     listQuery.value.approvalStatus = newVal
-    fetchData(false)
+    clearList()
   },
   { immediate: true })
 
@@ -429,7 +404,7 @@
                   编辑
                 </el-button>
                 <el-button
-                  v-if="row.approvalStatusName === '草稿箱' "
+                  v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                   size="small"
                   link
                   type="primary"
@@ -448,20 +423,8 @@
                 >
                   取消
                 </el-button>
-                <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-                <!-- <el-button
-                  v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
-                  size="small"
-                  link
-                  type="danger"
-                  :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-                  @click="clickBtn(row, '删除')"
-                >
-                  删除
-                </el-button> -->
-                <!-- ------------------------------------审批中的删除暂时去掉-------------------------------- -->
                 <el-button
-                  v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+                  v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
                   size="small"
                   link
                   type="danger"

diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..9cf2b29 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -28,6 +28,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    DeptSelectByName: typeof import('./components/DeptSelectByName/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
diff --git a/src/views/business/board/standardReminder/list.vue b/src/views/business/board/standardReminder/list.vue
index 85efbb1..fd60743 100644
--- a/src/views/business/board/standardReminder/list.vue
+++ b/src/views/business/board/standardReminder/list.vue
@@ -94,12 +94,33 @@
 const preparation = ref<string>('')
 // 到期开始以及结束
 const validTime = ref<string>('')
+watch(preparation, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
+// 有效日期变更
+watch(validTime, (val) => {
+  if (val) {
+    listQuery.value.validStartTime = `${val[0]}`
+    listQuery.value.validEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.validStartTime = ''
+    listQuery.value.validEndTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.preparationStartDate = preparation.value[0] || ''
-  listQuery.value.preparationEndDate = preparation.value[1] || ''
-  listQuery.value.validStartTime = validTime.value[0] || ''
-  listQuery.value.validEndTime = validTime.value[1] || ''
+  // listQuery.value.preparationStartDate = preparation.value[0] || ''
+  // listQuery.value.preparationEndDate = preparation.value[1] || ''
+  // listQuery.value.validStartTime = validTime.value[0] || ''
+  // listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -223,16 +244,16 @@
   })
   if (list.value.length > 0) {
     const params = {
-      category: '', // 类别
-      id: '', // 主键id
-      managerState: '', // 管理状态
-      preparationEndDate: '', // 结束时间
-      preparationStartDate: '', // 开始时间
-      standardLaboratory: '', // 标准所在部门
-      standardName: '', // 标准名称
-      standardNo: '', // 标准编号
-      validEndTime: '', // 结束时间
-      validStartTime: '', // 开始时间
+      category: listQuery.value.category, // 类别
+      id: listQuery.value.id, // 主键id
+      managerState: listQuery.value.managerState, // 管理状态
+      preparationEndDate: listQuery.value.preparationEndDate, // 结束时间
+      preparationStartDate: listQuery.value.preparationStartDate, // 开始时间
+      standardLaboratory: listQuery.value.standardLaboratory, // 标准所在部门
+      standardName: listQuery.value.standardName, // 标准名称
+      standardNo: listQuery.value.standardNo, // 标准编号
+      validEndTime: listQuery.value.validEndTime, // 结束时间
+      validStartTime: listQuery.value.validStartTime, // 开始时间
       offset: 1, // 当前页
       limit: 20, // 每页多少条
       ids: checkoutList.value,
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 8666957..37ac73f 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -137,7 +137,7 @@
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  distributeDialogRef.value.initDialog(row.id, row.sampleId, row.orderId)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId, row.sampleStatus)
 }
 // 点击标签绑定
 const barCodeBind = ref()
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 807ea30..4e4eb46 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -37,11 +37,21 @@
   { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
   { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
 ])
-
+// 时间变更
+watch(trainTime, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 查询列表
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.startTime = trainTime.value[0] || ''
-  listQuery.value.endTime = trainTime.value[1] || ''
+  // listQuery.value.startTime = trainTime.value[0] || ''
+  // listQuery.value.endTime = trainTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2f7c1d0..bccde84 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -139,7 +139,17 @@
     id: '2', // 后端规定已收入传2
   })
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -147,8 +157,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.sampleStatus = active.value
   getInterChangeList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IinterchangeList) => {
@@ -280,7 +290,7 @@
       else if (type === 'delete') { // 无需检测
         interchangeStatusChange({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '7' }).then((res) => {
           if (res.code === 200) {
-            ElMessage.success(`已${title}`)
+            ElMessage.success('操作成功')
             fetchData(true)
           }
         })
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList.vue b/src/views/business/schedule/interchangeReceipt/receiptList.vue
index 275a053..83d93f4 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptList.vue
@@ -42,7 +42,17 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -50,8 +60,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getReceiptList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -124,13 +134,13 @@
   })
   if (list.value.length > 0) {
     const params = {
-      interchangeCode: '', // 交接单编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      reciever: '', // 接收人
-      deliverer: '', // 送样人
-      startTime: '', // 交接开始时间
-      endTime: '', // 交接结束时间
+      interchangeCode: listQuery.value.interchangeCode, // 交接单编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      reciever: listQuery.value.reciever, // 接收人
+      deliverer: listQuery.value.deliverer, // 送样人
+      startTime: listQuery.value.startTime, // 交接开始时间
+      endTime: listQuery.value.endTime, // 交接结束时间
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index cf0b532..f2fc852 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -26,8 +26,8 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   deliverer: '', // 送样人
-  isUrgent: 2, // 是否加急 2全部 1是 0否
-  status: 0, // 接收状态
+  isUrgent: '', // 是否加急 2全部 1是 0否
+  status: '', // 接收状态
   offset: 1,
   limit: 20,
 })
@@ -70,11 +70,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    isUrgentMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 2, // 是否加急全部后端定为2
-    })
+    // isUrgentMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 2, // 是否加急全部后端定为2
+    // })
   })
   // 接收状态
   getDictByCode('orderStatus').then((response) => {
@@ -85,11 +85,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    statusMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 0,
-    })
+    // statusMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 0,
+    // })
     console.log(statusMap.value)
   })
 }
@@ -125,8 +125,8 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     deliverer: '', // 送样人
-    isUrgent: 2, // 是否加急
-    status: 0, // 接收状态
+    isUrgent: '', // 是否加急 2全部 1是 0否
+    status: '', // 接收状态
     offset: 1,
     limit: 20,
   }
@@ -191,12 +191,12 @@
   })
   if (list.value.length > 0) {
     const params = {
-      orderCode: '', // 委托书编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      deliverer: '', // 送样人
-      isUrgent: 2, // 是否加急
-      status: 0, // 接收状态
+      orderCode: listQuery.value.orderCode, // 委托书编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      deliverer: listQuery.value.deliverer, // 送样人
+      isUrgent: listQuery.value.isUrgent, // 是否加急
+      status: listQuery.value.status, // 接收状态
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 2d92da9..14cd1ce 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -6,7 +6,7 @@
   customerName: string // 委托方名称
   deliverer: string // 送样人
   isUrgent: number | string // 是否加急
-  status: number // 接收状态
+  status: number | string// 接收状态
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 50308c7..25c5cf9 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -53,6 +53,7 @@
   handOutProperty: string // 分发性质-初次分发、退回分发
   id?: string // 实验室id
   customerId?: string // 客户id
+  certificationState?: string // 证书出具
 }
 
 // 实验室检测/我的检测列表
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index 7c17365..7159350 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -1,6 +1,6 @@
 <!-- 任务分发 -->
 <script lang="ts" setup name="TaskEdit">
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
 import ProcessConfig from './components/processConfig.vue'
@@ -11,6 +11,7 @@
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { UploadFile } from '@/api/measure/file'
 import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 interface dictType {
   id: string
@@ -251,16 +252,22 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    // UploadFile(fd).then((res) => {
-    //   if (res.code === 200) {
-    //     sampleForm.value.minioFileName = res.data[0]
-    //     // 重置当前验证
-    //     ElMessage.success('文件上传成功')
-    //   }
-    //   else {
-    //     ElMessage.error(res.message)
-    //   }
-    // })
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        sampleForm.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+        loading.close()
+      }
+      else {
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    })
   }
 }
 const upload = () => {
@@ -402,7 +409,7 @@
               <el-form-item label="校检类别:">
                 <el-select
                   v-model="sampleForm.measureCategory"
-                  :placeholder="roleType === 'detail' ? '' : '请选择校检类别'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择校检类别'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -424,7 +431,7 @@
               <el-form-item label="厂家国别:">
                 <el-select
                   v-model="sampleForm.manufacturerCountry"
-                  :placeholder="roleType === 'detail' ? '' : '请选择厂家国别'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择厂家国别'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -450,7 +457,7 @@
               <el-form-item label="ABC:">
                 <el-select
                   v-model="sampleForm.abc"
-                  :placeholder="roleType === 'detail' ? '' : '请选择ABC'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择ABC'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -504,8 +511,8 @@
               <el-form-item label="备注:">
                 <el-input
                   v-model="sampleForm.remark"
+                  autosize
                   type="textarea"
-                  :rows="2"
                   :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
                   :class="{ 'detail-input': roleType === 'detail' }"
@@ -516,7 +523,7 @@
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="sampleForm.measureType"
-                  :placeholder="roleType === 'detail' ? '' : '请选择检定方式'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择检定方式'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index dfbbf6a..6eeff55 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -81,7 +81,7 @@
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '165px' },
   { text: '样品属性', value: 'sampleBelongName', width: '100', align: 'center' },
   { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '90' },
-  { text: '证书出具', value: 'certificationState', align: 'center', width: '90', filter: (row: ITaskList) => { return `${row.alreadyCertifications}/${row.requireCertifications}` } },
+  { text: '证书出具', value: 'certificationState', align: 'center', width: '90' },
 ])
 // 表格数据
 const list = ref<ITaskList[]>([])
@@ -104,6 +104,7 @@
   getTaskList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: ITaskList) => {
       item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      item.certificationState = `${item.alreadyCertifications}/${item.requireCertifications}`
       return item
     })
     total.value = response.data.total
diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue
index e44dd67..194de53 100644
--- a/src/views/business/subpackage/apply/list.vue
+++ b/src/views/business/subpackage/apply/list.vue
@@ -302,7 +302,7 @@
         <search-item>
           <el-date-picker
             v-model="timeRange" type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="申请开始时间" end-placeholder="申请结束时间"
+            value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="申请开始时间" end-placeholder="申请结束时间" clearable
           />
         </search-item>
       </search-area>
diff --git a/src/views/business/subpackage/check/list.vue b/src/views/business/subpackage/check/list.vue
index 51ea419..a8b6744 100644
--- a/src/views/business/subpackage/check/list.vue
+++ b/src/views/business/subpackage/check/list.vue
@@ -111,8 +111,6 @@
 
 // 时间变更
 watch(timeRange, (val) => {
-  console.log(val[0])
-
   if (val) {
     listQuery.value.checkStartTime = `${val[0]}`
     listQuery.value.checkEndTime = `${val[1]}`
@@ -345,7 +343,8 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="timeRange" type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
+            v-model="timeRange"
+            clearable type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="验收开始时间" end-placeholder="验收结束时间"
           />
         </search-item>
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 98f4a39..a0db900 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -68,6 +68,7 @@
   else {
     listQuery.value.startTime = ''
     listQuery.value.endTime = ''
+    timeRange.value = ['', '']
   }
 })
 // 多选发生改变时
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index 6e41a94..ac98b8a 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -56,7 +56,17 @@
 const checkoutList = ref<string[]>([])
 // 文件上传input
 const fileRef = ref()
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -64,8 +74,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getSampleList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index 92e4b4a..6f465fc 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -67,7 +67,17 @@
     certificationStatusMap.value[`${item.value}`] = item.name
   })
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -75,8 +85,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getSampleList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IOvertimeList) => {
       return {
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index dbaa437..14464bf 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -86,6 +86,17 @@
     width: 160,
   },
 ]) // 表格
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 const fetchData = (isNowPage = false) => {
   loadingTable.value = true
@@ -93,8 +104,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.processResult = active.value
   getApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 60d1454..d0236cc 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -105,7 +105,17 @@
     align: 'center',
   },
 ])
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 const fetchData = (isNowPage = false) => {
   loadingTable.value = true
@@ -113,8 +123,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.approvalStatus = active.value
   getApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index aeb568e..5430b0f 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -103,10 +103,21 @@
 // 装载时间数组
 const checkTime = ref<string>('')
 const loadingTable = ref(false)
+// 时间变更
+watch(checkTime, (val) => {
+  if (val) {
+    listQuery.value.checkStartDate = `${val[0]}`
+    listQuery.value.checkEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.checkStartDate = ''
+    listQuery.value.checkEndDate = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.checkStartDate = checkTime.value[0] || ''
-  listQuery.value.checkEndDate = checkTime.value[1] || ''
+  // listQuery.value.checkStartDate = checkTime.value[0] || ''
+  // listQuery.value.checkEndDate = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 6229abf..9d30934 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -112,10 +112,21 @@
 // 装载时间数组
 const checkTime = ref('')
 const loadingTable = ref(false)
+// 时间变更
+watch(checkTime, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.startTime = checkTime.value[0] || ''
-  listQuery.value.endTime = checkTime.value[1] || ''
+  // listQuery.value.startTime = checkTime.value[0] || ''
+  // listQuery.value.endTime = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index daca294..de18467 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -66,6 +66,17 @@
 const checkoutList = ref<IManageChecklist[]>([])
 // 文件上传input
 const fileRef = ref()
+// 时间变更
+watch(checkDate, (val) => {
+  if (val) {
+    listQuery.value.checkStartDate = `${val[0]}`
+    listQuery.value.checkEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.checkStartDate = ''
+    listQuery.value.checkEndDate = ''
+  }
+})
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
@@ -73,8 +84,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.checkStartDate = checkDate.value[0] || ''
-  listQuery.value.checkEndDate = checkDate.value[1] || ''
+  // listQuery.value.checkStartDate = checkDate.value[0] || ''
+  // listQuery.value.checkEndDate = checkDate.value[1] || ''
   getcheckInfoList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: any) => {
       return {
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 00d283c..50b014c 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -99,6 +99,17 @@
     approvalStatusReserveMap.value[item.name] = `${item.value}`
   })
 }
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -106,8 +117,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.approvalStatus = active.value
   getReceiveApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/receive/solve/solveList.vue b/src/views/device/receive/solve/solveList.vue
index 809c0c1..ec1e8bb 100644
--- a/src/views/device/receive/solve/solveList.vue
+++ b/src/views/device/receive/solve/solveList.vue
@@ -120,7 +120,17 @@
   timeRange.value = ['', ''] // 把时间选择框置空
   fetchData(true)
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -128,8 +138,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getReceiveApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IsolveListType) => {
       return {
diff --git a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
index 4744536..b4fe085 100644
--- a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
@@ -43,7 +43,12 @@
   select.value = -1
   listPageApi(listQuery.value).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows
+      list.value = res.data.rows.map((item: { effectiveStatusName: string }) => {
+        return {
+          ...item,
+          isDisabled: item.effectiveStatusName === '已废止',
+        }
+      })
       total.value = res.data.total
     }
   })
@@ -142,7 +147,7 @@
           </el-table-column>
           <el-table-column label="" width="55" align="center" fixed="left">
             <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
+              <el-radio v-model="select" :disabled="scope.row.isDisabled" :label="scope.$index" class="radio" />
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index a030dcf..0dd5547 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -94,12 +94,34 @@
 const preparation = ref<string>('')
 // 到期开始以及结束
 const validTime = ref<string>('')
+// 筹建日期变更
+watch(preparation, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
+// 有效日期变更
+watch(validTime, (val) => {
+  if (val) {
+    listQuery.value.validStartTime = `${val[0]}`
+    listQuery.value.validEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.validStartTime = ''
+    listQuery.value.validEndTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.preparationStartDate = preparation.value[0] || ''
-  listQuery.value.preparationEndDate = preparation.value[1] || ''
-  listQuery.value.validStartTime = validTime.value[0] || ''
-  listQuery.value.validEndTime = validTime.value[1] || ''
+  // listQuery.value.preparationStartDate = preparation.value[0] || ''
+  // listQuery.value.preparationEndDate = preparation.value[1] || ''
+  // listQuery.value.validStartTime = validTime.value[0] || ''
+  // listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index 39d8683..bb69fe9 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -99,6 +99,17 @@
 const standardManagerStateList = ref<IOptions[]>([])
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
+// 时间变更
+watch(preparationDate, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
@@ -107,8 +118,8 @@
     listQuery.value.offset = 1
   }
   // 筹建日期
-  listQuery.value.preparationStartDate = preparationDate.value[0] || ''
-  listQuery.value.preparationEndDate = preparationDate.value[1] || ''
+  // listQuery.value.preparationStartDate = preparationDate.value[0] || ''
+  // listQuery.value.preparationEndDate = preparationDate.value[1] || ''
   getStandardList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: any) => {
       return {
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 37205fc..edf9dd7 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -793,7 +793,7 @@
             保存
           </el-button>
           <!-- 待审批 -->
-          <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'agree' })">
+          <!-- <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'agree' })">
             同意
           </el-button>
           <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'reject' })">
@@ -801,7 +801,7 @@
           </el-button>
           <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'refuse' })">
             拒绝
-          </el-button>
+          </el-button> -->
           <!-- </template> -->
         </template>
         <el-button v-if="(title === '详情' && $route.query?.approvalStatusName === '草稿箱' && isCancel)" type="primary" @click="editForm">
diff --git a/src/views/finance/businessSettlement/list.vue b/src/views/finance/businessSettlement/list.vue
index e942abb..9543947 100644
--- a/src/views/finance/businessSettlement/list.vue
+++ b/src/views/finance/businessSettlement/list.vue
@@ -43,6 +43,7 @@
 const list = ref<IList[]>([]) // 表格数据
 // 选中的内容
 const checkoutList = ref<string[]>([])
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
diff --git a/src/views/finance/contract/list.vue b/src/views/finance/contract/list.vue
index 7dcdca5..5f8eb4e 100644
--- a/src/views/finance/contract/list.vue
+++ b/src/views/finance/contract/list.vue
@@ -59,6 +59,17 @@
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 选中的内容
 const checkoutList = ref<string[]>([])
+// 时间变更
+watch(dateRange, (val) => {
+  if (val) {
+    listQuery.value.estimateSignStartDate = `${val[0]}`
+    listQuery.value.estimateSignEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.estimateSignStartDate = ''
+    listQuery.value.estimateSignEndDate = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -66,8 +77,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.estimateSignStartDate = dateRange.value[0] as string || ''
-  listQuery.value.estimateSignEndDate = dateRange.value[1] as string || ''
+  // listQuery.value.estimateSignStartDate = dateRange.value[0] as string || ''
+  // listQuery.value.estimateSignEndDate = dateRange.value[1] as string || ''
   getContractList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: { estimateSignDate: string; agreementAmount: number }) => {
       return {
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 1bce5f9..07b2296 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,7 +1,7 @@
-<!-- 新增或详情弹窗 -->
+<!-- 新增或详情 -->
 <script lang="ts" setup name="addNotice">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
@@ -15,6 +15,7 @@
 import { SCHEDULE } from '@/utils/scheduleDict'
 const $route = useRoute()
 const $router = useRouter()
+const submitId = ref('') // 提交id-保存接口获取
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
 const fileTypeName = ref('')
@@ -40,12 +41,12 @@
   formId: SCHEDULE.FILE_APPROVAL,
 }) // 表单
 const rules = ref<FormRules>({
-  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
-  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
-  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
-  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
-  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+  fileName: [{ required: true, message: '名称必填', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建必填', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位必填', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间必填', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人必填', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号必填', trigger: 'blur' }],
 }) // 表单验证规则
 
 const userList = ref<userType[]>([]) // 可使用人列表
@@ -57,12 +58,14 @@
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
-const PubList = ref<deptType[]>([])
+const PubList = ref([]) as any// 发布单位列表
 const PubListTree = ref([])
 // 获取发布单位列表
 const getPubList = () => {
   getDeptTreeList().then((res) => {
     PubList.value = res.data
+    console.log('0000', 'ppp', PubList.value)
+
     PubListTree.value = toTreeList(res.data, '0', true)
   })
 }
@@ -113,43 +116,57 @@
   effectiveStatusName.value = ''
 }
 // 提交
-const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+const saveForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
-    `确认${flag}吗？`,
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then((res) => {
+        const publisherId = ruleForm.publisher
+        const index = PubList.value.findIndex((item: { id: string }) => item.id === publisherId)
+        if (index !== -1) {
+          ruleForm.publisher = PubList.value[index].name as string
+        }
+        // 保存（草稿箱）
+        confirmDrafts(ruleForm).then((res) => {
+          ruleForm.fileNo = res.data.fileNo
+          submitId.value = res.data.id
+          ElMessage.success('保存成功')
+          // formEl?.resetFields()
+          // $router.go(-1)
+          close()
+        })
+      })
+    }
+  })
+}
+const submitForm = () => {
+  if (!submitId.value) {
+    ElMessage.warning('请先保存')
+    return false
+  }
+  ElMessageBox.confirm(
+    '确认提交吗？',
     '提示',
     {
       confirmButtonText: '确认',
       cancelButtonText: '取消',
       type: 'warning',
     },
-      ).then((res) => {
-        if (flag === '提交') {
-          confirmDrafts(ruleForm).then((res) => {
-            if (res.code === 200) {
-              console.log(res.data, '保存成功')
-              submitFile({ id: res.data.id, formId: SCHEDULE.FILE_APPROVAL }).then((res) => {
-                formEl?.resetFields()
-                ElMessage.success('提交成功')
-                $router.go(-1)
-                close()
-              })
-            }
-          })
-        }
-        else {
-          // 保存（草稿箱）
-          confirmDrafts(ruleForm).then((res) => {
-            ElMessage.success('保存成功')
-            formEl?.resetFields()
-            $router.go(-1)
-            close()
-          })
-        }
-      })
-    }
+  ).then((res) => {
+    submitFile({ id: submitId.value, formId: SCHEDULE.FILE_APPROVAL }).then((res) => {
+    // formEl?.resetFields()
+      ElMessage.success('已提交')
+      $router.go(-1)
+      close()
+    })
   })
 }
 // 取消
@@ -163,9 +180,14 @@
 const onFileChange = (event: any) => {
   // 原生上传
   // console.log(event.target.files)
+
   if (event.target.files?.length !== 0) {
     // 创建formdata对象
     const fd = new FormData()
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
@@ -173,9 +195,11 @@
         // 重置当前验证
         ruleFormRef.value?.clearValidate('minioFileName')
         ElMessage.success('文件上传成功')
+        loading.close()
       }
       else {
         ElMessage.error(res.message)
+        loading.close()
       }
     })
   }
@@ -215,10 +239,10 @@
   <app-container style="overflow: hidden;">
     <detail-page :title="`${fileTypeName}-${title}`">
       <template #btns>
-        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm()">
           提交
         </el-button>
-        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
+        <el-button v-if="title !== '详情'" type="primary" @click="saveForm(ruleFormRef)">
           保存
         </el-button>
         <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -258,7 +282,7 @@
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
                 style="width: 100%;"
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 135d059..c2b46c0 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -1,6 +1,7 @@
 <!-- 文件审批公共模板 -->
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { DateModelType } from 'element-plus'
 import type { TableRow } from './approve-interface'
 import type { fileResType } from '@/views/measure/file/file-interface'
 import { printJSON } from '@/utils/printUtils'
@@ -32,12 +33,13 @@
 const approvalStatusReserveMap = ref({ ...props.approvalStatusReserveMap }) // 审批状态字典{草稿箱: 1}
 const activeTitle = ref('') // active对应的审批状态名字
 
-const searchQuery = reactive({
+const searchQuery = ref({
   fileNo: '', // 编号
   fileName: '', // 名称
   fileCode: '', // 文件号
   createUser: '', // 创建人
-  createTime: '', // 创建
+  createStartTime: '', // 创建开始时间
+  createEndTime: '', // 创建结束时间
   approvalStatus: approvalStatus.value, // 审批状态
   limit: 20,
   offset: 1,
@@ -49,18 +51,31 @@
 const total = ref<number>(0) // 数据总条数
 const columns = ref<TableColumn[]>([
   { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
+  { text: '编号', value: 'fileNo', align: 'center', width: '160' },
   { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
+  { text: '类别', value: 'fileTypeName', align: 'center' },
   { text: '创建人', value: 'createUser', align: 'center' },
-  { text: '创建时间', value: 'createTime', align: 'center' },
-  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110' },
 ]) // 表格
 const list = ref<TableRow[]>([]) // 表格数据
+// 筛选时间段数据
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    searchQuery.value.createStartTime = `${val[0]}`
+    searchQuery.value.createEndTime = `${val[1]}`
+  }
+  else {
+    searchQuery.value.createStartTime = ''
+    searchQuery.value.createEndTime = ''
+  }
+})
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
-  approvallistPageApi(searchQuery).then((res) => {
+  approvallistPageApi(searchQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows.map((item: TableRow) => {
         return {
@@ -85,10 +100,10 @@
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
-    searchQuery.limit = val.size
+    searchQuery.value.limit = val.size
   }
   if (val && val.page) {
-    searchQuery.offset = val.page
+    searchQuery.value.offset = val.page
   }
   getList()
 }
@@ -216,12 +231,21 @@
 }
 // 重置
 const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.fileType = ''
-  searchQuery.createTime = ''
-  searchQuery.createUser = ''
+  searchQuery.value = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    fileCode: '', // 文件号
+    createUser: '', // 创建人
+    createStartTime: '', // 创建开始时间
+    createEndTime: '', // 创建结束时间
+    approvalStatus: approvalStatus.value, // 审批状态
+    limit: 20,
+    offset: 1,
+    fileType: '', // 文件类别
+    formId: SCHEDULE.FILE_APPROVAL,
+    ids: [] as string[],
+  }
+  timeRange.value = ['', '']
   getList()
 }
 // 表格被选中的行
@@ -230,27 +254,6 @@
 const multiSelect = (row: TableRow[]) => {
   selectList.value = row
 }
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  searchQuery.ids = []
-  if (selectList.value.length) {
-    selectList.value.forEach((item) => {
-      searchQuery.ids?.push(item.id as string)
-    })
-  }
-  exportFileApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
-    exportFile(res.data, props.name)
-    loading.close()
-    searchQuery.ids = []
-  }).catch((_) => {
-    loading.close()
-  })
-}
 // 打印
 function printList() {
   const selectIds = selectList.value.map(item => item.id)
@@ -278,8 +281,8 @@
   sessionStorage.setItem('approveFileMenu', props.name)
   approvalStatus.value = approvalStatusReserveMap.value[props.name]
   // approvalStatus.value = approvalStatusReserveMap.value[props.name] // 失效
-  searchQuery.approvalStatus = approvalStatusReserveMap.value[props.name] || '0'
-  $router.currentRoute.value.query.cacheActive = searchQuery.approvalStatus
+  searchQuery.value.approvalStatus = approvalStatusReserveMap.value[props.name] || '0'
+  $router.currentRoute.value.query.cacheActive = searchQuery.value.approvalStatus
   getList()
   // 缓存名称
 }, { deep: true, immediate: true })
@@ -312,8 +315,14 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss" placeholder="创建时间"
+            v-model="timeRange"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="创建开始时间"
+            end-placeholder="创建结束时间"
+            clearable
+            style="width: 360px;"
           />
         </search-item>
         <search-item>
@@ -323,10 +332,6 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <icon-button
-            v-if="proxy.hasPerm('/file/approve/export')" icon="icon-export" title="导出"
-            @click="exportExcelBtn"
-          />
           <icon-button v-if="proxy.hasPerm('/file/approve/print')" icon="icon-print" title="打印" @click="printList" />
         </template>
         <!-- 表格区域 -->
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 9dd3633..de9e080 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -85,7 +85,7 @@
 const getStatus = () => {
   getDictByCode('effectiveStatus').then((res) => {
     if (res.code === 200) {
-      effectiveStatusSelect.value = [...res.data, { name: '全部', value: '', id: 'quanbu' }]
+      effectiveStatusSelect.value = res.data
     }
   })
 }
@@ -373,8 +373,8 @@
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/add`)" icon="icon-add" title="新建" @click="add" />
-          <icon-button v-if="proxy.hasPerm(`/file/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
-          <icon-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <!-- <icon-button v-if="proxy.hasPerm(`/file/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" /> -->
+          <!-- <icon-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" /> -->
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/print`)" icon="icon-print" title="打印" @click="printList" />
         </template>
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 3510056..ed3ab8c 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -282,8 +282,8 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/measure/price/import')" icon="icon-import" title="批量导入" type="primary" />
-        <icon-button v-if="proxy.hasPerm('/measure/price/mould')" icon="icon-template" title="模板下载" type="primary" />
+        <!-- <icon-button v-if="proxy.hasPerm('/measure/price/import')" icon="icon-import" title="批量导入" type="primary" /> -->
+        <!-- <icon-button v-if="proxy.hasPerm('/measure/price/mould')" icon="icon-template" title="模板下载" type="primary" /> -->
         <icon-button v-if="proxy.hasPerm('/measure/price/add')" icon="icon-add" title="新建" type="primary" @click="add" />
         <icon-button v-if="proxy.hasPerm('/measure/price/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/measure/price/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 60eeebb..7b6f4ec 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -61,7 +61,8 @@
   categoryName: [{ required: true, message: '类别不能为空', trigger: ['blur', 'change'] }],
   itemName: [{ required: true, message: '项目不能为空', trigger: ['blur', 'change'] }],
   priceStandardName: [{ required: true, message: '依据标准不能为空', trigger: ['blur', 'change'] }],
-  price: [{ required: true, message: '标准价格不能为空', trigger: ['blur', 'change'] }],
+  price: [{ required: true, message: '标准价格不能为空', trigger: ['blur', 'change'] },
+    { pattern: /^(?!0+(?:\.0+)?$)(?:[1-9]\d*|0)(?:\.\d{1,2})?$/, message: '要求不小于0，且最多保留两位小数', trigger: ['blur', 'change'] }],
   operatorDiscountPermission: [{ required: true, message: '业务员折扣权限不能为空', trigger: ['blur', 'change'] }],
   directorDiscountPermission: [{ required: true, message: '负责人折扣权限不能为空', trigger: ['blur', 'change'] }],
 })
@@ -255,7 +256,7 @@
                   v-model.trim="formInline.priceStandardName"
                   clearable
                   :placeholder="pageType === 'detail' ? '' : '依据标准'"
-                  :disabled="pageType === 'detail'"
+                  disabled
                 >
                   <template v-if="pageType !== 'detail'" #append>
                     <el-button
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 5e62137..22d1d8a 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -24,16 +24,16 @@
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    // { name: '删除', type: 'danger' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    // { name: '删除', type: 'danger' },
     { name: '取消', type: 'info' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    // { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
+    { name: '删除', type: 'danger' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
@@ -41,9 +41,10 @@
   ],
   已取消: [
     { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
     { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
-
 }
 // 当前tab
 const currentTab = ref('全部')
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index d2fad4c..004b856 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -28,10 +28,6 @@
 const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  // 审批中状态时候长度返回错误
-  if (props.status === '3' || props.status === '6') {
-    props.buttons.length = 4 // 传递长度 + 判断条件下显示按钮长度
-  }
   return props.buttons.length * 40 + 23
 })
 
@@ -63,13 +59,13 @@
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '溯源供方编号', value: 'supplierNo', width: '160', align: 'center' },
-  { text: '溯源供方名称', value: 'supplierName', width: '120', align: 'center' },
+  { text: '溯源供方名称', value: 'supplierName', align: 'center' },
   { text: '业务内容', value: 'businessContent', align: 'center' },
   { text: '业务范围', value: 'businessScope', align: 'center' },
   { text: '负责人', value: 'director', align: 'center' },
   { text: '联系方式', value: 'phone', align: 'center' },
   { text: '地址', value: 'address', align: 'center' },
-  { text: '创建时间', value: 'name', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
   { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110px' },
 ])
 // 初始化路由
@@ -86,15 +82,20 @@
     listQuery.value.offset = 1
   }
   getapprovalListPage(listQuery.value).then((response) => {
-    list.value = response.data.rows
-    if (!companyAddress.value) {
-      companyAddress.value = [response.data.rows[0].companyCountry, response.data.rows[0].companyProvince, response.data.rows[0].companyCity, response.data.rows[0].companyArea, response.data.rows[0].companyAddress]
-    }
-    else if (isReset) {
-      companyAddress.value = [response.data.rows[0].companyCountry, response.data.rows[0].companyProvince, response.data.rows[0].companyCity, response.data.rows[0].companyArea, response.data.rows[0].companyAddress]
+    list.value = response.data.rows.map((item: { companyProvinceName: string; companyCityName: string }) => {
+      return {
+        ...item,
+        address: item.companyProvinceName === item.companyCityName ? item.companyCityName : item.companyProvinceName + item.companyCityName,
+      }
+    })
+    // if (!companyAddress.value) {
+    //   companyAddress.value = [response.data.rows[0].companyCountry, response.data.rows[0].companyProvince, response.data.rows[0].companyCity, response.data.rows[0].companyArea, response.data.rows[0].companyAddress]
+    // }
+    if (isReset) {
+      companyAddress.value = ['', '', '', '', '']
+      // companyAddress.value = [response.data.rows[0].companyCountry, response.data.rows[0].companyProvince, response.data.rows[0].companyCity, response.data.rows[0].companyArea, response.data.rows[0].companyAddress]
     }
     total.value = parseInt(response.data.total)
-    console.log(companyAddress.value)
     loadingTable.value = false
   }).catch((_) => {
     loadingTable.value = false
@@ -107,6 +108,7 @@
 }
 // 公司地址变化后给对象赋值
 function companyAddressChange(addressObj: IAddress) {
+  console.log('公司地址变化后给对象赋值')
   listQuery.value.companyCountry = addressObj.country
   listQuery.value.companyProvince = addressObj.province
   listQuery.value.companyCity = addressObj.city
@@ -191,30 +193,6 @@
   }
   fetchData(true, true)
 }
-// 导出
-const exportExcelBtn = () => {
-  const params: supplierExportQuery = {
-    approvalStatus: listQuery.value.approvalStatus,
-    businessContent: listQuery.value.businessContent,
-    companyArea: listQuery.value.companyArea,
-    companyCity: listQuery.value.companyCity,
-    companyProvince: listQuery.value.companyProvince,
-    formId: listQuery.value.formId,
-    supplierName: listQuery.value.supplierName,
-    supplierNo: listQuery.value.supplierNo,
-  }
-  if (checkoutList.value.length > 0) {
-    params.ids = checkoutList.value
-  }
-  // TODO: 审批列表导出
-  console.log(params)
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  loading.close()
-}
 
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -237,10 +215,7 @@
 const add = () => {
   $router.push('/source/add')
 }
-// 批量导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 审批结束回调
 const approvalSuccess = () => {
   fetchData(true)
@@ -259,7 +234,7 @@
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    sourceSubmit({ id: row.id, formId: SCHEDULE.SUPPLIER_APPROVAL }).then((res) => {
+    sourceSubmit({ id: row.id, formId: SCHEDULE.SUPPLIER_APPROVAL, processId: row.processId }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
@@ -311,7 +286,7 @@
   (newVal: string) => {
     console.log('change status', newVal)
     listQuery.value.approvalStatus = newVal
-    fetchData(false)
+    clearList()
   },
   { immediate: true })
 
@@ -429,7 +404,7 @@
                   编辑
                 </el-button>
                 <el-button
-                  v-if="row.approvalStatusName === '草稿箱' "
+                  v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                   size="small"
                   link
                   type="primary"
@@ -448,20 +423,8 @@
                 >
                   取消
                 </el-button>
-                <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-                <!-- <el-button
-                  v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
-                  size="small"
-                  link
-                  type="danger"
-                  :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-                  @click="clickBtn(row, '删除')"
-                >
-                  删除
-                </el-button> -->
-                <!-- ------------------------------------审批中的删除暂时去掉-------------------------------- -->
                 <el-button
-                  v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+                  v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/measure/source/components/sourceApprovalDetail.vue b/src/views/measure/source/components/sourceApprovalDetail.vue
index c507032..35683e7 100644
--- a/src/views/measure/source/components/sourceApprovalDetail.vue
+++ b/src/views/measure/source/components/sourceApprovalDetail.vue
@@ -8,12 +8,15 @@
 import { getSoucreListDetail } from '@/api/measure/source'
 import { cancelApproval, fetchApproval } from '@/api/approval'
 import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
-
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import type { IAddress } from '@/components/AddressSelect/address-interface'
+const approvalDialog = ref() // 审批对话ref
 const approvalRecord = ref() // 审批流程组件ref
 const infoId = ref('') // id
+const taskId = ref('') // 任务id 用于审批
+const processId = ref('') // 流程实例id
 const approvalType = ref('')
 const approvalStatusName = ref('') // 审批状态、控制草稿箱没有审批流程
-
 // 从路由中获取页面类型参数
 const $route = useRoute()
 if ($route.params && $route.params.type) {
@@ -70,8 +73,9 @@
   approvalStatus: '', // 审批状态
   approvalStatusName: '', // 审批状态名称
 })
-
-const traceSupplierPersonList: Ref<traceSupplierPerson[]> = ref([])
+const companyAddress = ref<string[]>([]) // 公司地址
+const invoiceAddress = ref<string[]>([]) // 开票地址
+const traceSupplierPersonList: Ref<traceSupplierPerson[]> = ref([]) // 人员列表
 const columns = [
   { text: '人员编号', value: 'personNo' },
   { text: '姓名', value: 'name' },
@@ -83,9 +87,15 @@
 const getInfo = () => {
   getSoucreListDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data
+    traceSupplierPersonList.value = res.data.traceSupplierPersonList
+    // for (const key in dataForm.value) {
+    //   dataForm.value[key] = res.data[key]
+    // }
+    companyAddress.value = [dataForm.value.companyCountryName, dataForm.value.companyProvinceName, dataForm.value.companyCityName, dataForm.value.companyAreaName, dataForm.value.companyAddress]
+    invoiceAddress.value = [dataForm.value.invoiceCountryName, dataForm.value.invoiceProvinceName, dataForm.value.invoiceCityName, dataForm.value.invoiceAreaName, dataForm.value.invoiceAddress]
   })
 }
-getInfo()
+
 // 初始化router
 const $router = useRouter()
 // 关闭新增页面的回调
@@ -106,12 +116,12 @@
 }
 // 审批结束回调
 const approvalSuccess = () => {
-  getInfo()
+  close() // 返回上一页
 }
 // 取消
 const handleCancel = () => {
   const params = {
-    processInstanceId: dataForm.value.processId!,
+    processInstanceId: processId.value!,
     comments: '取消审批',
   }
   ElMessageBox.confirm(
@@ -125,21 +135,21 @@
   ).then(() => {
     cancelApproval(params).then(() => {
       ElMessage.success('取消成功')
+      close()
     })
   })
 }
-const approvalDialog = ref()
 // 点击数据后的操作按钮
 const clickBtn = (buttonType: string) => {
   switch (buttonType) {
     case '同意':
-      approvalDialog.value.initDialog('agree', dataForm.value.taskId)
+      approvalDialog.value.initDialog('agree', taskId.value)
       break
     case '驳回':
-      approvalDialog.value.initDialog('reject', dataForm.value.taskId)
+      approvalDialog.value.initDialog('reject', taskId.value)
       break
     case '拒绝':
-      approvalDialog.value.initDialog('refuse', dataForm.value.taskId)
+      approvalDialog.value.initDialog('refuse', taskId.value)
       break
     case '取消':
       handleCancel()
@@ -148,10 +158,14 @@
 }
 onMounted(() => {
   dataForm.value.processId = $route.query.processId as string// 流程实例id
+  processId.value = $route.query.processId as string// 流程实例id
   approvalStatusName.value = $route.query.approvalStatusName as string
+  taskId.value = $route.query.taskId as string
+
   if (approvalStatusName.value !== '草稿箱') {
-    getApprovalRecord(dataForm.value.processId) // 查询审批记录
+    getApprovalRecord(processId.value) // 查询审批记录
   }
+  getInfo() // 获取详情
 })
 </script>
 
@@ -162,13 +176,13 @@
         <el-button v-if="approvalType === '2'" type="primary" @click="clickBtn('同意')">
           同意
         </el-button>
-        <el-button v-if="approvalType === '2'" type="primary" @click="clickBtn('拒绝')">
-          拒绝
-        </el-button>
         <el-button v-if="approvalType === '2'" type="primary" @click="clickBtn('驳回')">
           驳回
         </el-button>
-        <el-button v-if="approvalType === '3'" type="primary" @click="handleCancel()">
+        <el-button v-if="approvalType === '2'" type="danger" @click="clickBtn('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="approvalType === '3'" type="info" @click="handleCancel()">
           取消
         </el-button>
         <el-button type="info" @click="close">
@@ -201,6 +215,7 @@
       <!-- 审批流程 -->
       <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
     </detail-block>
+    <!-- 审批弹窗 -->
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>

diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..9cf2b29 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -28,6 +28,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    DeptSelectByName: typeof import('./components/DeptSelectByName/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
diff --git a/src/views/business/board/standardReminder/list.vue b/src/views/business/board/standardReminder/list.vue
index 85efbb1..fd60743 100644
--- a/src/views/business/board/standardReminder/list.vue
+++ b/src/views/business/board/standardReminder/list.vue
@@ -94,12 +94,33 @@
 const preparation = ref<string>('')
 // 到期开始以及结束
 const validTime = ref<string>('')
+watch(preparation, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
+// 有效日期变更
+watch(validTime, (val) => {
+  if (val) {
+    listQuery.value.validStartTime = `${val[0]}`
+    listQuery.value.validEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.validStartTime = ''
+    listQuery.value.validEndTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.preparationStartDate = preparation.value[0] || ''
-  listQuery.value.preparationEndDate = preparation.value[1] || ''
-  listQuery.value.validStartTime = validTime.value[0] || ''
-  listQuery.value.validEndTime = validTime.value[1] || ''
+  // listQuery.value.preparationStartDate = preparation.value[0] || ''
+  // listQuery.value.preparationEndDate = preparation.value[1] || ''
+  // listQuery.value.validStartTime = validTime.value[0] || ''
+  // listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -223,16 +244,16 @@
   })
   if (list.value.length > 0) {
     const params = {
-      category: '', // 类别
-      id: '', // 主键id
-      managerState: '', // 管理状态
-      preparationEndDate: '', // 结束时间
-      preparationStartDate: '', // 开始时间
-      standardLaboratory: '', // 标准所在部门
-      standardName: '', // 标准名称
-      standardNo: '', // 标准编号
-      validEndTime: '', // 结束时间
-      validStartTime: '', // 开始时间
+      category: listQuery.value.category, // 类别
+      id: listQuery.value.id, // 主键id
+      managerState: listQuery.value.managerState, // 管理状态
+      preparationEndDate: listQuery.value.preparationEndDate, // 结束时间
+      preparationStartDate: listQuery.value.preparationStartDate, // 开始时间
+      standardLaboratory: listQuery.value.standardLaboratory, // 标准所在部门
+      standardName: listQuery.value.standardName, // 标准名称
+      standardNo: listQuery.value.standardNo, // 标准编号
+      validEndTime: listQuery.value.validEndTime, // 结束时间
+      validStartTime: listQuery.value.validStartTime, // 开始时间
       offset: 1, // 当前页
       limit: 20, // 每页多少条
       ids: checkoutList.value,
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 8666957..37ac73f 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -137,7 +137,7 @@
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  distributeDialogRef.value.initDialog(row.id, row.sampleId, row.orderId)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId, row.sampleStatus)
 }
 // 点击标签绑定
 const barCodeBind = ref()
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 807ea30..4e4eb46 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -37,11 +37,21 @@
   { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
   { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
 ])
-
+// 时间变更
+watch(trainTime, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 查询列表
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.startTime = trainTime.value[0] || ''
-  listQuery.value.endTime = trainTime.value[1] || ''
+  // listQuery.value.startTime = trainTime.value[0] || ''
+  // listQuery.value.endTime = trainTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2f7c1d0..bccde84 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -139,7 +139,17 @@
     id: '2', // 后端规定已收入传2
   })
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -147,8 +157,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.sampleStatus = active.value
   getInterChangeList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IinterchangeList) => {
@@ -280,7 +290,7 @@
       else if (type === 'delete') { // 无需检测
         interchangeStatusChange({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '7' }).then((res) => {
           if (res.code === 200) {
-            ElMessage.success(`已${title}`)
+            ElMessage.success('操作成功')
             fetchData(true)
           }
         })
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList.vue b/src/views/business/schedule/interchangeReceipt/receiptList.vue
index 275a053..83d93f4 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptList.vue
@@ -42,7 +42,17 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -50,8 +60,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getReceiptList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -124,13 +134,13 @@
   })
   if (list.value.length > 0) {
     const params = {
-      interchangeCode: '', // 交接单编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      reciever: '', // 接收人
-      deliverer: '', // 送样人
-      startTime: '', // 交接开始时间
-      endTime: '', // 交接结束时间
+      interchangeCode: listQuery.value.interchangeCode, // 交接单编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      reciever: listQuery.value.reciever, // 接收人
+      deliverer: listQuery.value.deliverer, // 送样人
+      startTime: listQuery.value.startTime, // 交接开始时间
+      endTime: listQuery.value.endTime, // 交接结束时间
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index cf0b532..f2fc852 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -26,8 +26,8 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   deliverer: '', // 送样人
-  isUrgent: 2, // 是否加急 2全部 1是 0否
-  status: 0, // 接收状态
+  isUrgent: '', // 是否加急 2全部 1是 0否
+  status: '', // 接收状态
   offset: 1,
   limit: 20,
 })
@@ -70,11 +70,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    isUrgentMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 2, // 是否加急全部后端定为2
-    })
+    // isUrgentMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 2, // 是否加急全部后端定为2
+    // })
   })
   // 接收状态
   getDictByCode('orderStatus').then((response) => {
@@ -85,11 +85,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    statusMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 0,
-    })
+    // statusMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 0,
+    // })
     console.log(statusMap.value)
   })
 }
@@ -125,8 +125,8 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     deliverer: '', // 送样人
-    isUrgent: 2, // 是否加急
-    status: 0, // 接收状态
+    isUrgent: '', // 是否加急 2全部 1是 0否
+    status: '', // 接收状态
     offset: 1,
     limit: 20,
   }
@@ -191,12 +191,12 @@
   })
   if (list.value.length > 0) {
     const params = {
-      orderCode: '', // 委托书编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      deliverer: '', // 送样人
-      isUrgent: 2, // 是否加急
-      status: 0, // 接收状态
+      orderCode: listQuery.value.orderCode, // 委托书编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      deliverer: listQuery.value.deliverer, // 送样人
+      isUrgent: listQuery.value.isUrgent, // 是否加急
+      status: listQuery.value.status, // 接收状态
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 2d92da9..14cd1ce 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -6,7 +6,7 @@
   customerName: string // 委托方名称
   deliverer: string // 送样人
   isUrgent: number | string // 是否加急
-  status: number // 接收状态
+  status: number | string// 接收状态
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 50308c7..25c5cf9 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -53,6 +53,7 @@
   handOutProperty: string // 分发性质-初次分发、退回分发
   id?: string // 实验室id
   customerId?: string // 客户id
+  certificationState?: string // 证书出具
 }
 
 // 实验室检测/我的检测列表
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index 7c17365..7159350 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -1,6 +1,6 @@
 <!-- 任务分发 -->
 <script lang="ts" setup name="TaskEdit">
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
 import ProcessConfig from './components/processConfig.vue'
@@ -11,6 +11,7 @@
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { UploadFile } from '@/api/measure/file'
 import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 interface dictType {
   id: string
@@ -251,16 +252,22 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    // UploadFile(fd).then((res) => {
-    //   if (res.code === 200) {
-    //     sampleForm.value.minioFileName = res.data[0]
-    //     // 重置当前验证
-    //     ElMessage.success('文件上传成功')
-    //   }
-    //   else {
-    //     ElMessage.error(res.message)
-    //   }
-    // })
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        sampleForm.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+        loading.close()
+      }
+      else {
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    })
   }
 }
 const upload = () => {
@@ -402,7 +409,7 @@
               <el-form-item label="校检类别:">
                 <el-select
                   v-model="sampleForm.measureCategory"
-                  :placeholder="roleType === 'detail' ? '' : '请选择校检类别'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择校检类别'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -424,7 +431,7 @@
               <el-form-item label="厂家国别:">
                 <el-select
                   v-model="sampleForm.manufacturerCountry"
-                  :placeholder="roleType === 'detail' ? '' : '请选择厂家国别'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择厂家国别'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -450,7 +457,7 @@
               <el-form-item label="ABC:">
                 <el-select
                   v-model="sampleForm.abc"
-                  :placeholder="roleType === 'detail' ? '' : '请选择ABC'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择ABC'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -504,8 +511,8 @@
               <el-form-item label="备注:">
                 <el-input
                   v-model="sampleForm.remark"
+                  autosize
                   type="textarea"
-                  :rows="2"
                   :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
                   :class="{ 'detail-input': roleType === 'detail' }"
@@ -516,7 +523,7 @@
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="sampleForm.measureType"
-                  :placeholder="roleType === 'detail' ? '' : '请选择检定方式'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择检定方式'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index dfbbf6a..6eeff55 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -81,7 +81,7 @@
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '165px' },
   { text: '样品属性', value: 'sampleBelongName', width: '100', align: 'center' },
   { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '90' },
-  { text: '证书出具', value: 'certificationState', align: 'center', width: '90', filter: (row: ITaskList) => { return `${row.alreadyCertifications}/${row.requireCertifications}` } },
+  { text: '证书出具', value: 'certificationState', align: 'center', width: '90' },
 ])
 // 表格数据
 const list = ref<ITaskList[]>([])
@@ -104,6 +104,7 @@
   getTaskList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: ITaskList) => {
       item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      item.certificationState = `${item.alreadyCertifications}/${item.requireCertifications}`
       return item
     })
     total.value = response.data.total
diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue
index e44dd67..194de53 100644
--- a/src/views/business/subpackage/apply/list.vue
+++ b/src/views/business/subpackage/apply/list.vue
@@ -302,7 +302,7 @@
         <search-item>
           <el-date-picker
             v-model="timeRange" type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="申请开始时间" end-placeholder="申请结束时间"
+            value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="申请开始时间" end-placeholder="申请结束时间" clearable
           />
         </search-item>
       </search-area>
diff --git a/src/views/business/subpackage/check/list.vue b/src/views/business/subpackage/check/list.vue
index 51ea419..a8b6744 100644
--- a/src/views/business/subpackage/check/list.vue
+++ b/src/views/business/subpackage/check/list.vue
@@ -111,8 +111,6 @@
 
 // 时间变更
 watch(timeRange, (val) => {
-  console.log(val[0])
-
   if (val) {
     listQuery.value.checkStartTime = `${val[0]}`
     listQuery.value.checkEndTime = `${val[1]}`
@@ -345,7 +343,8 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="timeRange" type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
+            v-model="timeRange"
+            clearable type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="验收开始时间" end-placeholder="验收结束时间"
           />
         </search-item>
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 98f4a39..a0db900 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -68,6 +68,7 @@
   else {
     listQuery.value.startTime = ''
     listQuery.value.endTime = ''
+    timeRange.value = ['', '']
   }
 })
 // 多选发生改变时
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index 6e41a94..ac98b8a 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -56,7 +56,17 @@
 const checkoutList = ref<string[]>([])
 // 文件上传input
 const fileRef = ref()
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -64,8 +74,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getSampleList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index 92e4b4a..6f465fc 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -67,7 +67,17 @@
     certificationStatusMap.value[`${item.value}`] = item.name
   })
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -75,8 +85,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getSampleList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IOvertimeList) => {
       return {
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index dbaa437..14464bf 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -86,6 +86,17 @@
     width: 160,
   },
 ]) // 表格
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 const fetchData = (isNowPage = false) => {
   loadingTable.value = true
@@ -93,8 +104,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.processResult = active.value
   getApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 60d1454..d0236cc 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -105,7 +105,17 @@
     align: 'center',
   },
 ])
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 const fetchData = (isNowPage = false) => {
   loadingTable.value = true
@@ -113,8 +123,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.approvalStatus = active.value
   getApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index aeb568e..5430b0f 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -103,10 +103,21 @@
 // 装载时间数组
 const checkTime = ref<string>('')
 const loadingTable = ref(false)
+// 时间变更
+watch(checkTime, (val) => {
+  if (val) {
+    listQuery.value.checkStartDate = `${val[0]}`
+    listQuery.value.checkEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.checkStartDate = ''
+    listQuery.value.checkEndDate = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.checkStartDate = checkTime.value[0] || ''
-  listQuery.value.checkEndDate = checkTime.value[1] || ''
+  // listQuery.value.checkStartDate = checkTime.value[0] || ''
+  // listQuery.value.checkEndDate = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 6229abf..9d30934 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -112,10 +112,21 @@
 // 装载时间数组
 const checkTime = ref('')
 const loadingTable = ref(false)
+// 时间变更
+watch(checkTime, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.startTime = checkTime.value[0] || ''
-  listQuery.value.endTime = checkTime.value[1] || ''
+  // listQuery.value.startTime = checkTime.value[0] || ''
+  // listQuery.value.endTime = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index daca294..de18467 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -66,6 +66,17 @@
 const checkoutList = ref<IManageChecklist[]>([])
 // 文件上传input
 const fileRef = ref()
+// 时间变更
+watch(checkDate, (val) => {
+  if (val) {
+    listQuery.value.checkStartDate = `${val[0]}`
+    listQuery.value.checkEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.checkStartDate = ''
+    listQuery.value.checkEndDate = ''
+  }
+})
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
@@ -73,8 +84,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.checkStartDate = checkDate.value[0] || ''
-  listQuery.value.checkEndDate = checkDate.value[1] || ''
+  // listQuery.value.checkStartDate = checkDate.value[0] || ''
+  // listQuery.value.checkEndDate = checkDate.value[1] || ''
   getcheckInfoList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: any) => {
       return {
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 00d283c..50b014c 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -99,6 +99,17 @@
     approvalStatusReserveMap.value[item.name] = `${item.value}`
   })
 }
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -106,8 +117,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.approvalStatus = active.value
   getReceiveApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/receive/solve/solveList.vue b/src/views/device/receive/solve/solveList.vue
index 809c0c1..ec1e8bb 100644
--- a/src/views/device/receive/solve/solveList.vue
+++ b/src/views/device/receive/solve/solveList.vue
@@ -120,7 +120,17 @@
   timeRange.value = ['', ''] // 把时间选择框置空
   fetchData(true)
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -128,8 +138,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getReceiveApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IsolveListType) => {
       return {
diff --git a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
index 4744536..b4fe085 100644
--- a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
@@ -43,7 +43,12 @@
   select.value = -1
   listPageApi(listQuery.value).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows
+      list.value = res.data.rows.map((item: { effectiveStatusName: string }) => {
+        return {
+          ...item,
+          isDisabled: item.effectiveStatusName === '已废止',
+        }
+      })
       total.value = res.data.total
     }
   })
@@ -142,7 +147,7 @@
           </el-table-column>
           <el-table-column label="" width="55" align="center" fixed="left">
             <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
+              <el-radio v-model="select" :disabled="scope.row.isDisabled" :label="scope.$index" class="radio" />
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index a030dcf..0dd5547 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -94,12 +94,34 @@
 const preparation = ref<string>('')
 // 到期开始以及结束
 const validTime = ref<string>('')
+// 筹建日期变更
+watch(preparation, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
+// 有效日期变更
+watch(validTime, (val) => {
+  if (val) {
+    listQuery.value.validStartTime = `${val[0]}`
+    listQuery.value.validEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.validStartTime = ''
+    listQuery.value.validEndTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.preparationStartDate = preparation.value[0] || ''
-  listQuery.value.preparationEndDate = preparation.value[1] || ''
-  listQuery.value.validStartTime = validTime.value[0] || ''
-  listQuery.value.validEndTime = validTime.value[1] || ''
+  // listQuery.value.preparationStartDate = preparation.value[0] || ''
+  // listQuery.value.preparationEndDate = preparation.value[1] || ''
+  // listQuery.value.validStartTime = validTime.value[0] || ''
+  // listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index 39d8683..bb69fe9 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -99,6 +99,17 @@
 const standardManagerStateList = ref<IOptions[]>([])
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
+// 时间变更
+watch(preparationDate, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
@@ -107,8 +118,8 @@
     listQuery.value.offset = 1
   }
   // 筹建日期
-  listQuery.value.preparationStartDate = preparationDate.value[0] || ''
-  listQuery.value.preparationEndDate = preparationDate.value[1] || ''
+  // listQuery.value.preparationStartDate = preparationDate.value[0] || ''
+  // listQuery.value.preparationEndDate = preparationDate.value[1] || ''
   getStandardList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: any) => {
       return {
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 37205fc..edf9dd7 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -793,7 +793,7 @@
             保存
           </el-button>
           <!-- 待审批 -->
-          <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'agree' })">
+          <!-- <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'agree' })">
             同意
           </el-button>
           <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'reject' })">
@@ -801,7 +801,7 @@
           </el-button>
           <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'refuse' })">
             拒绝
-          </el-button>
+          </el-button> -->
           <!-- </template> -->
         </template>
         <el-button v-if="(title === '详情' && $route.query?.approvalStatusName === '草稿箱' && isCancel)" type="primary" @click="editForm">
diff --git a/src/views/finance/businessSettlement/list.vue b/src/views/finance/businessSettlement/list.vue
index e942abb..9543947 100644
--- a/src/views/finance/businessSettlement/list.vue
+++ b/src/views/finance/businessSettlement/list.vue
@@ -43,6 +43,7 @@
 const list = ref<IList[]>([]) // 表格数据
 // 选中的内容
 const checkoutList = ref<string[]>([])
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
diff --git a/src/views/finance/contract/list.vue b/src/views/finance/contract/list.vue
index 7dcdca5..5f8eb4e 100644
--- a/src/views/finance/contract/list.vue
+++ b/src/views/finance/contract/list.vue
@@ -59,6 +59,17 @@
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 选中的内容
 const checkoutList = ref<string[]>([])
+// 时间变更
+watch(dateRange, (val) => {
+  if (val) {
+    listQuery.value.estimateSignStartDate = `${val[0]}`
+    listQuery.value.estimateSignEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.estimateSignStartDate = ''
+    listQuery.value.estimateSignEndDate = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -66,8 +77,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.estimateSignStartDate = dateRange.value[0] as string || ''
-  listQuery.value.estimateSignEndDate = dateRange.value[1] as string || ''
+  // listQuery.value.estimateSignStartDate = dateRange.value[0] as string || ''
+  // listQuery.value.estimateSignEndDate = dateRange.value[1] as string || ''
   getContractList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: { estimateSignDate: string; agreementAmount: number }) => {
       return {
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 1bce5f9..07b2296 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,7 +1,7 @@
-<!-- 新增或详情弹窗 -->
+<!-- 新增或详情 -->
 <script lang="ts" setup name="addNotice">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
@@ -15,6 +15,7 @@
 import { SCHEDULE } from '@/utils/scheduleDict'
 const $route = useRoute()
 const $router = useRouter()
+const submitId = ref('') // 提交id-保存接口获取
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
 const fileTypeName = ref('')
@@ -40,12 +41,12 @@
   formId: SCHEDULE.FILE_APPROVAL,
 }) // 表单
 const rules = ref<FormRules>({
-  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
-  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
-  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
-  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
-  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+  fileName: [{ required: true, message: '名称必填', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建必填', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位必填', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间必填', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人必填', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号必填', trigger: 'blur' }],
 }) // 表单验证规则
 
 const userList = ref<userType[]>([]) // 可使用人列表
@@ -57,12 +58,14 @@
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
-const PubList = ref<deptType[]>([])
+const PubList = ref([]) as any// 发布单位列表
 const PubListTree = ref([])
 // 获取发布单位列表
 const getPubList = () => {
   getDeptTreeList().then((res) => {
     PubList.value = res.data
+    console.log('0000', 'ppp', PubList.value)
+
     PubListTree.value = toTreeList(res.data, '0', true)
   })
 }
@@ -113,43 +116,57 @@
   effectiveStatusName.value = ''
 }
 // 提交
-const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+const saveForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
-    `确认${flag}吗？`,
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then((res) => {
+        const publisherId = ruleForm.publisher
+        const index = PubList.value.findIndex((item: { id: string }) => item.id === publisherId)
+        if (index !== -1) {
+          ruleForm.publisher = PubList.value[index].name as string
+        }
+        // 保存（草稿箱）
+        confirmDrafts(ruleForm).then((res) => {
+          ruleForm.fileNo = res.data.fileNo
+          submitId.value = res.data.id
+          ElMessage.success('保存成功')
+          // formEl?.resetFields()
+          // $router.go(-1)
+          close()
+        })
+      })
+    }
+  })
+}
+const submitForm = () => {
+  if (!submitId.value) {
+    ElMessage.warning('请先保存')
+    return false
+  }
+  ElMessageBox.confirm(
+    '确认提交吗？',
     '提示',
     {
       confirmButtonText: '确认',
       cancelButtonText: '取消',
       type: 'warning',
     },
-      ).then((res) => {
-        if (flag === '提交') {
-          confirmDrafts(ruleForm).then((res) => {
-            if (res.code === 200) {
-              console.log(res.data, '保存成功')
-              submitFile({ id: res.data.id, formId: SCHEDULE.FILE_APPROVAL }).then((res) => {
-                formEl?.resetFields()
-                ElMessage.success('提交成功')
-                $router.go(-1)
-                close()
-              })
-            }
-          })
-        }
-        else {
-          // 保存（草稿箱）
-          confirmDrafts(ruleForm).then((res) => {
-            ElMessage.success('保存成功')
-            formEl?.resetFields()
-            $router.go(-1)
-            close()
-          })
-        }
-      })
-    }
+  ).then((res) => {
+    submitFile({ id: submitId.value, formId: SCHEDULE.FILE_APPROVAL }).then((res) => {
+    // formEl?.resetFields()
+      ElMessage.success('已提交')
+      $router.go(-1)
+      close()
+    })
   })
 }
 // 取消
@@ -163,9 +180,14 @@
 const onFileChange = (event: any) => {
   // 原生上传
   // console.log(event.target.files)
+
   if (event.target.files?.length !== 0) {
     // 创建formdata对象
     const fd = new FormData()
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
@@ -173,9 +195,11 @@
         // 重置当前验证
         ruleFormRef.value?.clearValidate('minioFileName')
         ElMessage.success('文件上传成功')
+        loading.close()
       }
       else {
         ElMessage.error(res.message)
+        loading.close()
       }
     })
   }
@@ -215,10 +239,10 @@
   <app-container style="overflow: hidden;">
     <detail-page :title="`${fileTypeName}-${title}`">
       <template #btns>
-        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm()">
           提交
         </el-button>
-        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
+        <el-button v-if="title !== '详情'" type="primary" @click="saveForm(ruleFormRef)">
           保存
         </el-button>
         <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -258,7 +282,7 @@
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
                 style="width: 100%;"
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 135d059..c2b46c0 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -1,6 +1,7 @@
 <!-- 文件审批公共模板 -->
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { DateModelType } from 'element-plus'
 import type { TableRow } from './approve-interface'
 import type { fileResType } from '@/views/measure/file/file-interface'
 import { printJSON } from '@/utils/printUtils'
@@ -32,12 +33,13 @@
 const approvalStatusReserveMap = ref({ ...props.approvalStatusReserveMap }) // 审批状态字典{草稿箱: 1}
 const activeTitle = ref('') // active对应的审批状态名字
 
-const searchQuery = reactive({
+const searchQuery = ref({
   fileNo: '', // 编号
   fileName: '', // 名称
   fileCode: '', // 文件号
   createUser: '', // 创建人
-  createTime: '', // 创建
+  createStartTime: '', // 创建开始时间
+  createEndTime: '', // 创建结束时间
   approvalStatus: approvalStatus.value, // 审批状态
   limit: 20,
   offset: 1,
@@ -49,18 +51,31 @@
 const total = ref<number>(0) // 数据总条数
 const columns = ref<TableColumn[]>([
   { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
+  { text: '编号', value: 'fileNo', align: 'center', width: '160' },
   { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
+  { text: '类别', value: 'fileTypeName', align: 'center' },
   { text: '创建人', value: 'createUser', align: 'center' },
-  { text: '创建时间', value: 'createTime', align: 'center' },
-  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110' },
 ]) // 表格
 const list = ref<TableRow[]>([]) // 表格数据
+// 筛选时间段数据
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    searchQuery.value.createStartTime = `${val[0]}`
+    searchQuery.value.createEndTime = `${val[1]}`
+  }
+  else {
+    searchQuery.value.createStartTime = ''
+    searchQuery.value.createEndTime = ''
+  }
+})
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
-  approvallistPageApi(searchQuery).then((res) => {
+  approvallistPageApi(searchQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows.map((item: TableRow) => {
         return {
@@ -85,10 +100,10 @@
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
-    searchQuery.limit = val.size
+    searchQuery.value.limit = val.size
   }
   if (val && val.page) {
-    searchQuery.offset = val.page
+    searchQuery.value.offset = val.page
   }
   getList()
 }
@@ -216,12 +231,21 @@
 }
 // 重置
 const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.fileType = ''
-  searchQuery.createTime = ''
-  searchQuery.createUser = ''
+  searchQuery.value = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    fileCode: '', // 文件号
+    createUser: '', // 创建人
+    createStartTime: '', // 创建开始时间
+    createEndTime: '', // 创建结束时间
+    approvalStatus: approvalStatus.value, // 审批状态
+    limit: 20,
+    offset: 1,
+    fileType: '', // 文件类别
+    formId: SCHEDULE.FILE_APPROVAL,
+    ids: [] as string[],
+  }
+  timeRange.value = ['', '']
   getList()
 }
 // 表格被选中的行
@@ -230,27 +254,6 @@
 const multiSelect = (row: TableRow[]) => {
   selectList.value = row
 }
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  searchQuery.ids = []
-  if (selectList.value.length) {
-    selectList.value.forEach((item) => {
-      searchQuery.ids?.push(item.id as string)
-    })
-  }
-  exportFileApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
-    exportFile(res.data, props.name)
-    loading.close()
-    searchQuery.ids = []
-  }).catch((_) => {
-    loading.close()
-  })
-}
 // 打印
 function printList() {
   const selectIds = selectList.value.map(item => item.id)
@@ -278,8 +281,8 @@
   sessionStorage.setItem('approveFileMenu', props.name)
   approvalStatus.value = approvalStatusReserveMap.value[props.name]
   // approvalStatus.value = approvalStatusReserveMap.value[props.name] // 失效
-  searchQuery.approvalStatus = approvalStatusReserveMap.value[props.name] || '0'
-  $router.currentRoute.value.query.cacheActive = searchQuery.approvalStatus
+  searchQuery.value.approvalStatus = approvalStatusReserveMap.value[props.name] || '0'
+  $router.currentRoute.value.query.cacheActive = searchQuery.value.approvalStatus
   getList()
   // 缓存名称
 }, { deep: true, immediate: true })
@@ -312,8 +315,14 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss" placeholder="创建时间"
+            v-model="timeRange"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="创建开始时间"
+            end-placeholder="创建结束时间"
+            clearable
+            style="width: 360px;"
           />
         </search-item>
         <search-item>
@@ -323,10 +332,6 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <icon-button
-            v-if="proxy.hasPerm('/file/approve/export')" icon="icon-export" title="导出"
-            @click="exportExcelBtn"
-          />
           <icon-button v-if="proxy.hasPerm('/file/approve/print')" icon="icon-print" title="打印" @click="printList" />
         </template>
         <!-- 表格区域 -->
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 9dd3633..de9e080 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -85,7 +85,7 @@
 const getStatus = () => {
   getDictByCode('effectiveStatus').then((res) => {
     if (res.code === 200) {
-      effectiveStatusSelect.value = [...res.data, { name: '全部', value: '', id: 'quanbu' }]
+      effectiveStatusSelect.value = res.data
     }
   })
 }
@@ -373,8 +373,8 @@
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/add`)" icon="icon-add" title="新建" @click="add" />
-          <icon-button v-if="proxy.hasPerm(`/file/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
-          <icon-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <!-- <icon-button v-if="proxy.hasPerm(`/file/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" /> -->
+          <!-- <icon-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" /> -->
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/print`)" icon="icon-print" title="打印" @click="printList" />
         </template>
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 3510056..ed3ab8c 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -282,8 +282,8 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/measure/price/import')" icon="icon-import" title="批量导入" type="primary" />
-        <icon-button v-if="proxy.hasPerm('/measure/price/mould')" icon="icon-template" title="模板下载" type="primary" />
+        <!-- <icon-button v-if="proxy.hasPerm('/measure/price/import')" icon="icon-import" title="批量导入" type="primary" /> -->
+        <!-- <icon-button v-if="proxy.hasPerm('/measure/price/mould')" icon="icon-template" title="模板下载" type="primary" /> -->
         <icon-button v-if="proxy.hasPerm('/measure/price/add')" icon="icon-add" title="新建" type="primary" @click="add" />
         <icon-button v-if="proxy.hasPerm('/measure/price/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/measure/price/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 60eeebb..7b6f4ec 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -61,7 +61,8 @@
   categoryName: [{ required: true, message: '类别不能为空', trigger: ['blur', 'change'] }],
   itemName: [{ required: true, message: '项目不能为空', trigger: ['blur', 'change'] }],
   priceStandardName: [{ required: true, message: '依据标准不能为空', trigger: ['blur', 'change'] }],
-  price: [{ required: true, message: '标准价格不能为空', trigger: ['blur', 'change'] }],
+  price: [{ required: true, message: '标准价格不能为空', trigger: ['blur', 'change'] },
+    { pattern: /^(?!0+(?:\.0+)?$)(?:[1-9]\d*|0)(?:\.\d{1,2})?$/, message: '要求不小于0，且最多保留两位小数', trigger: ['blur', 'change'] }],
   operatorDiscountPermission: [{ required: true, message: '业务员折扣权限不能为空', trigger: ['blur', 'change'] }],
   directorDiscountPermission: [{ required: true, message: '负责人折扣权限不能为空', trigger: ['blur', 'change'] }],
 })
@@ -255,7 +256,7 @@
                   v-model.trim="formInline.priceStandardName"
                   clearable
                   :placeholder="pageType === 'detail' ? '' : '依据标准'"
-                  :disabled="pageType === 'detail'"
+                  disabled
                 >
                   <template v-if="pageType !== 'detail'" #append>
                     <el-button
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 5e62137..22d1d8a 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -24,16 +24,16 @@
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    // { name: '删除', type: 'danger' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    // { name: '删除', type: 'danger' },
     { name: '取消', type: 'info' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    // { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
+    { name: '删除', type: 'danger' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
@@ -41,9 +41,10 @@
   ],
   已取消: [
     { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
     { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
-
 }
 // 当前tab
 const currentTab = ref('全部')
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index d2fad4c..004b856 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -28,10 +28,6 @@
 const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  // 审批中状态时候长度返回错误
-  if (props.status === '3' || props.status === '6') {
-    props.buttons.length = 4 // 传递长度 + 判断条件下显示按钮长度
-  }
   return props.buttons.length * 40 + 23
 })
 
@@ -63,13 +59,13 @@
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '溯源供方编号', value: 'supplierNo', width: '160', align: 'center' },
-  { text: '溯源供方名称', value: 'supplierName', width: '120', align: 'center' },
+  { text: '溯源供方名称', value: 'supplierName', align: 'center' },
   { text: '业务内容', value: 'businessContent', align: 'center' },
   { text: '业务范围', value: 'businessScope', align: 'center' },
   { text: '负责人', value: 'director', align: 'center' },
   { text: '联系方式', value: 'phone', align: 'center' },
   { text: '地址', value: 'address', align: 'center' },
-  { text: '创建时间', value: 'name', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
   { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110px' },
 ])
 // 初始化路由
@@ -86,15 +82,20 @@
     listQuery.value.offset = 1
   }
   getapprovalListPage(listQuery.value).then((response) => {
-    list.value = response.data.rows
-    if (!companyAddress.value) {
-      companyAddress.value = [response.data.rows[0].companyCountry, response.data.rows[0].companyProvince, response.data.rows[0].companyCity, response.data.rows[0].companyArea, response.data.rows[0].companyAddress]
-    }
-    else if (isReset) {
-      companyAddress.value = [response.data.rows[0].companyCountry, response.data.rows[0].companyProvince, response.data.rows[0].companyCity, response.data.rows[0].companyArea, response.data.rows[0].companyAddress]
+    list.value = response.data.rows.map((item: { companyProvinceName: string; companyCityName: string }) => {
+      return {
+        ...item,
+        address: item.companyProvinceName === item.companyCityName ? item.companyCityName : item.companyProvinceName + item.companyCityName,
+      }
+    })
+    // if (!companyAddress.value) {
+    //   companyAddress.value = [response.data.rows[0].companyCountry, response.data.rows[0].companyProvince, response.data.rows[0].companyCity, response.data.rows[0].companyArea, response.data.rows[0].companyAddress]
+    // }
+    if (isReset) {
+      companyAddress.value = ['', '', '', '', '']
+      // companyAddress.value = [response.data.rows[0].companyCountry, response.data.rows[0].companyProvince, response.data.rows[0].companyCity, response.data.rows[0].companyArea, response.data.rows[0].companyAddress]
     }
     total.value = parseInt(response.data.total)
-    console.log(companyAddress.value)
     loadingTable.value = false
   }).catch((_) => {
     loadingTable.value = false
@@ -107,6 +108,7 @@
 }
 // 公司地址变化后给对象赋值
 function companyAddressChange(addressObj: IAddress) {
+  console.log('公司地址变化后给对象赋值')
   listQuery.value.companyCountry = addressObj.country
   listQuery.value.companyProvince = addressObj.province
   listQuery.value.companyCity = addressObj.city
@@ -191,30 +193,6 @@
   }
   fetchData(true, true)
 }
-// 导出
-const exportExcelBtn = () => {
-  const params: supplierExportQuery = {
-    approvalStatus: listQuery.value.approvalStatus,
-    businessContent: listQuery.value.businessContent,
-    companyArea: listQuery.value.companyArea,
-    companyCity: listQuery.value.companyCity,
-    companyProvince: listQuery.value.companyProvince,
-    formId: listQuery.value.formId,
-    supplierName: listQuery.value.supplierName,
-    supplierNo: listQuery.value.supplierNo,
-  }
-  if (checkoutList.value.length > 0) {
-    params.ids = checkoutList.value
-  }
-  // TODO: 审批列表导出
-  console.log(params)
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  loading.close()
-}
 
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -237,10 +215,7 @@
 const add = () => {
   $router.push('/source/add')
 }
-// 批量导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 审批结束回调
 const approvalSuccess = () => {
   fetchData(true)
@@ -259,7 +234,7 @@
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    sourceSubmit({ id: row.id, formId: SCHEDULE.SUPPLIER_APPROVAL }).then((res) => {
+    sourceSubmit({ id: row.id, formId: SCHEDULE.SUPPLIER_APPROVAL, processId: row.processId }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
@@ -311,7 +286,7 @@
   (newVal: string) => {
     console.log('change status', newVal)
     listQuery.value.approvalStatus = newVal
-    fetchData(false)
+    clearList()
   },
   { immediate: true })
 
@@ -429,7 +404,7 @@
                   编辑
                 </el-button>
                 <el-button
-                  v-if="row.approvalStatusName === '草稿箱' "
+                  v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                   size="small"
                   link
                   type="primary"
@@ -448,20 +423,8 @@
                 >
                   取消
                 </el-button>
-                <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-                <!-- <el-button
-                  v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
-                  size="small"
-                  link
-                  type="danger"
-                  :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-                  @click="clickBtn(row, '删除')"
-                >
-                  删除
-                </el-button> -->
-                <!-- ------------------------------------审批中的删除暂时去掉-------------------------------- -->
                 <el-button
-                  v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+                  v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/measure/source/components/sourceApprovalDetail.vue b/src/views/measure/source/components/sourceApprovalDetail.vue
index c507032..35683e7 100644
--- a/src/views/measure/source/components/sourceApprovalDetail.vue
+++ b/src/views/measure/source/components/sourceApprovalDetail.vue
@@ -8,12 +8,15 @@
 import { getSoucreListDetail } from '@/api/measure/source'
 import { cancelApproval, fetchApproval } from '@/api/approval'
 import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
-
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import type { IAddress } from '@/components/AddressSelect/address-interface'
+const approvalDialog = ref() // 审批对话ref
 const approvalRecord = ref() // 审批流程组件ref
 const infoId = ref('') // id
+const taskId = ref('') // 任务id 用于审批
+const processId = ref('') // 流程实例id
 const approvalType = ref('')
 const approvalStatusName = ref('') // 审批状态、控制草稿箱没有审批流程
-
 // 从路由中获取页面类型参数
 const $route = useRoute()
 if ($route.params && $route.params.type) {
@@ -70,8 +73,9 @@
   approvalStatus: '', // 审批状态
   approvalStatusName: '', // 审批状态名称
 })
-
-const traceSupplierPersonList: Ref<traceSupplierPerson[]> = ref([])
+const companyAddress = ref<string[]>([]) // 公司地址
+const invoiceAddress = ref<string[]>([]) // 开票地址
+const traceSupplierPersonList: Ref<traceSupplierPerson[]> = ref([]) // 人员列表
 const columns = [
   { text: '人员编号', value: 'personNo' },
   { text: '姓名', value: 'name' },
@@ -83,9 +87,15 @@
 const getInfo = () => {
   getSoucreListDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data
+    traceSupplierPersonList.value = res.data.traceSupplierPersonList
+    // for (const key in dataForm.value) {
+    //   dataForm.value[key] = res.data[key]
+    // }
+    companyAddress.value = [dataForm.value.companyCountryName, dataForm.value.companyProvinceName, dataForm.value.companyCityName, dataForm.value.companyAreaName, dataForm.value.companyAddress]
+    invoiceAddress.value = [dataForm.value.invoiceCountryName, dataForm.value.invoiceProvinceName, dataForm.value.invoiceCityName, dataForm.value.invoiceAreaName, dataForm.value.invoiceAddress]
   })
 }
-getInfo()
+
 // 初始化router
 const $router = useRouter()
 // 关闭新增页面的回调
@@ -106,12 +116,12 @@
 }
 // 审批结束回调
 const approvalSuccess = () => {
-  getInfo()
+  close() // 返回上一页
 }
 // 取消
 const handleCancel = () => {
   const params = {
-    processInstanceId: dataForm.value.processId!,
+    processInstanceId: processId.value!,
     comments: '取消审批',
   }
   ElMessageBox.confirm(
@@ -125,21 +135,21 @@
   ).then(() => {
     cancelApproval(params).then(() => {
       ElMessage.success('取消成功')
+      close()
     })
   })
 }
-const approvalDialog = ref()
 // 点击数据后的操作按钮
 const clickBtn = (buttonType: string) => {
   switch (buttonType) {
     case '同意':
-      approvalDialog.value.initDialog('agree', dataForm.value.taskId)
+      approvalDialog.value.initDialog('agree', taskId.value)
       break
     case '驳回':
-      approvalDialog.value.initDialog('reject', dataForm.value.taskId)
+      approvalDialog.value.initDialog('reject', taskId.value)
       break
     case '拒绝':
-      approvalDialog.value.initDialog('refuse', dataForm.value.taskId)
+      approvalDialog.value.initDialog('refuse', taskId.value)
       break
     case '取消':
       handleCancel()
@@ -148,10 +158,14 @@
 }
 onMounted(() => {
   dataForm.value.processId = $route.query.processId as string// 流程实例id
+  processId.value = $route.query.processId as string// 流程实例id
   approvalStatusName.value = $route.query.approvalStatusName as string
+  taskId.value = $route.query.taskId as string
+
   if (approvalStatusName.value !== '草稿箱') {
-    getApprovalRecord(dataForm.value.processId) // 查询审批记录
+    getApprovalRecord(processId.value) // 查询审批记录
   }
+  getInfo() // 获取详情
 })
 </script>
 
@@ -162,13 +176,13 @@
         <el-button v-if="approvalType === '2'" type="primary" @click="clickBtn('同意')">
           同意
         </el-button>
-        <el-button v-if="approvalType === '2'" type="primary" @click="clickBtn('拒绝')">
-          拒绝
-        </el-button>
         <el-button v-if="approvalType === '2'" type="primary" @click="clickBtn('驳回')">
           驳回
         </el-button>
-        <el-button v-if="approvalType === '3'" type="primary" @click="handleCancel()">
+        <el-button v-if="approvalType === '2'" type="danger" @click="clickBtn('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="approvalType === '3'" type="info" @click="handleCancel()">
           取消
         </el-button>
         <el-button type="info" @click="close">
@@ -201,6 +215,7 @@
       <!-- 审批流程 -->
       <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
     </detail-block>
+    <!-- 审批弹窗 -->
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index e352e61..cda7d0c 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -89,7 +89,7 @@
   getSoucreList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: ISupplier) => {
       if (item.companyProvinceName && item.companyCityName) {
-        item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
+        item.briefName = `${item.companyProvinceName}${item.companyCityName}`
       }
       else {
         item.briefName = item.companyProvinceName || item.companyCityName
@@ -184,9 +184,10 @@
   })
   if (list.value.length > 0) {
     const params = {
-      supplierNo: '', // 业务内容
-      supplierName: '', // 溯源供方名称
-      businessContent: '', // 溯源供方编号
+      supplierNo: listQuery.value.supplierNo, // 业务内容
+      supplierName: listQuery.value.supplierName, // 溯源供方名称
+      businessContent: listQuery.value.businessContent, // 溯源供方编号
+      formId: SCHEDULE.SUPPLIER_APPROVAL,
       ids: checkoutList.value,
     }
     exportSourceList(params).then((res) => {
@@ -256,8 +257,8 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
-        <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" />
+        <!-- <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" /> -->
+        <!-- <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" /> -->
         <icon-button v-if="proxy.hasPerm('/measure/measureSource/add')" icon="icon-add" title="新建" type="primary" @click="add" />
         <icon-button v-if="proxy.hasPerm('/measure/measureSource/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/measure/measureSource/print')" icon="icon-print" title="打印" type="primary" @click="printList" />

diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..9cf2b29 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -28,6 +28,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    DeptSelectByName: typeof import('./components/DeptSelectByName/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
diff --git a/src/views/business/board/standardReminder/list.vue b/src/views/business/board/standardReminder/list.vue
index 85efbb1..fd60743 100644
--- a/src/views/business/board/standardReminder/list.vue
+++ b/src/views/business/board/standardReminder/list.vue
@@ -94,12 +94,33 @@
 const preparation = ref<string>('')
 // 到期开始以及结束
 const validTime = ref<string>('')
+watch(preparation, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
+// 有效日期变更
+watch(validTime, (val) => {
+  if (val) {
+    listQuery.value.validStartTime = `${val[0]}`
+    listQuery.value.validEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.validStartTime = ''
+    listQuery.value.validEndTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.preparationStartDate = preparation.value[0] || ''
-  listQuery.value.preparationEndDate = preparation.value[1] || ''
-  listQuery.value.validStartTime = validTime.value[0] || ''
-  listQuery.value.validEndTime = validTime.value[1] || ''
+  // listQuery.value.preparationStartDate = preparation.value[0] || ''
+  // listQuery.value.preparationEndDate = preparation.value[1] || ''
+  // listQuery.value.validStartTime = validTime.value[0] || ''
+  // listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -223,16 +244,16 @@
   })
   if (list.value.length > 0) {
     const params = {
-      category: '', // 类别
-      id: '', // 主键id
-      managerState: '', // 管理状态
-      preparationEndDate: '', // 结束时间
-      preparationStartDate: '', // 开始时间
-      standardLaboratory: '', // 标准所在部门
-      standardName: '', // 标准名称
-      standardNo: '', // 标准编号
-      validEndTime: '', // 结束时间
-      validStartTime: '', // 开始时间
+      category: listQuery.value.category, // 类别
+      id: listQuery.value.id, // 主键id
+      managerState: listQuery.value.managerState, // 管理状态
+      preparationEndDate: listQuery.value.preparationEndDate, // 结束时间
+      preparationStartDate: listQuery.value.preparationStartDate, // 开始时间
+      standardLaboratory: listQuery.value.standardLaboratory, // 标准所在部门
+      standardName: listQuery.value.standardName, // 标准名称
+      standardNo: listQuery.value.standardNo, // 标准编号
+      validEndTime: listQuery.value.validEndTime, // 结束时间
+      validStartTime: listQuery.value.validStartTime, // 开始时间
       offset: 1, // 当前页
       limit: 20, // 每页多少条
       ids: checkoutList.value,
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 8666957..37ac73f 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -137,7 +137,7 @@
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  distributeDialogRef.value.initDialog(row.id, row.sampleId, row.orderId)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId, row.sampleStatus)
 }
 // 点击标签绑定
 const barCodeBind = ref()
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 807ea30..4e4eb46 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -37,11 +37,21 @@
   { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
   { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
 ])
-
+// 时间变更
+watch(trainTime, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 查询列表
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.startTime = trainTime.value[0] || ''
-  listQuery.value.endTime = trainTime.value[1] || ''
+  // listQuery.value.startTime = trainTime.value[0] || ''
+  // listQuery.value.endTime = trainTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2f7c1d0..bccde84 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -139,7 +139,17 @@
     id: '2', // 后端规定已收入传2
   })
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -147,8 +157,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.sampleStatus = active.value
   getInterChangeList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IinterchangeList) => {
@@ -280,7 +290,7 @@
       else if (type === 'delete') { // 无需检测
         interchangeStatusChange({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '7' }).then((res) => {
           if (res.code === 200) {
-            ElMessage.success(`已${title}`)
+            ElMessage.success('操作成功')
             fetchData(true)
           }
         })
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList.vue b/src/views/business/schedule/interchangeReceipt/receiptList.vue
index 275a053..83d93f4 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptList.vue
@@ -42,7 +42,17 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -50,8 +60,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getReceiptList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -124,13 +134,13 @@
   })
   if (list.value.length > 0) {
     const params = {
-      interchangeCode: '', // 交接单编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      reciever: '', // 接收人
-      deliverer: '', // 送样人
-      startTime: '', // 交接开始时间
-      endTime: '', // 交接结束时间
+      interchangeCode: listQuery.value.interchangeCode, // 交接单编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      reciever: listQuery.value.reciever, // 接收人
+      deliverer: listQuery.value.deliverer, // 送样人
+      startTime: listQuery.value.startTime, // 交接开始时间
+      endTime: listQuery.value.endTime, // 交接结束时间
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index cf0b532..f2fc852 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -26,8 +26,8 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   deliverer: '', // 送样人
-  isUrgent: 2, // 是否加急 2全部 1是 0否
-  status: 0, // 接收状态
+  isUrgent: '', // 是否加急 2全部 1是 0否
+  status: '', // 接收状态
   offset: 1,
   limit: 20,
 })
@@ -70,11 +70,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    isUrgentMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 2, // 是否加急全部后端定为2
-    })
+    // isUrgentMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 2, // 是否加急全部后端定为2
+    // })
   })
   // 接收状态
   getDictByCode('orderStatus').then((response) => {
@@ -85,11 +85,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    statusMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 0,
-    })
+    // statusMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 0,
+    // })
     console.log(statusMap.value)
   })
 }
@@ -125,8 +125,8 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     deliverer: '', // 送样人
-    isUrgent: 2, // 是否加急
-    status: 0, // 接收状态
+    isUrgent: '', // 是否加急 2全部 1是 0否
+    status: '', // 接收状态
     offset: 1,
     limit: 20,
   }
@@ -191,12 +191,12 @@
   })
   if (list.value.length > 0) {
     const params = {
-      orderCode: '', // 委托书编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      deliverer: '', // 送样人
-      isUrgent: 2, // 是否加急
-      status: 0, // 接收状态
+      orderCode: listQuery.value.orderCode, // 委托书编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      deliverer: listQuery.value.deliverer, // 送样人
+      isUrgent: listQuery.value.isUrgent, // 是否加急
+      status: listQuery.value.status, // 接收状态
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 2d92da9..14cd1ce 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -6,7 +6,7 @@
   customerName: string // 委托方名称
   deliverer: string // 送样人
   isUrgent: number | string // 是否加急
-  status: number // 接收状态
+  status: number | string// 接收状态
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 50308c7..25c5cf9 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -53,6 +53,7 @@
   handOutProperty: string // 分发性质-初次分发、退回分发
   id?: string // 实验室id
   customerId?: string // 客户id
+  certificationState?: string // 证书出具
 }
 
 // 实验室检测/我的检测列表
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index 7c17365..7159350 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -1,6 +1,6 @@
 <!-- 任务分发 -->
 <script lang="ts" setup name="TaskEdit">
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
 import ProcessConfig from './components/processConfig.vue'
@@ -11,6 +11,7 @@
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { UploadFile } from '@/api/measure/file'
 import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 interface dictType {
   id: string
@@ -251,16 +252,22 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    // UploadFile(fd).then((res) => {
-    //   if (res.code === 200) {
-    //     sampleForm.value.minioFileName = res.data[0]
-    //     // 重置当前验证
-    //     ElMessage.success('文件上传成功')
-    //   }
-    //   else {
-    //     ElMessage.error(res.message)
-    //   }
-    // })
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        sampleForm.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+        loading.close()
+      }
+      else {
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    })
   }
 }
 const upload = () => {
@@ -402,7 +409,7 @@
               <el-form-item label="校检类别:">
                 <el-select
                   v-model="sampleForm.measureCategory"
-                  :placeholder="roleType === 'detail' ? '' : '请选择校检类别'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择校检类别'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -424,7 +431,7 @@
               <el-form-item label="厂家国别:">
                 <el-select
                   v-model="sampleForm.manufacturerCountry"
-                  :placeholder="roleType === 'detail' ? '' : '请选择厂家国别'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择厂家国别'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -450,7 +457,7 @@
               <el-form-item label="ABC:">
                 <el-select
                   v-model="sampleForm.abc"
-                  :placeholder="roleType === 'detail' ? '' : '请选择ABC'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择ABC'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -504,8 +511,8 @@
               <el-form-item label="备注:">
                 <el-input
                   v-model="sampleForm.remark"
+                  autosize
                   type="textarea"
-                  :rows="2"
                   :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
                   :class="{ 'detail-input': roleType === 'detail' }"
@@ -516,7 +523,7 @@
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="sampleForm.measureType"
-                  :placeholder="roleType === 'detail' ? '' : '请选择检定方式'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择检定方式'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index dfbbf6a..6eeff55 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -81,7 +81,7 @@
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '165px' },
   { text: '样品属性', value: 'sampleBelongName', width: '100', align: 'center' },
   { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '90' },
-  { text: '证书出具', value: 'certificationState', align: 'center', width: '90', filter: (row: ITaskList) => { return `${row.alreadyCertifications}/${row.requireCertifications}` } },
+  { text: '证书出具', value: 'certificationState', align: 'center', width: '90' },
 ])
 // 表格数据
 const list = ref<ITaskList[]>([])
@@ -104,6 +104,7 @@
   getTaskList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: ITaskList) => {
       item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      item.certificationState = `${item.alreadyCertifications}/${item.requireCertifications}`
       return item
     })
     total.value = response.data.total
diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue
index e44dd67..194de53 100644
--- a/src/views/business/subpackage/apply/list.vue
+++ b/src/views/business/subpackage/apply/list.vue
@@ -302,7 +302,7 @@
         <search-item>
           <el-date-picker
             v-model="timeRange" type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="申请开始时间" end-placeholder="申请结束时间"
+            value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="申请开始时间" end-placeholder="申请结束时间" clearable
           />
         </search-item>
       </search-area>
diff --git a/src/views/business/subpackage/check/list.vue b/src/views/business/subpackage/check/list.vue
index 51ea419..a8b6744 100644
--- a/src/views/business/subpackage/check/list.vue
+++ b/src/views/business/subpackage/check/list.vue
@@ -111,8 +111,6 @@
 
 // 时间变更
 watch(timeRange, (val) => {
-  console.log(val[0])
-
   if (val) {
     listQuery.value.checkStartTime = `${val[0]}`
     listQuery.value.checkEndTime = `${val[1]}`
@@ -345,7 +343,8 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="timeRange" type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
+            v-model="timeRange"
+            clearable type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="验收开始时间" end-placeholder="验收结束时间"
           />
         </search-item>
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 98f4a39..a0db900 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -68,6 +68,7 @@
   else {
     listQuery.value.startTime = ''
     listQuery.value.endTime = ''
+    timeRange.value = ['', '']
   }
 })
 // 多选发生改变时
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index 6e41a94..ac98b8a 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -56,7 +56,17 @@
 const checkoutList = ref<string[]>([])
 // 文件上传input
 const fileRef = ref()
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -64,8 +74,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getSampleList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index 92e4b4a..6f465fc 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -67,7 +67,17 @@
     certificationStatusMap.value[`${item.value}`] = item.name
   })
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -75,8 +85,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getSampleList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IOvertimeList) => {
       return {
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index dbaa437..14464bf 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -86,6 +86,17 @@
     width: 160,
   },
 ]) // 表格
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 const fetchData = (isNowPage = false) => {
   loadingTable.value = true
@@ -93,8 +104,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.processResult = active.value
   getApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 60d1454..d0236cc 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -105,7 +105,17 @@
     align: 'center',
   },
 ])
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 const fetchData = (isNowPage = false) => {
   loadingTable.value = true
@@ -113,8 +123,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.approvalStatus = active.value
   getApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index aeb568e..5430b0f 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -103,10 +103,21 @@
 // 装载时间数组
 const checkTime = ref<string>('')
 const loadingTable = ref(false)
+// 时间变更
+watch(checkTime, (val) => {
+  if (val) {
+    listQuery.value.checkStartDate = `${val[0]}`
+    listQuery.value.checkEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.checkStartDate = ''
+    listQuery.value.checkEndDate = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.checkStartDate = checkTime.value[0] || ''
-  listQuery.value.checkEndDate = checkTime.value[1] || ''
+  // listQuery.value.checkStartDate = checkTime.value[0] || ''
+  // listQuery.value.checkEndDate = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 6229abf..9d30934 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -112,10 +112,21 @@
 // 装载时间数组
 const checkTime = ref('')
 const loadingTable = ref(false)
+// 时间变更
+watch(checkTime, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.startTime = checkTime.value[0] || ''
-  listQuery.value.endTime = checkTime.value[1] || ''
+  // listQuery.value.startTime = checkTime.value[0] || ''
+  // listQuery.value.endTime = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index daca294..de18467 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -66,6 +66,17 @@
 const checkoutList = ref<IManageChecklist[]>([])
 // 文件上传input
 const fileRef = ref()
+// 时间变更
+watch(checkDate, (val) => {
+  if (val) {
+    listQuery.value.checkStartDate = `${val[0]}`
+    listQuery.value.checkEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.checkStartDate = ''
+    listQuery.value.checkEndDate = ''
+  }
+})
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
@@ -73,8 +84,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.checkStartDate = checkDate.value[0] || ''
-  listQuery.value.checkEndDate = checkDate.value[1] || ''
+  // listQuery.value.checkStartDate = checkDate.value[0] || ''
+  // listQuery.value.checkEndDate = checkDate.value[1] || ''
   getcheckInfoList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: any) => {
       return {
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 00d283c..50b014c 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -99,6 +99,17 @@
     approvalStatusReserveMap.value[item.name] = `${item.value}`
   })
 }
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -106,8 +117,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.approvalStatus = active.value
   getReceiveApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/receive/solve/solveList.vue b/src/views/device/receive/solve/solveList.vue
index 809c0c1..ec1e8bb 100644
--- a/src/views/device/receive/solve/solveList.vue
+++ b/src/views/device/receive/solve/solveList.vue
@@ -120,7 +120,17 @@
   timeRange.value = ['', ''] // 把时间选择框置空
   fetchData(true)
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -128,8 +138,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getReceiveApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IsolveListType) => {
       return {
diff --git a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
index 4744536..b4fe085 100644
--- a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
@@ -43,7 +43,12 @@
   select.value = -1
   listPageApi(listQuery.value).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows
+      list.value = res.data.rows.map((item: { effectiveStatusName: string }) => {
+        return {
+          ...item,
+          isDisabled: item.effectiveStatusName === '已废止',
+        }
+      })
       total.value = res.data.total
     }
   })
@@ -142,7 +147,7 @@
           </el-table-column>
           <el-table-column label="" width="55" align="center" fixed="left">
             <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
+              <el-radio v-model="select" :disabled="scope.row.isDisabled" :label="scope.$index" class="radio" />
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index a030dcf..0dd5547 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -94,12 +94,34 @@
 const preparation = ref<string>('')
 // 到期开始以及结束
 const validTime = ref<string>('')
+// 筹建日期变更
+watch(preparation, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
+// 有效日期变更
+watch(validTime, (val) => {
+  if (val) {
+    listQuery.value.validStartTime = `${val[0]}`
+    listQuery.value.validEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.validStartTime = ''
+    listQuery.value.validEndTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.preparationStartDate = preparation.value[0] || ''
-  listQuery.value.preparationEndDate = preparation.value[1] || ''
-  listQuery.value.validStartTime = validTime.value[0] || ''
-  listQuery.value.validEndTime = validTime.value[1] || ''
+  // listQuery.value.preparationStartDate = preparation.value[0] || ''
+  // listQuery.value.preparationEndDate = preparation.value[1] || ''
+  // listQuery.value.validStartTime = validTime.value[0] || ''
+  // listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index 39d8683..bb69fe9 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -99,6 +99,17 @@
 const standardManagerStateList = ref<IOptions[]>([])
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
+// 时间变更
+watch(preparationDate, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
@@ -107,8 +118,8 @@
     listQuery.value.offset = 1
   }
   // 筹建日期
-  listQuery.value.preparationStartDate = preparationDate.value[0] || ''
-  listQuery.value.preparationEndDate = preparationDate.value[1] || ''
+  // listQuery.value.preparationStartDate = preparationDate.value[0] || ''
+  // listQuery.value.preparationEndDate = preparationDate.value[1] || ''
   getStandardList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: any) => {
       return {
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 37205fc..edf9dd7 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -793,7 +793,7 @@
             保存
           </el-button>
           <!-- 待审批 -->
-          <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'agree' })">
+          <!-- <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'agree' })">
             同意
           </el-button>
           <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'reject' })">
@@ -801,7 +801,7 @@
           </el-button>
           <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'refuse' })">
             拒绝
-          </el-button>
+          </el-button> -->
           <!-- </template> -->
         </template>
         <el-button v-if="(title === '详情' && $route.query?.approvalStatusName === '草稿箱' && isCancel)" type="primary" @click="editForm">
diff --git a/src/views/finance/businessSettlement/list.vue b/src/views/finance/businessSettlement/list.vue
index e942abb..9543947 100644
--- a/src/views/finance/businessSettlement/list.vue
+++ b/src/views/finance/businessSettlement/list.vue
@@ -43,6 +43,7 @@
 const list = ref<IList[]>([]) // 表格数据
 // 选中的内容
 const checkoutList = ref<string[]>([])
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
diff --git a/src/views/finance/contract/list.vue b/src/views/finance/contract/list.vue
index 7dcdca5..5f8eb4e 100644
--- a/src/views/finance/contract/list.vue
+++ b/src/views/finance/contract/list.vue
@@ -59,6 +59,17 @@
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 选中的内容
 const checkoutList = ref<string[]>([])
+// 时间变更
+watch(dateRange, (val) => {
+  if (val) {
+    listQuery.value.estimateSignStartDate = `${val[0]}`
+    listQuery.value.estimateSignEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.estimateSignStartDate = ''
+    listQuery.value.estimateSignEndDate = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -66,8 +77,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.estimateSignStartDate = dateRange.value[0] as string || ''
-  listQuery.value.estimateSignEndDate = dateRange.value[1] as string || ''
+  // listQuery.value.estimateSignStartDate = dateRange.value[0] as string || ''
+  // listQuery.value.estimateSignEndDate = dateRange.value[1] as string || ''
   getContractList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: { estimateSignDate: string; agreementAmount: number }) => {
       return {
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 1bce5f9..07b2296 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,7 +1,7 @@
-<!-- 新增或详情弹窗 -->
+<!-- 新增或详情 -->
 <script lang="ts" setup name="addNotice">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
@@ -15,6 +15,7 @@
 import { SCHEDULE } from '@/utils/scheduleDict'
 const $route = useRoute()
 const $router = useRouter()
+const submitId = ref('') // 提交id-保存接口获取
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
 const fileTypeName = ref('')
@@ -40,12 +41,12 @@
   formId: SCHEDULE.FILE_APPROVAL,
 }) // 表单
 const rules = ref<FormRules>({
-  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
-  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
-  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
-  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
-  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+  fileName: [{ required: true, message: '名称必填', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建必填', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位必填', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间必填', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人必填', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号必填', trigger: 'blur' }],
 }) // 表单验证规则
 
 const userList = ref<userType[]>([]) // 可使用人列表
@@ -57,12 +58,14 @@
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
-const PubList = ref<deptType[]>([])
+const PubList = ref([]) as any// 发布单位列表
 const PubListTree = ref([])
 // 获取发布单位列表
 const getPubList = () => {
   getDeptTreeList().then((res) => {
     PubList.value = res.data
+    console.log('0000', 'ppp', PubList.value)
+
     PubListTree.value = toTreeList(res.data, '0', true)
   })
 }
@@ -113,43 +116,57 @@
   effectiveStatusName.value = ''
 }
 // 提交
-const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+const saveForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
-    `确认${flag}吗？`,
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then((res) => {
+        const publisherId = ruleForm.publisher
+        const index = PubList.value.findIndex((item: { id: string }) => item.id === publisherId)
+        if (index !== -1) {
+          ruleForm.publisher = PubList.value[index].name as string
+        }
+        // 保存（草稿箱）
+        confirmDrafts(ruleForm).then((res) => {
+          ruleForm.fileNo = res.data.fileNo
+          submitId.value = res.data.id
+          ElMessage.success('保存成功')
+          // formEl?.resetFields()
+          // $router.go(-1)
+          close()
+        })
+      })
+    }
+  })
+}
+const submitForm = () => {
+  if (!submitId.value) {
+    ElMessage.warning('请先保存')
+    return false
+  }
+  ElMessageBox.confirm(
+    '确认提交吗？',
     '提示',
     {
       confirmButtonText: '确认',
       cancelButtonText: '取消',
       type: 'warning',
     },
-      ).then((res) => {
-        if (flag === '提交') {
-          confirmDrafts(ruleForm).then((res) => {
-            if (res.code === 200) {
-              console.log(res.data, '保存成功')
-              submitFile({ id: res.data.id, formId: SCHEDULE.FILE_APPROVAL }).then((res) => {
-                formEl?.resetFields()
-                ElMessage.success('提交成功')
-                $router.go(-1)
-                close()
-              })
-            }
-          })
-        }
-        else {
-          // 保存（草稿箱）
-          confirmDrafts(ruleForm).then((res) => {
-            ElMessage.success('保存成功')
-            formEl?.resetFields()
-            $router.go(-1)
-            close()
-          })
-        }
-      })
-    }
+  ).then((res) => {
+    submitFile({ id: submitId.value, formId: SCHEDULE.FILE_APPROVAL }).then((res) => {
+    // formEl?.resetFields()
+      ElMessage.success('已提交')
+      $router.go(-1)
+      close()
+    })
   })
 }
 // 取消
@@ -163,9 +180,14 @@
 const onFileChange = (event: any) => {
   // 原生上传
   // console.log(event.target.files)
+
   if (event.target.files?.length !== 0) {
     // 创建formdata对象
     const fd = new FormData()
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
@@ -173,9 +195,11 @@
         // 重置当前验证
         ruleFormRef.value?.clearValidate('minioFileName')
         ElMessage.success('文件上传成功')
+        loading.close()
       }
       else {
         ElMessage.error(res.message)
+        loading.close()
       }
     })
   }
@@ -215,10 +239,10 @@
   <app-container style="overflow: hidden;">
     <detail-page :title="`${fileTypeName}-${title}`">
       <template #btns>
-        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm()">
           提交
         </el-button>
-        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
+        <el-button v-if="title !== '详情'" type="primary" @click="saveForm(ruleFormRef)">
           保存
         </el-button>
         <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -258,7 +282,7 @@
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
                 style="width: 100%;"
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 135d059..c2b46c0 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -1,6 +1,7 @@
 <!-- 文件审批公共模板 -->
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { DateModelType } from 'element-plus'
 import type { TableRow } from './approve-interface'
 import type { fileResType } from '@/views/measure/file/file-interface'
 import { printJSON } from '@/utils/printUtils'
@@ -32,12 +33,13 @@
 const approvalStatusReserveMap = ref({ ...props.approvalStatusReserveMap }) // 审批状态字典{草稿箱: 1}
 const activeTitle = ref('') // active对应的审批状态名字
 
-const searchQuery = reactive({
+const searchQuery = ref({
   fileNo: '', // 编号
   fileName: '', // 名称
   fileCode: '', // 文件号
   createUser: '', // 创建人
-  createTime: '', // 创建
+  createStartTime: '', // 创建开始时间
+  createEndTime: '', // 创建结束时间
   approvalStatus: approvalStatus.value, // 审批状态
   limit: 20,
   offset: 1,
@@ -49,18 +51,31 @@
 const total = ref<number>(0) // 数据总条数
 const columns = ref<TableColumn[]>([
   { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
+  { text: '编号', value: 'fileNo', align: 'center', width: '160' },
   { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
+  { text: '类别', value: 'fileTypeName', align: 'center' },
   { text: '创建人', value: 'createUser', align: 'center' },
-  { text: '创建时间', value: 'createTime', align: 'center' },
-  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110' },
 ]) // 表格
 const list = ref<TableRow[]>([]) // 表格数据
+// 筛选时间段数据
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    searchQuery.value.createStartTime = `${val[0]}`
+    searchQuery.value.createEndTime = `${val[1]}`
+  }
+  else {
+    searchQuery.value.createStartTime = ''
+    searchQuery.value.createEndTime = ''
+  }
+})
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
-  approvallistPageApi(searchQuery).then((res) => {
+  approvallistPageApi(searchQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows.map((item: TableRow) => {
         return {
@@ -85,10 +100,10 @@
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
-    searchQuery.limit = val.size
+    searchQuery.value.limit = val.size
   }
   if (val && val.page) {
-    searchQuery.offset = val.page
+    searchQuery.value.offset = val.page
   }
   getList()
 }
@@ -216,12 +231,21 @@
 }
 // 重置
 const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.fileType = ''
-  searchQuery.createTime = ''
-  searchQuery.createUser = ''
+  searchQuery.value = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    fileCode: '', // 文件号
+    createUser: '', // 创建人
+    createStartTime: '', // 创建开始时间
+    createEndTime: '', // 创建结束时间
+    approvalStatus: approvalStatus.value, // 审批状态
+    limit: 20,
+    offset: 1,
+    fileType: '', // 文件类别
+    formId: SCHEDULE.FILE_APPROVAL,
+    ids: [] as string[],
+  }
+  timeRange.value = ['', '']
   getList()
 }
 // 表格被选中的行
@@ -230,27 +254,6 @@
 const multiSelect = (row: TableRow[]) => {
   selectList.value = row
 }
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  searchQuery.ids = []
-  if (selectList.value.length) {
-    selectList.value.forEach((item) => {
-      searchQuery.ids?.push(item.id as string)
-    })
-  }
-  exportFileApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
-    exportFile(res.data, props.name)
-    loading.close()
-    searchQuery.ids = []
-  }).catch((_) => {
-    loading.close()
-  })
-}
 // 打印
 function printList() {
   const selectIds = selectList.value.map(item => item.id)
@@ -278,8 +281,8 @@
   sessionStorage.setItem('approveFileMenu', props.name)
   approvalStatus.value = approvalStatusReserveMap.value[props.name]
   // approvalStatus.value = approvalStatusReserveMap.value[props.name] // 失效
-  searchQuery.approvalStatus = approvalStatusReserveMap.value[props.name] || '0'
-  $router.currentRoute.value.query.cacheActive = searchQuery.approvalStatus
+  searchQuery.value.approvalStatus = approvalStatusReserveMap.value[props.name] || '0'
+  $router.currentRoute.value.query.cacheActive = searchQuery.value.approvalStatus
   getList()
   // 缓存名称
 }, { deep: true, immediate: true })
@@ -312,8 +315,14 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss" placeholder="创建时间"
+            v-model="timeRange"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="创建开始时间"
+            end-placeholder="创建结束时间"
+            clearable
+            style="width: 360px;"
           />
         </search-item>
         <search-item>
@@ -323,10 +332,6 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <icon-button
-            v-if="proxy.hasPerm('/file/approve/export')" icon="icon-export" title="导出"
-            @click="exportExcelBtn"
-          />
           <icon-button v-if="proxy.hasPerm('/file/approve/print')" icon="icon-print" title="打印" @click="printList" />
         </template>
         <!-- 表格区域 -->
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 9dd3633..de9e080 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -85,7 +85,7 @@
 const getStatus = () => {
   getDictByCode('effectiveStatus').then((res) => {
     if (res.code === 200) {
-      effectiveStatusSelect.value = [...res.data, { name: '全部', value: '', id: 'quanbu' }]
+      effectiveStatusSelect.value = res.data
     }
   })
 }
@@ -373,8 +373,8 @@
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/add`)" icon="icon-add" title="新建" @click="add" />
-          <icon-button v-if="proxy.hasPerm(`/file/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
-          <icon-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <!-- <icon-button v-if="proxy.hasPerm(`/file/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" /> -->
+          <!-- <icon-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" /> -->
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/print`)" icon="icon-print" title="打印" @click="printList" />
         </template>
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 3510056..ed3ab8c 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -282,8 +282,8 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/measure/price/import')" icon="icon-import" title="批量导入" type="primary" />
-        <icon-button v-if="proxy.hasPerm('/measure/price/mould')" icon="icon-template" title="模板下载" type="primary" />
+        <!-- <icon-button v-if="proxy.hasPerm('/measure/price/import')" icon="icon-import" title="批量导入" type="primary" /> -->
+        <!-- <icon-button v-if="proxy.hasPerm('/measure/price/mould')" icon="icon-template" title="模板下载" type="primary" /> -->
         <icon-button v-if="proxy.hasPerm('/measure/price/add')" icon="icon-add" title="新建" type="primary" @click="add" />
         <icon-button v-if="proxy.hasPerm('/measure/price/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/measure/price/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 60eeebb..7b6f4ec 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -61,7 +61,8 @@
   categoryName: [{ required: true, message: '类别不能为空', trigger: ['blur', 'change'] }],
   itemName: [{ required: true, message: '项目不能为空', trigger: ['blur', 'change'] }],
   priceStandardName: [{ required: true, message: '依据标准不能为空', trigger: ['blur', 'change'] }],
-  price: [{ required: true, message: '标准价格不能为空', trigger: ['blur', 'change'] }],
+  price: [{ required: true, message: '标准价格不能为空', trigger: ['blur', 'change'] },
+    { pattern: /^(?!0+(?:\.0+)?$)(?:[1-9]\d*|0)(?:\.\d{1,2})?$/, message: '要求不小于0，且最多保留两位小数', trigger: ['blur', 'change'] }],
   operatorDiscountPermission: [{ required: true, message: '业务员折扣权限不能为空', trigger: ['blur', 'change'] }],
   directorDiscountPermission: [{ required: true, message: '负责人折扣权限不能为空', trigger: ['blur', 'change'] }],
 })
@@ -255,7 +256,7 @@
                   v-model.trim="formInline.priceStandardName"
                   clearable
                   :placeholder="pageType === 'detail' ? '' : '依据标准'"
-                  :disabled="pageType === 'detail'"
+                  disabled
                 >
                   <template v-if="pageType !== 'detail'" #append>
                     <el-button
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 5e62137..22d1d8a 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -24,16 +24,16 @@
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    // { name: '删除', type: 'danger' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    // { name: '删除', type: 'danger' },
     { name: '取消', type: 'info' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    // { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
+    { name: '删除', type: 'danger' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
@@ -41,9 +41,10 @@
   ],
   已取消: [
     { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
     { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
-
 }
 // 当前tab
 const currentTab = ref('全部')
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index d2fad4c..004b856 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -28,10 +28,6 @@
 const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  // 审批中状态时候长度返回错误
-  if (props.status === '3' || props.status === '6') {
-    props.buttons.length = 4 // 传递长度 + 判断条件下显示按钮长度
-  }
   return props.buttons.length * 40 + 23
 })
 
@@ -63,13 +59,13 @@
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '溯源供方编号', value: 'supplierNo', width: '160', align: 'center' },
-  { text: '溯源供方名称', value: 'supplierName', width: '120', align: 'center' },
+  { text: '溯源供方名称', value: 'supplierName', align: 'center' },
   { text: '业务内容', value: 'businessContent', align: 'center' },
   { text: '业务范围', value: 'businessScope', align: 'center' },
   { text: '负责人', value: 'director', align: 'center' },
   { text: '联系方式', value: 'phone', align: 'center' },
   { text: '地址', value: 'address', align: 'center' },
-  { text: '创建时间', value: 'name', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
   { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110px' },
 ])
 // 初始化路由
@@ -86,15 +82,20 @@
     listQuery.value.offset = 1
   }
   getapprovalListPage(listQuery.value).then((response) => {
-    list.value = response.data.rows
-    if (!companyAddress.value) {
-      companyAddress.value = [response.data.rows[0].companyCountry, response.data.rows[0].companyProvince, response.data.rows[0].companyCity, response.data.rows[0].companyArea, response.data.rows[0].companyAddress]
-    }
-    else if (isReset) {
-      companyAddress.value = [response.data.rows[0].companyCountry, response.data.rows[0].companyProvince, response.data.rows[0].companyCity, response.data.rows[0].companyArea, response.data.rows[0].companyAddress]
+    list.value = response.data.rows.map((item: { companyProvinceName: string; companyCityName: string }) => {
+      return {
+        ...item,
+        address: item.companyProvinceName === item.companyCityName ? item.companyCityName : item.companyProvinceName + item.companyCityName,
+      }
+    })
+    // if (!companyAddress.value) {
+    //   companyAddress.value = [response.data.rows[0].companyCountry, response.data.rows[0].companyProvince, response.data.rows[0].companyCity, response.data.rows[0].companyArea, response.data.rows[0].companyAddress]
+    // }
+    if (isReset) {
+      companyAddress.value = ['', '', '', '', '']
+      // companyAddress.value = [response.data.rows[0].companyCountry, response.data.rows[0].companyProvince, response.data.rows[0].companyCity, response.data.rows[0].companyArea, response.data.rows[0].companyAddress]
     }
     total.value = parseInt(response.data.total)
-    console.log(companyAddress.value)
     loadingTable.value = false
   }).catch((_) => {
     loadingTable.value = false
@@ -107,6 +108,7 @@
 }
 // 公司地址变化后给对象赋值
 function companyAddressChange(addressObj: IAddress) {
+  console.log('公司地址变化后给对象赋值')
   listQuery.value.companyCountry = addressObj.country
   listQuery.value.companyProvince = addressObj.province
   listQuery.value.companyCity = addressObj.city
@@ -191,30 +193,6 @@
   }
   fetchData(true, true)
 }
-// 导出
-const exportExcelBtn = () => {
-  const params: supplierExportQuery = {
-    approvalStatus: listQuery.value.approvalStatus,
-    businessContent: listQuery.value.businessContent,
-    companyArea: listQuery.value.companyArea,
-    companyCity: listQuery.value.companyCity,
-    companyProvince: listQuery.value.companyProvince,
-    formId: listQuery.value.formId,
-    supplierName: listQuery.value.supplierName,
-    supplierNo: listQuery.value.supplierNo,
-  }
-  if (checkoutList.value.length > 0) {
-    params.ids = checkoutList.value
-  }
-  // TODO: 审批列表导出
-  console.log(params)
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  loading.close()
-}
 
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -237,10 +215,7 @@
 const add = () => {
   $router.push('/source/add')
 }
-// 批量导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 审批结束回调
 const approvalSuccess = () => {
   fetchData(true)
@@ -259,7 +234,7 @@
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    sourceSubmit({ id: row.id, formId: SCHEDULE.SUPPLIER_APPROVAL }).then((res) => {
+    sourceSubmit({ id: row.id, formId: SCHEDULE.SUPPLIER_APPROVAL, processId: row.processId }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
@@ -311,7 +286,7 @@
   (newVal: string) => {
     console.log('change status', newVal)
     listQuery.value.approvalStatus = newVal
-    fetchData(false)
+    clearList()
   },
   { immediate: true })
 
@@ -429,7 +404,7 @@
                   编辑
                 </el-button>
                 <el-button
-                  v-if="row.approvalStatusName === '草稿箱' "
+                  v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                   size="small"
                   link
                   type="primary"
@@ -448,20 +423,8 @@
                 >
                   取消
                 </el-button>
-                <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-                <!-- <el-button
-                  v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
-                  size="small"
-                  link
-                  type="danger"
-                  :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-                  @click="clickBtn(row, '删除')"
-                >
-                  删除
-                </el-button> -->
-                <!-- ------------------------------------审批中的删除暂时去掉-------------------------------- -->
                 <el-button
-                  v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+                  v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/measure/source/components/sourceApprovalDetail.vue b/src/views/measure/source/components/sourceApprovalDetail.vue
index c507032..35683e7 100644
--- a/src/views/measure/source/components/sourceApprovalDetail.vue
+++ b/src/views/measure/source/components/sourceApprovalDetail.vue
@@ -8,12 +8,15 @@
 import { getSoucreListDetail } from '@/api/measure/source'
 import { cancelApproval, fetchApproval } from '@/api/approval'
 import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
-
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import type { IAddress } from '@/components/AddressSelect/address-interface'
+const approvalDialog = ref() // 审批对话ref
 const approvalRecord = ref() // 审批流程组件ref
 const infoId = ref('') // id
+const taskId = ref('') // 任务id 用于审批
+const processId = ref('') // 流程实例id
 const approvalType = ref('')
 const approvalStatusName = ref('') // 审批状态、控制草稿箱没有审批流程
-
 // 从路由中获取页面类型参数
 const $route = useRoute()
 if ($route.params && $route.params.type) {
@@ -70,8 +73,9 @@
   approvalStatus: '', // 审批状态
   approvalStatusName: '', // 审批状态名称
 })
-
-const traceSupplierPersonList: Ref<traceSupplierPerson[]> = ref([])
+const companyAddress = ref<string[]>([]) // 公司地址
+const invoiceAddress = ref<string[]>([]) // 开票地址
+const traceSupplierPersonList: Ref<traceSupplierPerson[]> = ref([]) // 人员列表
 const columns = [
   { text: '人员编号', value: 'personNo' },
   { text: '姓名', value: 'name' },
@@ -83,9 +87,15 @@
 const getInfo = () => {
   getSoucreListDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data
+    traceSupplierPersonList.value = res.data.traceSupplierPersonList
+    // for (const key in dataForm.value) {
+    //   dataForm.value[key] = res.data[key]
+    // }
+    companyAddress.value = [dataForm.value.companyCountryName, dataForm.value.companyProvinceName, dataForm.value.companyCityName, dataForm.value.companyAreaName, dataForm.value.companyAddress]
+    invoiceAddress.value = [dataForm.value.invoiceCountryName, dataForm.value.invoiceProvinceName, dataForm.value.invoiceCityName, dataForm.value.invoiceAreaName, dataForm.value.invoiceAddress]
   })
 }
-getInfo()
+
 // 初始化router
 const $router = useRouter()
 // 关闭新增页面的回调
@@ -106,12 +116,12 @@
 }
 // 审批结束回调
 const approvalSuccess = () => {
-  getInfo()
+  close() // 返回上一页
 }
 // 取消
 const handleCancel = () => {
   const params = {
-    processInstanceId: dataForm.value.processId!,
+    processInstanceId: processId.value!,
     comments: '取消审批',
   }
   ElMessageBox.confirm(
@@ -125,21 +135,21 @@
   ).then(() => {
     cancelApproval(params).then(() => {
       ElMessage.success('取消成功')
+      close()
     })
   })
 }
-const approvalDialog = ref()
 // 点击数据后的操作按钮
 const clickBtn = (buttonType: string) => {
   switch (buttonType) {
     case '同意':
-      approvalDialog.value.initDialog('agree', dataForm.value.taskId)
+      approvalDialog.value.initDialog('agree', taskId.value)
       break
     case '驳回':
-      approvalDialog.value.initDialog('reject', dataForm.value.taskId)
+      approvalDialog.value.initDialog('reject', taskId.value)
       break
     case '拒绝':
-      approvalDialog.value.initDialog('refuse', dataForm.value.taskId)
+      approvalDialog.value.initDialog('refuse', taskId.value)
       break
     case '取消':
       handleCancel()
@@ -148,10 +158,14 @@
 }
 onMounted(() => {
   dataForm.value.processId = $route.query.processId as string// 流程实例id
+  processId.value = $route.query.processId as string// 流程实例id
   approvalStatusName.value = $route.query.approvalStatusName as string
+  taskId.value = $route.query.taskId as string
+
   if (approvalStatusName.value !== '草稿箱') {
-    getApprovalRecord(dataForm.value.processId) // 查询审批记录
+    getApprovalRecord(processId.value) // 查询审批记录
   }
+  getInfo() // 获取详情
 })
 </script>
 
@@ -162,13 +176,13 @@
         <el-button v-if="approvalType === '2'" type="primary" @click="clickBtn('同意')">
           同意
         </el-button>
-        <el-button v-if="approvalType === '2'" type="primary" @click="clickBtn('拒绝')">
-          拒绝
-        </el-button>
         <el-button v-if="approvalType === '2'" type="primary" @click="clickBtn('驳回')">
           驳回
         </el-button>
-        <el-button v-if="approvalType === '3'" type="primary" @click="handleCancel()">
+        <el-button v-if="approvalType === '2'" type="danger" @click="clickBtn('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="approvalType === '3'" type="info" @click="handleCancel()">
           取消
         </el-button>
         <el-button type="info" @click="close">
@@ -201,6 +215,7 @@
       <!-- 审批流程 -->
       <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
     </detail-block>
+    <!-- 审批弹窗 -->
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index e352e61..cda7d0c 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -89,7 +89,7 @@
   getSoucreList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: ISupplier) => {
       if (item.companyProvinceName && item.companyCityName) {
-        item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
+        item.briefName = `${item.companyProvinceName}${item.companyCityName}`
       }
       else {
         item.briefName = item.companyProvinceName || item.companyCityName
@@ -184,9 +184,10 @@
   })
   if (list.value.length > 0) {
     const params = {
-      supplierNo: '', // 业务内容
-      supplierName: '', // 溯源供方名称
-      businessContent: '', // 溯源供方编号
+      supplierNo: listQuery.value.supplierNo, // 业务内容
+      supplierName: listQuery.value.supplierName, // 溯源供方名称
+      businessContent: listQuery.value.businessContent, // 溯源供方编号
+      formId: SCHEDULE.SUPPLIER_APPROVAL,
       ids: checkoutList.value,
     }
     exportSourceList(params).then((res) => {
@@ -256,8 +257,8 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
-        <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" />
+        <!-- <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" /> -->
+        <!-- <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" /> -->
         <icon-button v-if="proxy.hasPerm('/measure/measureSource/add')" icon="icon-add" title="新建" type="primary" @click="add" />
         <icon-button v-if="proxy.hasPerm('/measure/measureSource/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/measure/measureSource/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index 939c80a..b107e3e 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -3,7 +3,7 @@
  * 添加/编辑/详情溯源供方
  */
 import type { Ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import baseInfoDetail from './components/baseInfoDetail.vue'
 import type { ISupplier, traceSupplierPerson } from './list_interface'
@@ -266,21 +266,12 @@
   })
 }
 
-// 提交表单
-const submitFunc = () => {
-// 再提交
-  const params = {
-    id: formInline.value.id,
-    formId: curFormId, // 表单id
-  }
-  sourceSubmit(params).then((res) => {
-    ElMessage.success('提交成功')
-    close()
-  })
-}
-
 // 点击提交
 const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formInline.value.id) {
+    ElMessage.warning('请先保存!')
+    return false
+  }
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
@@ -291,54 +282,14 @@
           type: 'warning',
         },
       ).then(() => {
-        if (!formInline.value.id) {
-          ElMessage.warning('请先保存!')
-          return false
+        const params = {
+          id: formInline.value.id,
+          formId: curFormId, // 表单id
         }
-        else {
-          const params = {
-            id: formInline.value.id,
-            formId: curFormId, // 表单id
-          }
-          sourceSubmit(params).then((res) => {
-            ElMessage.success('提交成功')
-            close()
-          })
-        }
-      //   if (from.value == 'reject') { // 驳回调用驳回编辑接口
-      //     failUpdateSourceApproval(formInline.value).then(() => {
-      //       ElMessage.success('提交成功!')
-      //     })
-      //   }
-      //   else {
-      //     // 如果id存在, 调用更新接口
-      //     if (formInline.value.id) {
-      //     // 如果表单变更过,先保存，再提交
-      //       if (isChanged.value) {
-      //         sourceDraftUpdate(formInline.value).then((res) => {
-      //           if (res.code === 200) {
-      //             submitFunc()
-      //           }
-      //           else {
-      //             ElMessage.error('保存失败，请重新保存后提交')
-      //           }
-      //         })
-      //       }
-      //       else { // 表单未变更过，直接提交
-      //         submitFunc()
-      //       }
-      //     }
-      //     else {
-      //     // id不存在，调用保存接口，再提交
-      //       sourceSave(formInline.value).then((res) => {
-      //         if (res.code === 200) {
-      //           formInline.value.id = res.data.id
-      //           formInline.value.supplierNo = res.data.supplierNo
-      //           submitFunc()
-      //         }
-      //       })
-      //     }
-      //   }
+        sourceSubmit(params).then((res) => {
+          ElMessage.success('提交成功')
+          close()
+        })
       })
     }
   })
@@ -352,13 +303,20 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
         formInline.value.minioFileName = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
+        loading.close()
       }
       else {
+        loading.close()
         ElMessage.error(res.message)
       }
     })
@@ -632,7 +590,6 @@
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
-        @row-dblclick="dblclickRow"
       >
         <el-table-column type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />

diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..9cf2b29 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -28,6 +28,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    DeptSelectByName: typeof import('./components/DeptSelectByName/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
diff --git a/src/views/business/board/standardReminder/list.vue b/src/views/business/board/standardReminder/list.vue
index 85efbb1..fd60743 100644
--- a/src/views/business/board/standardReminder/list.vue
+++ b/src/views/business/board/standardReminder/list.vue
@@ -94,12 +94,33 @@
 const preparation = ref<string>('')
 // 到期开始以及结束
 const validTime = ref<string>('')
+watch(preparation, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
+// 有效日期变更
+watch(validTime, (val) => {
+  if (val) {
+    listQuery.value.validStartTime = `${val[0]}`
+    listQuery.value.validEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.validStartTime = ''
+    listQuery.value.validEndTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.preparationStartDate = preparation.value[0] || ''
-  listQuery.value.preparationEndDate = preparation.value[1] || ''
-  listQuery.value.validStartTime = validTime.value[0] || ''
-  listQuery.value.validEndTime = validTime.value[1] || ''
+  // listQuery.value.preparationStartDate = preparation.value[0] || ''
+  // listQuery.value.preparationEndDate = preparation.value[1] || ''
+  // listQuery.value.validStartTime = validTime.value[0] || ''
+  // listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -223,16 +244,16 @@
   })
   if (list.value.length > 0) {
     const params = {
-      category: '', // 类别
-      id: '', // 主键id
-      managerState: '', // 管理状态
-      preparationEndDate: '', // 结束时间
-      preparationStartDate: '', // 开始时间
-      standardLaboratory: '', // 标准所在部门
-      standardName: '', // 标准名称
-      standardNo: '', // 标准编号
-      validEndTime: '', // 结束时间
-      validStartTime: '', // 开始时间
+      category: listQuery.value.category, // 类别
+      id: listQuery.value.id, // 主键id
+      managerState: listQuery.value.managerState, // 管理状态
+      preparationEndDate: listQuery.value.preparationEndDate, // 结束时间
+      preparationStartDate: listQuery.value.preparationStartDate, // 开始时间
+      standardLaboratory: listQuery.value.standardLaboratory, // 标准所在部门
+      standardName: listQuery.value.standardName, // 标准名称
+      standardNo: listQuery.value.standardNo, // 标准编号
+      validEndTime: listQuery.value.validEndTime, // 结束时间
+      validStartTime: listQuery.value.validStartTime, // 开始时间
       offset: 1, // 当前页
       limit: 20, // 每页多少条
       ids: checkoutList.value,
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 8666957..37ac73f 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -137,7 +137,7 @@
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  distributeDialogRef.value.initDialog(row.id, row.sampleId, row.orderId)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId, row.sampleStatus)
 }
 // 点击标签绑定
 const barCodeBind = ref()
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 807ea30..4e4eb46 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -37,11 +37,21 @@
   { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
   { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
 ])
-
+// 时间变更
+watch(trainTime, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 查询列表
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.startTime = trainTime.value[0] || ''
-  listQuery.value.endTime = trainTime.value[1] || ''
+  // listQuery.value.startTime = trainTime.value[0] || ''
+  // listQuery.value.endTime = trainTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2f7c1d0..bccde84 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -139,7 +139,17 @@
     id: '2', // 后端规定已收入传2
   })
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -147,8 +157,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.sampleStatus = active.value
   getInterChangeList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IinterchangeList) => {
@@ -280,7 +290,7 @@
       else if (type === 'delete') { // 无需检测
         interchangeStatusChange({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '7' }).then((res) => {
           if (res.code === 200) {
-            ElMessage.success(`已${title}`)
+            ElMessage.success('操作成功')
             fetchData(true)
           }
         })
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList.vue b/src/views/business/schedule/interchangeReceipt/receiptList.vue
index 275a053..83d93f4 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptList.vue
@@ -42,7 +42,17 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -50,8 +60,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getReceiptList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -124,13 +134,13 @@
   })
   if (list.value.length > 0) {
     const params = {
-      interchangeCode: '', // 交接单编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      reciever: '', // 接收人
-      deliverer: '', // 送样人
-      startTime: '', // 交接开始时间
-      endTime: '', // 交接结束时间
+      interchangeCode: listQuery.value.interchangeCode, // 交接单编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      reciever: listQuery.value.reciever, // 接收人
+      deliverer: listQuery.value.deliverer, // 送样人
+      startTime: listQuery.value.startTime, // 交接开始时间
+      endTime: listQuery.value.endTime, // 交接结束时间
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index cf0b532..f2fc852 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -26,8 +26,8 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   deliverer: '', // 送样人
-  isUrgent: 2, // 是否加急 2全部 1是 0否
-  status: 0, // 接收状态
+  isUrgent: '', // 是否加急 2全部 1是 0否
+  status: '', // 接收状态
   offset: 1,
   limit: 20,
 })
@@ -70,11 +70,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    isUrgentMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 2, // 是否加急全部后端定为2
-    })
+    // isUrgentMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 2, // 是否加急全部后端定为2
+    // })
   })
   // 接收状态
   getDictByCode('orderStatus').then((response) => {
@@ -85,11 +85,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    statusMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 0,
-    })
+    // statusMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 0,
+    // })
     console.log(statusMap.value)
   })
 }
@@ -125,8 +125,8 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     deliverer: '', // 送样人
-    isUrgent: 2, // 是否加急
-    status: 0, // 接收状态
+    isUrgent: '', // 是否加急 2全部 1是 0否
+    status: '', // 接收状态
     offset: 1,
     limit: 20,
   }
@@ -191,12 +191,12 @@
   })
   if (list.value.length > 0) {
     const params = {
-      orderCode: '', // 委托书编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      deliverer: '', // 送样人
-      isUrgent: 2, // 是否加急
-      status: 0, // 接收状态
+      orderCode: listQuery.value.orderCode, // 委托书编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      deliverer: listQuery.value.deliverer, // 送样人
+      isUrgent: listQuery.value.isUrgent, // 是否加急
+      status: listQuery.value.status, // 接收状态
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 2d92da9..14cd1ce 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -6,7 +6,7 @@
   customerName: string // 委托方名称
   deliverer: string // 送样人
   isUrgent: number | string // 是否加急
-  status: number // 接收状态
+  status: number | string// 接收状态
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 50308c7..25c5cf9 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -53,6 +53,7 @@
   handOutProperty: string // 分发性质-初次分发、退回分发
   id?: string // 实验室id
   customerId?: string // 客户id
+  certificationState?: string // 证书出具
 }
 
 // 实验室检测/我的检测列表
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index 7c17365..7159350 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -1,6 +1,6 @@
 <!-- 任务分发 -->
 <script lang="ts" setup name="TaskEdit">
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
 import ProcessConfig from './components/processConfig.vue'
@@ -11,6 +11,7 @@
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { UploadFile } from '@/api/measure/file'
 import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 interface dictType {
   id: string
@@ -251,16 +252,22 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    // UploadFile(fd).then((res) => {
-    //   if (res.code === 200) {
-    //     sampleForm.value.minioFileName = res.data[0]
-    //     // 重置当前验证
-    //     ElMessage.success('文件上传成功')
-    //   }
-    //   else {
-    //     ElMessage.error(res.message)
-    //   }
-    // })
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        sampleForm.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+        loading.close()
+      }
+      else {
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    })
   }
 }
 const upload = () => {
@@ -402,7 +409,7 @@
               <el-form-item label="校检类别:">
                 <el-select
                   v-model="sampleForm.measureCategory"
-                  :placeholder="roleType === 'detail' ? '' : '请选择校检类别'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择校检类别'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -424,7 +431,7 @@
               <el-form-item label="厂家国别:">
                 <el-select
                   v-model="sampleForm.manufacturerCountry"
-                  :placeholder="roleType === 'detail' ? '' : '请选择厂家国别'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择厂家国别'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -450,7 +457,7 @@
               <el-form-item label="ABC:">
                 <el-select
                   v-model="sampleForm.abc"
-                  :placeholder="roleType === 'detail' ? '' : '请选择ABC'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择ABC'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -504,8 +511,8 @@
               <el-form-item label="备注:">
                 <el-input
                   v-model="sampleForm.remark"
+                  autosize
                   type="textarea"
-                  :rows="2"
                   :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
                   :class="{ 'detail-input': roleType === 'detail' }"
@@ -516,7 +523,7 @@
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="sampleForm.measureType"
-                  :placeholder="roleType === 'detail' ? '' : '请选择检定方式'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择检定方式'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index dfbbf6a..6eeff55 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -81,7 +81,7 @@
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '165px' },
   { text: '样品属性', value: 'sampleBelongName', width: '100', align: 'center' },
   { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '90' },
-  { text: '证书出具', value: 'certificationState', align: 'center', width: '90', filter: (row: ITaskList) => { return `${row.alreadyCertifications}/${row.requireCertifications}` } },
+  { text: '证书出具', value: 'certificationState', align: 'center', width: '90' },
 ])
 // 表格数据
 const list = ref<ITaskList[]>([])
@@ -104,6 +104,7 @@
   getTaskList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: ITaskList) => {
       item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      item.certificationState = `${item.alreadyCertifications}/${item.requireCertifications}`
       return item
     })
     total.value = response.data.total
diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue
index e44dd67..194de53 100644
--- a/src/views/business/subpackage/apply/list.vue
+++ b/src/views/business/subpackage/apply/list.vue
@@ -302,7 +302,7 @@
         <search-item>
           <el-date-picker
             v-model="timeRange" type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="申请开始时间" end-placeholder="申请结束时间"
+            value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="申请开始时间" end-placeholder="申请结束时间" clearable
           />
         </search-item>
       </search-area>
diff --git a/src/views/business/subpackage/check/list.vue b/src/views/business/subpackage/check/list.vue
index 51ea419..a8b6744 100644
--- a/src/views/business/subpackage/check/list.vue
+++ b/src/views/business/subpackage/check/list.vue
@@ -111,8 +111,6 @@
 
 // 时间变更
 watch(timeRange, (val) => {
-  console.log(val[0])
-
   if (val) {
     listQuery.value.checkStartTime = `${val[0]}`
     listQuery.value.checkEndTime = `${val[1]}`
@@ -345,7 +343,8 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="timeRange" type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
+            v-model="timeRange"
+            clearable type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="验收开始时间" end-placeholder="验收结束时间"
           />
         </search-item>
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 98f4a39..a0db900 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -68,6 +68,7 @@
   else {
     listQuery.value.startTime = ''
     listQuery.value.endTime = ''
+    timeRange.value = ['', '']
   }
 })
 // 多选发生改变时
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index 6e41a94..ac98b8a 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -56,7 +56,17 @@
 const checkoutList = ref<string[]>([])
 // 文件上传input
 const fileRef = ref()
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -64,8 +74,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getSampleList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index 92e4b4a..6f465fc 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -67,7 +67,17 @@
     certificationStatusMap.value[`${item.value}`] = item.name
   })
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -75,8 +85,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getSampleList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IOvertimeList) => {
       return {
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index dbaa437..14464bf 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -86,6 +86,17 @@
     width: 160,
   },
 ]) // 表格
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 const fetchData = (isNowPage = false) => {
   loadingTable.value = true
@@ -93,8 +104,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.processResult = active.value
   getApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 60d1454..d0236cc 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -105,7 +105,17 @@
     align: 'center',
   },
 ])
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 const fetchData = (isNowPage = false) => {
   loadingTable.value = true
@@ -113,8 +123,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.approvalStatus = active.value
   getApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index aeb568e..5430b0f 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -103,10 +103,21 @@
 // 装载时间数组
 const checkTime = ref<string>('')
 const loadingTable = ref(false)
+// 时间变更
+watch(checkTime, (val) => {
+  if (val) {
+    listQuery.value.checkStartDate = `${val[0]}`
+    listQuery.value.checkEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.checkStartDate = ''
+    listQuery.value.checkEndDate = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.checkStartDate = checkTime.value[0] || ''
-  listQuery.value.checkEndDate = checkTime.value[1] || ''
+  // listQuery.value.checkStartDate = checkTime.value[0] || ''
+  // listQuery.value.checkEndDate = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 6229abf..9d30934 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -112,10 +112,21 @@
 // 装载时间数组
 const checkTime = ref('')
 const loadingTable = ref(false)
+// 时间变更
+watch(checkTime, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.startTime = checkTime.value[0] || ''
-  listQuery.value.endTime = checkTime.value[1] || ''
+  // listQuery.value.startTime = checkTime.value[0] || ''
+  // listQuery.value.endTime = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index daca294..de18467 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -66,6 +66,17 @@
 const checkoutList = ref<IManageChecklist[]>([])
 // 文件上传input
 const fileRef = ref()
+// 时间变更
+watch(checkDate, (val) => {
+  if (val) {
+    listQuery.value.checkStartDate = `${val[0]}`
+    listQuery.value.checkEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.checkStartDate = ''
+    listQuery.value.checkEndDate = ''
+  }
+})
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
@@ -73,8 +84,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.checkStartDate = checkDate.value[0] || ''
-  listQuery.value.checkEndDate = checkDate.value[1] || ''
+  // listQuery.value.checkStartDate = checkDate.value[0] || ''
+  // listQuery.value.checkEndDate = checkDate.value[1] || ''
   getcheckInfoList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: any) => {
       return {
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 00d283c..50b014c 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -99,6 +99,17 @@
     approvalStatusReserveMap.value[item.name] = `${item.value}`
   })
 }
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -106,8 +117,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.approvalStatus = active.value
   getReceiveApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/receive/solve/solveList.vue b/src/views/device/receive/solve/solveList.vue
index 809c0c1..ec1e8bb 100644
--- a/src/views/device/receive/solve/solveList.vue
+++ b/src/views/device/receive/solve/solveList.vue
@@ -120,7 +120,17 @@
   timeRange.value = ['', ''] // 把时间选择框置空
   fetchData(true)
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -128,8 +138,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getReceiveApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IsolveListType) => {
       return {
diff --git a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
index 4744536..b4fe085 100644
--- a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
@@ -43,7 +43,12 @@
   select.value = -1
   listPageApi(listQuery.value).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows
+      list.value = res.data.rows.map((item: { effectiveStatusName: string }) => {
+        return {
+          ...item,
+          isDisabled: item.effectiveStatusName === '已废止',
+        }
+      })
       total.value = res.data.total
     }
   })
@@ -142,7 +147,7 @@
           </el-table-column>
           <el-table-column label="" width="55" align="center" fixed="left">
             <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
+              <el-radio v-model="select" :disabled="scope.row.isDisabled" :label="scope.$index" class="radio" />
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index a030dcf..0dd5547 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -94,12 +94,34 @@
 const preparation = ref<string>('')
 // 到期开始以及结束
 const validTime = ref<string>('')
+// 筹建日期变更
+watch(preparation, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
+// 有效日期变更
+watch(validTime, (val) => {
+  if (val) {
+    listQuery.value.validStartTime = `${val[0]}`
+    listQuery.value.validEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.validStartTime = ''
+    listQuery.value.validEndTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.preparationStartDate = preparation.value[0] || ''
-  listQuery.value.preparationEndDate = preparation.value[1] || ''
-  listQuery.value.validStartTime = validTime.value[0] || ''
-  listQuery.value.validEndTime = validTime.value[1] || ''
+  // listQuery.value.preparationStartDate = preparation.value[0] || ''
+  // listQuery.value.preparationEndDate = preparation.value[1] || ''
+  // listQuery.value.validStartTime = validTime.value[0] || ''
+  // listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index 39d8683..bb69fe9 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -99,6 +99,17 @@
 const standardManagerStateList = ref<IOptions[]>([])
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
+// 时间变更
+watch(preparationDate, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
@@ -107,8 +118,8 @@
     listQuery.value.offset = 1
   }
   // 筹建日期
-  listQuery.value.preparationStartDate = preparationDate.value[0] || ''
-  listQuery.value.preparationEndDate = preparationDate.value[1] || ''
+  // listQuery.value.preparationStartDate = preparationDate.value[0] || ''
+  // listQuery.value.preparationEndDate = preparationDate.value[1] || ''
   getStandardList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: any) => {
       return {
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 37205fc..edf9dd7 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -793,7 +793,7 @@
             保存
           </el-button>
           <!-- 待审批 -->
-          <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'agree' })">
+          <!-- <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'agree' })">
             同意
           </el-button>
           <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'reject' })">
@@ -801,7 +801,7 @@
           </el-button>
           <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'refuse' })">
             拒绝
-          </el-button>
+          </el-button> -->
           <!-- </template> -->
         </template>
         <el-button v-if="(title === '详情' && $route.query?.approvalStatusName === '草稿箱' && isCancel)" type="primary" @click="editForm">
diff --git a/src/views/finance/businessSettlement/list.vue b/src/views/finance/businessSettlement/list.vue
index e942abb..9543947 100644
--- a/src/views/finance/businessSettlement/list.vue
+++ b/src/views/finance/businessSettlement/list.vue
@@ -43,6 +43,7 @@
 const list = ref<IList[]>([]) // 表格数据
 // 选中的内容
 const checkoutList = ref<string[]>([])
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
diff --git a/src/views/finance/contract/list.vue b/src/views/finance/contract/list.vue
index 7dcdca5..5f8eb4e 100644
--- a/src/views/finance/contract/list.vue
+++ b/src/views/finance/contract/list.vue
@@ -59,6 +59,17 @@
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 选中的内容
 const checkoutList = ref<string[]>([])
+// 时间变更
+watch(dateRange, (val) => {
+  if (val) {
+    listQuery.value.estimateSignStartDate = `${val[0]}`
+    listQuery.value.estimateSignEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.estimateSignStartDate = ''
+    listQuery.value.estimateSignEndDate = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -66,8 +77,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.estimateSignStartDate = dateRange.value[0] as string || ''
-  listQuery.value.estimateSignEndDate = dateRange.value[1] as string || ''
+  // listQuery.value.estimateSignStartDate = dateRange.value[0] as string || ''
+  // listQuery.value.estimateSignEndDate = dateRange.value[1] as string || ''
   getContractList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: { estimateSignDate: string; agreementAmount: number }) => {
       return {
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 1bce5f9..07b2296 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,7 +1,7 @@
-<!-- 新增或详情弹窗 -->
+<!-- 新增或详情 -->
 <script lang="ts" setup name="addNotice">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
@@ -15,6 +15,7 @@
 import { SCHEDULE } from '@/utils/scheduleDict'
 const $route = useRoute()
 const $router = useRouter()
+const submitId = ref('') // 提交id-保存接口获取
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
 const fileTypeName = ref('')
@@ -40,12 +41,12 @@
   formId: SCHEDULE.FILE_APPROVAL,
 }) // 表单
 const rules = ref<FormRules>({
-  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
-  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
-  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
-  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
-  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+  fileName: [{ required: true, message: '名称必填', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建必填', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位必填', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间必填', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人必填', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号必填', trigger: 'blur' }],
 }) // 表单验证规则
 
 const userList = ref<userType[]>([]) // 可使用人列表
@@ -57,12 +58,14 @@
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
-const PubList = ref<deptType[]>([])
+const PubList = ref([]) as any// 发布单位列表
 const PubListTree = ref([])
 // 获取发布单位列表
 const getPubList = () => {
   getDeptTreeList().then((res) => {
     PubList.value = res.data
+    console.log('0000', 'ppp', PubList.value)
+
     PubListTree.value = toTreeList(res.data, '0', true)
   })
 }
@@ -113,43 +116,57 @@
   effectiveStatusName.value = ''
 }
 // 提交
-const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+const saveForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
-    `确认${flag}吗？`,
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then((res) => {
+        const publisherId = ruleForm.publisher
+        const index = PubList.value.findIndex((item: { id: string }) => item.id === publisherId)
+        if (index !== -1) {
+          ruleForm.publisher = PubList.value[index].name as string
+        }
+        // 保存（草稿箱）
+        confirmDrafts(ruleForm).then((res) => {
+          ruleForm.fileNo = res.data.fileNo
+          submitId.value = res.data.id
+          ElMessage.success('保存成功')
+          // formEl?.resetFields()
+          // $router.go(-1)
+          close()
+        })
+      })
+    }
+  })
+}
+const submitForm = () => {
+  if (!submitId.value) {
+    ElMessage.warning('请先保存')
+    return false
+  }
+  ElMessageBox.confirm(
+    '确认提交吗？',
     '提示',
     {
       confirmButtonText: '确认',
       cancelButtonText: '取消',
       type: 'warning',
     },
-      ).then((res) => {
-        if (flag === '提交') {
-          confirmDrafts(ruleForm).then((res) => {
-            if (res.code === 200) {
-              console.log(res.data, '保存成功')
-              submitFile({ id: res.data.id, formId: SCHEDULE.FILE_APPROVAL }).then((res) => {
-                formEl?.resetFields()
-                ElMessage.success('提交成功')
-                $router.go(-1)
-                close()
-              })
-            }
-          })
-        }
-        else {
-          // 保存（草稿箱）
-          confirmDrafts(ruleForm).then((res) => {
-            ElMessage.success('保存成功')
-            formEl?.resetFields()
-            $router.go(-1)
-            close()
-          })
-        }
-      })
-    }
+  ).then((res) => {
+    submitFile({ id: submitId.value, formId: SCHEDULE.FILE_APPROVAL }).then((res) => {
+    // formEl?.resetFields()
+      ElMessage.success('已提交')
+      $router.go(-1)
+      close()
+    })
   })
 }
 // 取消
@@ -163,9 +180,14 @@
 const onFileChange = (event: any) => {
   // 原生上传
   // console.log(event.target.files)
+
   if (event.target.files?.length !== 0) {
     // 创建formdata对象
     const fd = new FormData()
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
@@ -173,9 +195,11 @@
         // 重置当前验证
         ruleFormRef.value?.clearValidate('minioFileName')
         ElMessage.success('文件上传成功')
+        loading.close()
       }
       else {
         ElMessage.error(res.message)
+        loading.close()
       }
     })
   }
@@ -215,10 +239,10 @@
   <app-container style="overflow: hidden;">
     <detail-page :title="`${fileTypeName}-${title}`">
       <template #btns>
-        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm()">
           提交
         </el-button>
-        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
+        <el-button v-if="title !== '详情'" type="primary" @click="saveForm(ruleFormRef)">
           保存
         </el-button>
         <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -258,7 +282,7 @@
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
                 style="width: 100%;"
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 135d059..c2b46c0 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -1,6 +1,7 @@
 <!-- 文件审批公共模板 -->
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { DateModelType } from 'element-plus'
 import type { TableRow } from './approve-interface'
 import type { fileResType } from '@/views/measure/file/file-interface'
 import { printJSON } from '@/utils/printUtils'
@@ -32,12 +33,13 @@
 const approvalStatusReserveMap = ref({ ...props.approvalStatusReserveMap }) // 审批状态字典{草稿箱: 1}
 const activeTitle = ref('') // active对应的审批状态名字
 
-const searchQuery = reactive({
+const searchQuery = ref({
   fileNo: '', // 编号
   fileName: '', // 名称
   fileCode: '', // 文件号
   createUser: '', // 创建人
-  createTime: '', // 创建
+  createStartTime: '', // 创建开始时间
+  createEndTime: '', // 创建结束时间
   approvalStatus: approvalStatus.value, // 审批状态
   limit: 20,
   offset: 1,
@@ -49,18 +51,31 @@
 const total = ref<number>(0) // 数据总条数
 const columns = ref<TableColumn[]>([
   { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
+  { text: '编号', value: 'fileNo', align: 'center', width: '160' },
   { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
+  { text: '类别', value: 'fileTypeName', align: 'center' },
   { text: '创建人', value: 'createUser', align: 'center' },
-  { text: '创建时间', value: 'createTime', align: 'center' },
-  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110' },
 ]) // 表格
 const list = ref<TableRow[]>([]) // 表格数据
+// 筛选时间段数据
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    searchQuery.value.createStartTime = `${val[0]}`
+    searchQuery.value.createEndTime = `${val[1]}`
+  }
+  else {
+    searchQuery.value.createStartTime = ''
+    searchQuery.value.createEndTime = ''
+  }
+})
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
-  approvallistPageApi(searchQuery).then((res) => {
+  approvallistPageApi(searchQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows.map((item: TableRow) => {
         return {
@@ -85,10 +100,10 @@
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
-    searchQuery.limit = val.size
+    searchQuery.value.limit = val.size
   }
   if (val && val.page) {
-    searchQuery.offset = val.page
+    searchQuery.value.offset = val.page
   }
   getList()
 }
@@ -216,12 +231,21 @@
 }
 // 重置
 const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.fileType = ''
-  searchQuery.createTime = ''
-  searchQuery.createUser = ''
+  searchQuery.value = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    fileCode: '', // 文件号
+    createUser: '', // 创建人
+    createStartTime: '', // 创建开始时间
+    createEndTime: '', // 创建结束时间
+    approvalStatus: approvalStatus.value, // 审批状态
+    limit: 20,
+    offset: 1,
+    fileType: '', // 文件类别
+    formId: SCHEDULE.FILE_APPROVAL,
+    ids: [] as string[],
+  }
+  timeRange.value = ['', '']
   getList()
 }
 // 表格被选中的行
@@ -230,27 +254,6 @@
 const multiSelect = (row: TableRow[]) => {
   selectList.value = row
 }
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  searchQuery.ids = []
-  if (selectList.value.length) {
-    selectList.value.forEach((item) => {
-      searchQuery.ids?.push(item.id as string)
-    })
-  }
-  exportFileApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
-    exportFile(res.data, props.name)
-    loading.close()
-    searchQuery.ids = []
-  }).catch((_) => {
-    loading.close()
-  })
-}
 // 打印
 function printList() {
   const selectIds = selectList.value.map(item => item.id)
@@ -278,8 +281,8 @@
   sessionStorage.setItem('approveFileMenu', props.name)
   approvalStatus.value = approvalStatusReserveMap.value[props.name]
   // approvalStatus.value = approvalStatusReserveMap.value[props.name] // 失效
-  searchQuery.approvalStatus = approvalStatusReserveMap.value[props.name] || '0'
-  $router.currentRoute.value.query.cacheActive = searchQuery.approvalStatus
+  searchQuery.value.approvalStatus = approvalStatusReserveMap.value[props.name] || '0'
+  $router.currentRoute.value.query.cacheActive = searchQuery.value.approvalStatus
   getList()
   // 缓存名称
 }, { deep: true, immediate: true })
@@ -312,8 +315,14 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss" placeholder="创建时间"
+            v-model="timeRange"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="创建开始时间"
+            end-placeholder="创建结束时间"
+            clearable
+            style="width: 360px;"
           />
         </search-item>
         <search-item>
@@ -323,10 +332,6 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <icon-button
-            v-if="proxy.hasPerm('/file/approve/export')" icon="icon-export" title="导出"
-            @click="exportExcelBtn"
-          />
           <icon-button v-if="proxy.hasPerm('/file/approve/print')" icon="icon-print" title="打印" @click="printList" />
         </template>
         <!-- 表格区域 -->
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 9dd3633..de9e080 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -85,7 +85,7 @@
 const getStatus = () => {
   getDictByCode('effectiveStatus').then((res) => {
     if (res.code === 200) {
-      effectiveStatusSelect.value = [...res.data, { name: '全部', value: '', id: 'quanbu' }]
+      effectiveStatusSelect.value = res.data
     }
   })
 }
@@ -373,8 +373,8 @@
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/add`)" icon="icon-add" title="新建" @click="add" />
-          <icon-button v-if="proxy.hasPerm(`/file/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
-          <icon-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <!-- <icon-button v-if="proxy.hasPerm(`/file/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" /> -->
+          <!-- <icon-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" /> -->
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/print`)" icon="icon-print" title="打印" @click="printList" />
         </template>
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 3510056..ed3ab8c 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -282,8 +282,8 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/measure/price/import')" icon="icon-import" title="批量导入" type="primary" />
-        <icon-button v-if="proxy.hasPerm('/measure/price/mould')" icon="icon-template" title="模板下载" type="primary" />
+        <!-- <icon-button v-if="proxy.hasPerm('/measure/price/import')" icon="icon-import" title="批量导入" type="primary" /> -->
+        <!-- <icon-button v-if="proxy.hasPerm('/measure/price/mould')" icon="icon-template" title="模板下载" type="primary" /> -->
         <icon-button v-if="proxy.hasPerm('/measure/price/add')" icon="icon-add" title="新建" type="primary" @click="add" />
         <icon-button v-if="proxy.hasPerm('/measure/price/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/measure/price/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 60eeebb..7b6f4ec 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -61,7 +61,8 @@
   categoryName: [{ required: true, message: '类别不能为空', trigger: ['blur', 'change'] }],
   itemName: [{ required: true, message: '项目不能为空', trigger: ['blur', 'change'] }],
   priceStandardName: [{ required: true, message: '依据标准不能为空', trigger: ['blur', 'change'] }],
-  price: [{ required: true, message: '标准价格不能为空', trigger: ['blur', 'change'] }],
+  price: [{ required: true, message: '标准价格不能为空', trigger: ['blur', 'change'] },
+    { pattern: /^(?!0+(?:\.0+)?$)(?:[1-9]\d*|0)(?:\.\d{1,2})?$/, message: '要求不小于0，且最多保留两位小数', trigger: ['blur', 'change'] }],
   operatorDiscountPermission: [{ required: true, message: '业务员折扣权限不能为空', trigger: ['blur', 'change'] }],
   directorDiscountPermission: [{ required: true, message: '负责人折扣权限不能为空', trigger: ['blur', 'change'] }],
 })
@@ -255,7 +256,7 @@
                   v-model.trim="formInline.priceStandardName"
                   clearable
                   :placeholder="pageType === 'detail' ? '' : '依据标准'"
-                  :disabled="pageType === 'detail'"
+                  disabled
                 >
                   <template v-if="pageType !== 'detail'" #append>
                     <el-button
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 5e62137..22d1d8a 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -24,16 +24,16 @@
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    // { name: '删除', type: 'danger' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    // { name: '删除', type: 'danger' },
     { name: '取消', type: 'info' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    // { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
+    { name: '删除', type: 'danger' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
@@ -41,9 +41,10 @@
   ],
   已取消: [
     { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
     { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
-
 }
 // 当前tab
 const currentTab = ref('全部')
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index d2fad4c..004b856 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -28,10 +28,6 @@
 const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  // 审批中状态时候长度返回错误
-  if (props.status === '3' || props.status === '6') {
-    props.buttons.length = 4 // 传递长度 + 判断条件下显示按钮长度
-  }
   return props.buttons.length * 40 + 23
 })
 
@@ -63,13 +59,13 @@
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '溯源供方编号', value: 'supplierNo', width: '160', align: 'center' },
-  { text: '溯源供方名称', value: 'supplierName', width: '120', align: 'center' },
+  { text: '溯源供方名称', value: 'supplierName', align: 'center' },
   { text: '业务内容', value: 'businessContent', align: 'center' },
   { text: '业务范围', value: 'businessScope', align: 'center' },
   { text: '负责人', value: 'director', align: 'center' },
   { text: '联系方式', value: 'phone', align: 'center' },
   { text: '地址', value: 'address', align: 'center' },
-  { text: '创建时间', value: 'name', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
   { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110px' },
 ])
 // 初始化路由
@@ -86,15 +82,20 @@
     listQuery.value.offset = 1
   }
   getapprovalListPage(listQuery.value).then((response) => {
-    list.value = response.data.rows
-    if (!companyAddress.value) {
-      companyAddress.value = [response.data.rows[0].companyCountry, response.data.rows[0].companyProvince, response.data.rows[0].companyCity, response.data.rows[0].companyArea, response.data.rows[0].companyAddress]
-    }
-    else if (isReset) {
-      companyAddress.value = [response.data.rows[0].companyCountry, response.data.rows[0].companyProvince, response.data.rows[0].companyCity, response.data.rows[0].companyArea, response.data.rows[0].companyAddress]
+    list.value = response.data.rows.map((item: { companyProvinceName: string; companyCityName: string }) => {
+      return {
+        ...item,
+        address: item.companyProvinceName === item.companyCityName ? item.companyCityName : item.companyProvinceName + item.companyCityName,
+      }
+    })
+    // if (!companyAddress.value) {
+    //   companyAddress.value = [response.data.rows[0].companyCountry, response.data.rows[0].companyProvince, response.data.rows[0].companyCity, response.data.rows[0].companyArea, response.data.rows[0].companyAddress]
+    // }
+    if (isReset) {
+      companyAddress.value = ['', '', '', '', '']
+      // companyAddress.value = [response.data.rows[0].companyCountry, response.data.rows[0].companyProvince, response.data.rows[0].companyCity, response.data.rows[0].companyArea, response.data.rows[0].companyAddress]
     }
     total.value = parseInt(response.data.total)
-    console.log(companyAddress.value)
     loadingTable.value = false
   }).catch((_) => {
     loadingTable.value = false
@@ -107,6 +108,7 @@
 }
 // 公司地址变化后给对象赋值
 function companyAddressChange(addressObj: IAddress) {
+  console.log('公司地址变化后给对象赋值')
   listQuery.value.companyCountry = addressObj.country
   listQuery.value.companyProvince = addressObj.province
   listQuery.value.companyCity = addressObj.city
@@ -191,30 +193,6 @@
   }
   fetchData(true, true)
 }
-// 导出
-const exportExcelBtn = () => {
-  const params: supplierExportQuery = {
-    approvalStatus: listQuery.value.approvalStatus,
-    businessContent: listQuery.value.businessContent,
-    companyArea: listQuery.value.companyArea,
-    companyCity: listQuery.value.companyCity,
-    companyProvince: listQuery.value.companyProvince,
-    formId: listQuery.value.formId,
-    supplierName: listQuery.value.supplierName,
-    supplierNo: listQuery.value.supplierNo,
-  }
-  if (checkoutList.value.length > 0) {
-    params.ids = checkoutList.value
-  }
-  // TODO: 审批列表导出
-  console.log(params)
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  loading.close()
-}
 
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -237,10 +215,7 @@
 const add = () => {
   $router.push('/source/add')
 }
-// 批量导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 审批结束回调
 const approvalSuccess = () => {
   fetchData(true)
@@ -259,7 +234,7 @@
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    sourceSubmit({ id: row.id, formId: SCHEDULE.SUPPLIER_APPROVAL }).then((res) => {
+    sourceSubmit({ id: row.id, formId: SCHEDULE.SUPPLIER_APPROVAL, processId: row.processId }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
@@ -311,7 +286,7 @@
   (newVal: string) => {
     console.log('change status', newVal)
     listQuery.value.approvalStatus = newVal
-    fetchData(false)
+    clearList()
   },
   { immediate: true })
 
@@ -429,7 +404,7 @@
                   编辑
                 </el-button>
                 <el-button
-                  v-if="row.approvalStatusName === '草稿箱' "
+                  v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                   size="small"
                   link
                   type="primary"
@@ -448,20 +423,8 @@
                 >
                   取消
                 </el-button>
-                <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-                <!-- <el-button
-                  v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
-                  size="small"
-                  link
-                  type="danger"
-                  :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-                  @click="clickBtn(row, '删除')"
-                >
-                  删除
-                </el-button> -->
-                <!-- ------------------------------------审批中的删除暂时去掉-------------------------------- -->
                 <el-button
-                  v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+                  v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/measure/source/components/sourceApprovalDetail.vue b/src/views/measure/source/components/sourceApprovalDetail.vue
index c507032..35683e7 100644
--- a/src/views/measure/source/components/sourceApprovalDetail.vue
+++ b/src/views/measure/source/components/sourceApprovalDetail.vue
@@ -8,12 +8,15 @@
 import { getSoucreListDetail } from '@/api/measure/source'
 import { cancelApproval, fetchApproval } from '@/api/approval'
 import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
-
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import type { IAddress } from '@/components/AddressSelect/address-interface'
+const approvalDialog = ref() // 审批对话ref
 const approvalRecord = ref() // 审批流程组件ref
 const infoId = ref('') // id
+const taskId = ref('') // 任务id 用于审批
+const processId = ref('') // 流程实例id
 const approvalType = ref('')
 const approvalStatusName = ref('') // 审批状态、控制草稿箱没有审批流程
-
 // 从路由中获取页面类型参数
 const $route = useRoute()
 if ($route.params && $route.params.type) {
@@ -70,8 +73,9 @@
   approvalStatus: '', // 审批状态
   approvalStatusName: '', // 审批状态名称
 })
-
-const traceSupplierPersonList: Ref<traceSupplierPerson[]> = ref([])
+const companyAddress = ref<string[]>([]) // 公司地址
+const invoiceAddress = ref<string[]>([]) // 开票地址
+const traceSupplierPersonList: Ref<traceSupplierPerson[]> = ref([]) // 人员列表
 const columns = [
   { text: '人员编号', value: 'personNo' },
   { text: '姓名', value: 'name' },
@@ -83,9 +87,15 @@
 const getInfo = () => {
   getSoucreListDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data
+    traceSupplierPersonList.value = res.data.traceSupplierPersonList
+    // for (const key in dataForm.value) {
+    //   dataForm.value[key] = res.data[key]
+    // }
+    companyAddress.value = [dataForm.value.companyCountryName, dataForm.value.companyProvinceName, dataForm.value.companyCityName, dataForm.value.companyAreaName, dataForm.value.companyAddress]
+    invoiceAddress.value = [dataForm.value.invoiceCountryName, dataForm.value.invoiceProvinceName, dataForm.value.invoiceCityName, dataForm.value.invoiceAreaName, dataForm.value.invoiceAddress]
   })
 }
-getInfo()
+
 // 初始化router
 const $router = useRouter()
 // 关闭新增页面的回调
@@ -106,12 +116,12 @@
 }
 // 审批结束回调
 const approvalSuccess = () => {
-  getInfo()
+  close() // 返回上一页
 }
 // 取消
 const handleCancel = () => {
   const params = {
-    processInstanceId: dataForm.value.processId!,
+    processInstanceId: processId.value!,
     comments: '取消审批',
   }
   ElMessageBox.confirm(
@@ -125,21 +135,21 @@
   ).then(() => {
     cancelApproval(params).then(() => {
       ElMessage.success('取消成功')
+      close()
     })
   })
 }
-const approvalDialog = ref()
 // 点击数据后的操作按钮
 const clickBtn = (buttonType: string) => {
   switch (buttonType) {
     case '同意':
-      approvalDialog.value.initDialog('agree', dataForm.value.taskId)
+      approvalDialog.value.initDialog('agree', taskId.value)
       break
     case '驳回':
-      approvalDialog.value.initDialog('reject', dataForm.value.taskId)
+      approvalDialog.value.initDialog('reject', taskId.value)
       break
     case '拒绝':
-      approvalDialog.value.initDialog('refuse', dataForm.value.taskId)
+      approvalDialog.value.initDialog('refuse', taskId.value)
       break
     case '取消':
       handleCancel()
@@ -148,10 +158,14 @@
 }
 onMounted(() => {
   dataForm.value.processId = $route.query.processId as string// 流程实例id
+  processId.value = $route.query.processId as string// 流程实例id
   approvalStatusName.value = $route.query.approvalStatusName as string
+  taskId.value = $route.query.taskId as string
+
   if (approvalStatusName.value !== '草稿箱') {
-    getApprovalRecord(dataForm.value.processId) // 查询审批记录
+    getApprovalRecord(processId.value) // 查询审批记录
   }
+  getInfo() // 获取详情
 })
 </script>
 
@@ -162,13 +176,13 @@
         <el-button v-if="approvalType === '2'" type="primary" @click="clickBtn('同意')">
           同意
         </el-button>
-        <el-button v-if="approvalType === '2'" type="primary" @click="clickBtn('拒绝')">
-          拒绝
-        </el-button>
         <el-button v-if="approvalType === '2'" type="primary" @click="clickBtn('驳回')">
           驳回
         </el-button>
-        <el-button v-if="approvalType === '3'" type="primary" @click="handleCancel()">
+        <el-button v-if="approvalType === '2'" type="danger" @click="clickBtn('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="approvalType === '3'" type="info" @click="handleCancel()">
           取消
         </el-button>
         <el-button type="info" @click="close">
@@ -201,6 +215,7 @@
       <!-- 审批流程 -->
       <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
     </detail-block>
+    <!-- 审批弹窗 -->
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index e352e61..cda7d0c 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -89,7 +89,7 @@
   getSoucreList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: ISupplier) => {
       if (item.companyProvinceName && item.companyCityName) {
-        item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
+        item.briefName = `${item.companyProvinceName}${item.companyCityName}`
       }
       else {
         item.briefName = item.companyProvinceName || item.companyCityName
@@ -184,9 +184,10 @@
   })
   if (list.value.length > 0) {
     const params = {
-      supplierNo: '', // 业务内容
-      supplierName: '', // 溯源供方名称
-      businessContent: '', // 溯源供方编号
+      supplierNo: listQuery.value.supplierNo, // 业务内容
+      supplierName: listQuery.value.supplierName, // 溯源供方名称
+      businessContent: listQuery.value.businessContent, // 溯源供方编号
+      formId: SCHEDULE.SUPPLIER_APPROVAL,
       ids: checkoutList.value,
     }
     exportSourceList(params).then((res) => {
@@ -256,8 +257,8 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
-        <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" />
+        <!-- <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" /> -->
+        <!-- <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" /> -->
         <icon-button v-if="proxy.hasPerm('/measure/measureSource/add')" icon="icon-add" title="新建" type="primary" @click="add" />
         <icon-button v-if="proxy.hasPerm('/measure/measureSource/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/measure/measureSource/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index 939c80a..b107e3e 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -3,7 +3,7 @@
  * 添加/编辑/详情溯源供方
  */
 import type { Ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import baseInfoDetail from './components/baseInfoDetail.vue'
 import type { ISupplier, traceSupplierPerson } from './list_interface'
@@ -266,21 +266,12 @@
   })
 }
 
-// 提交表单
-const submitFunc = () => {
-// 再提交
-  const params = {
-    id: formInline.value.id,
-    formId: curFormId, // 表单id
-  }
-  sourceSubmit(params).then((res) => {
-    ElMessage.success('提交成功')
-    close()
-  })
-}
-
 // 点击提交
 const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formInline.value.id) {
+    ElMessage.warning('请先保存!')
+    return false
+  }
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
@@ -291,54 +282,14 @@
           type: 'warning',
         },
       ).then(() => {
-        if (!formInline.value.id) {
-          ElMessage.warning('请先保存!')
-          return false
+        const params = {
+          id: formInline.value.id,
+          formId: curFormId, // 表单id
         }
-        else {
-          const params = {
-            id: formInline.value.id,
-            formId: curFormId, // 表单id
-          }
-          sourceSubmit(params).then((res) => {
-            ElMessage.success('提交成功')
-            close()
-          })
-        }
-      //   if (from.value == 'reject') { // 驳回调用驳回编辑接口
-      //     failUpdateSourceApproval(formInline.value).then(() => {
-      //       ElMessage.success('提交成功!')
-      //     })
-      //   }
-      //   else {
-      //     // 如果id存在, 调用更新接口
-      //     if (formInline.value.id) {
-      //     // 如果表单变更过,先保存，再提交
-      //       if (isChanged.value) {
-      //         sourceDraftUpdate(formInline.value).then((res) => {
-      //           if (res.code === 200) {
-      //             submitFunc()
-      //           }
-      //           else {
-      //             ElMessage.error('保存失败，请重新保存后提交')
-      //           }
-      //         })
-      //       }
-      //       else { // 表单未变更过，直接提交
-      //         submitFunc()
-      //       }
-      //     }
-      //     else {
-      //     // id不存在，调用保存接口，再提交
-      //       sourceSave(formInline.value).then((res) => {
-      //         if (res.code === 200) {
-      //           formInline.value.id = res.data.id
-      //           formInline.value.supplierNo = res.data.supplierNo
-      //           submitFunc()
-      //         }
-      //       })
-      //     }
-      //   }
+        sourceSubmit(params).then((res) => {
+          ElMessage.success('提交成功')
+          close()
+        })
       })
     }
   })
@@ -352,13 +303,20 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
         formInline.value.minioFileName = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
+        loading.close()
       }
       else {
+        loading.close()
         ElMessage.error(res.message)
       }
     })
@@ -632,7 +590,6 @@
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
-        @row-dblclick="dblclickRow"
       >
         <el-table-column type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index 59ebc56..b7cffc7 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -80,13 +80,6 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  console.log(trainTimeRange.value)
-  console.log('----', createTimeRange.value)
-
-  listQuery.value.createEndTime = createTimeRange.value[1] as string || ''
-  listQuery.value.createStartTime = createTimeRange.value[0] as string || ''
-  listQuery.value.trainEndTime = trainTimeRange.value[1] as string || ''
-  listQuery.value.trainStartTime = trainTimeRange.value[0] as string || ''
   getapprovalList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -143,7 +136,30 @@
     }
   })
 }
-
+// 培训时间数组变更
+watch(trainTimeRange, (val) => {
+  if (val) {
+    listQuery.value.trainStartTime = `${val[0]}`
+    listQuery.value.trainEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.trainStartTime = ''
+    listQuery.value.trainEndTime = ''
+    trainTimeRange.value = ['', '']
+  }
+})
+// 创建时间变更
+watch(createTimeRange, (val) => {
+  if (val) {
+    listQuery.value.createStartTime = `${val[0]}`
+    listQuery.value.createEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.createStartTime = ''
+    listQuery.value.createEndTime = ''
+    createTimeRange.value = ['', '']
+  }
+})
 // 取消
 const handleCancel = (row: IPlanList) => {
   const params = {

diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..9cf2b29 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -28,6 +28,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    DeptSelectByName: typeof import('./components/DeptSelectByName/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
diff --git a/src/views/business/board/standardReminder/list.vue b/src/views/business/board/standardReminder/list.vue
index 85efbb1..fd60743 100644
--- a/src/views/business/board/standardReminder/list.vue
+++ b/src/views/business/board/standardReminder/list.vue
@@ -94,12 +94,33 @@
 const preparation = ref<string>('')
 // 到期开始以及结束
 const validTime = ref<string>('')
+watch(preparation, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
+// 有效日期变更
+watch(validTime, (val) => {
+  if (val) {
+    listQuery.value.validStartTime = `${val[0]}`
+    listQuery.value.validEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.validStartTime = ''
+    listQuery.value.validEndTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.preparationStartDate = preparation.value[0] || ''
-  listQuery.value.preparationEndDate = preparation.value[1] || ''
-  listQuery.value.validStartTime = validTime.value[0] || ''
-  listQuery.value.validEndTime = validTime.value[1] || ''
+  // listQuery.value.preparationStartDate = preparation.value[0] || ''
+  // listQuery.value.preparationEndDate = preparation.value[1] || ''
+  // listQuery.value.validStartTime = validTime.value[0] || ''
+  // listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -223,16 +244,16 @@
   })
   if (list.value.length > 0) {
     const params = {
-      category: '', // 类别
-      id: '', // 主键id
-      managerState: '', // 管理状态
-      preparationEndDate: '', // 结束时间
-      preparationStartDate: '', // 开始时间
-      standardLaboratory: '', // 标准所在部门
-      standardName: '', // 标准名称
-      standardNo: '', // 标准编号
-      validEndTime: '', // 结束时间
-      validStartTime: '', // 开始时间
+      category: listQuery.value.category, // 类别
+      id: listQuery.value.id, // 主键id
+      managerState: listQuery.value.managerState, // 管理状态
+      preparationEndDate: listQuery.value.preparationEndDate, // 结束时间
+      preparationStartDate: listQuery.value.preparationStartDate, // 开始时间
+      standardLaboratory: listQuery.value.standardLaboratory, // 标准所在部门
+      standardName: listQuery.value.standardName, // 标准名称
+      standardNo: listQuery.value.standardNo, // 标准编号
+      validEndTime: listQuery.value.validEndTime, // 结束时间
+      validStartTime: listQuery.value.validStartTime, // 开始时间
       offset: 1, // 当前页
       limit: 20, // 每页多少条
       ids: checkoutList.value,
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 8666957..37ac73f 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -137,7 +137,7 @@
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  distributeDialogRef.value.initDialog(row.id, row.sampleId, row.orderId)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId, row.sampleStatus)
 }
 // 点击标签绑定
 const barCodeBind = ref()
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 807ea30..4e4eb46 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -37,11 +37,21 @@
   { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
   { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
 ])
-
+// 时间变更
+watch(trainTime, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 查询列表
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.startTime = trainTime.value[0] || ''
-  listQuery.value.endTime = trainTime.value[1] || ''
+  // listQuery.value.startTime = trainTime.value[0] || ''
+  // listQuery.value.endTime = trainTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2f7c1d0..bccde84 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -139,7 +139,17 @@
     id: '2', // 后端规定已收入传2
   })
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -147,8 +157,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.sampleStatus = active.value
   getInterChangeList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IinterchangeList) => {
@@ -280,7 +290,7 @@
       else if (type === 'delete') { // 无需检测
         interchangeStatusChange({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '7' }).then((res) => {
           if (res.code === 200) {
-            ElMessage.success(`已${title}`)
+            ElMessage.success('操作成功')
             fetchData(true)
           }
         })
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList.vue b/src/views/business/schedule/interchangeReceipt/receiptList.vue
index 275a053..83d93f4 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptList.vue
@@ -42,7 +42,17 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -50,8 +60,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getReceiptList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -124,13 +134,13 @@
   })
   if (list.value.length > 0) {
     const params = {
-      interchangeCode: '', // 交接单编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      reciever: '', // 接收人
-      deliverer: '', // 送样人
-      startTime: '', // 交接开始时间
-      endTime: '', // 交接结束时间
+      interchangeCode: listQuery.value.interchangeCode, // 交接单编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      reciever: listQuery.value.reciever, // 接收人
+      deliverer: listQuery.value.deliverer, // 送样人
+      startTime: listQuery.value.startTime, // 交接开始时间
+      endTime: listQuery.value.endTime, // 交接结束时间
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index cf0b532..f2fc852 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -26,8 +26,8 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   deliverer: '', // 送样人
-  isUrgent: 2, // 是否加急 2全部 1是 0否
-  status: 0, // 接收状态
+  isUrgent: '', // 是否加急 2全部 1是 0否
+  status: '', // 接收状态
   offset: 1,
   limit: 20,
 })
@@ -70,11 +70,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    isUrgentMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 2, // 是否加急全部后端定为2
-    })
+    // isUrgentMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 2, // 是否加急全部后端定为2
+    // })
   })
   // 接收状态
   getDictByCode('orderStatus').then((response) => {
@@ -85,11 +85,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    statusMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 0,
-    })
+    // statusMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 0,
+    // })
     console.log(statusMap.value)
   })
 }
@@ -125,8 +125,8 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     deliverer: '', // 送样人
-    isUrgent: 2, // 是否加急
-    status: 0, // 接收状态
+    isUrgent: '', // 是否加急 2全部 1是 0否
+    status: '', // 接收状态
     offset: 1,
     limit: 20,
   }
@@ -191,12 +191,12 @@
   })
   if (list.value.length > 0) {
     const params = {
-      orderCode: '', // 委托书编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      deliverer: '', // 送样人
-      isUrgent: 2, // 是否加急
-      status: 0, // 接收状态
+      orderCode: listQuery.value.orderCode, // 委托书编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      deliverer: listQuery.value.deliverer, // 送样人
+      isUrgent: listQuery.value.isUrgent, // 是否加急
+      status: listQuery.value.status, // 接收状态
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 2d92da9..14cd1ce 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -6,7 +6,7 @@
   customerName: string // 委托方名称
   deliverer: string // 送样人
   isUrgent: number | string // 是否加急
-  status: number // 接收状态
+  status: number | string// 接收状态
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 50308c7..25c5cf9 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -53,6 +53,7 @@
   handOutProperty: string // 分发性质-初次分发、退回分发
   id?: string // 实验室id
   customerId?: string // 客户id
+  certificationState?: string // 证书出具
 }
 
 // 实验室检测/我的检测列表
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index 7c17365..7159350 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -1,6 +1,6 @@
 <!-- 任务分发 -->
 <script lang="ts" setup name="TaskEdit">
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
 import ProcessConfig from './components/processConfig.vue'
@@ -11,6 +11,7 @@
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { UploadFile } from '@/api/measure/file'
 import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 interface dictType {
   id: string
@@ -251,16 +252,22 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    // UploadFile(fd).then((res) => {
-    //   if (res.code === 200) {
-    //     sampleForm.value.minioFileName = res.data[0]
-    //     // 重置当前验证
-    //     ElMessage.success('文件上传成功')
-    //   }
-    //   else {
-    //     ElMessage.error(res.message)
-    //   }
-    // })
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        sampleForm.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+        loading.close()
+      }
+      else {
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    })
   }
 }
 const upload = () => {
@@ -402,7 +409,7 @@
               <el-form-item label="校检类别:">
                 <el-select
                   v-model="sampleForm.measureCategory"
-                  :placeholder="roleType === 'detail' ? '' : '请选择校检类别'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择校检类别'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -424,7 +431,7 @@
               <el-form-item label="厂家国别:">
                 <el-select
                   v-model="sampleForm.manufacturerCountry"
-                  :placeholder="roleType === 'detail' ? '' : '请选择厂家国别'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择厂家国别'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -450,7 +457,7 @@
               <el-form-item label="ABC:">
                 <el-select
                   v-model="sampleForm.abc"
-                  :placeholder="roleType === 'detail' ? '' : '请选择ABC'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择ABC'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -504,8 +511,8 @@
               <el-form-item label="备注:">
                 <el-input
                   v-model="sampleForm.remark"
+                  autosize
                   type="textarea"
-                  :rows="2"
                   :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
                   :class="{ 'detail-input': roleType === 'detail' }"
@@ -516,7 +523,7 @@
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="sampleForm.measureType"
-                  :placeholder="roleType === 'detail' ? '' : '请选择检定方式'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择检定方式'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index dfbbf6a..6eeff55 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -81,7 +81,7 @@
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '165px' },
   { text: '样品属性', value: 'sampleBelongName', width: '100', align: 'center' },
   { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '90' },
-  { text: '证书出具', value: 'certificationState', align: 'center', width: '90', filter: (row: ITaskList) => { return `${row.alreadyCertifications}/${row.requireCertifications}` } },
+  { text: '证书出具', value: 'certificationState', align: 'center', width: '90' },
 ])
 // 表格数据
 const list = ref<ITaskList[]>([])
@@ -104,6 +104,7 @@
   getTaskList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: ITaskList) => {
       item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      item.certificationState = `${item.alreadyCertifications}/${item.requireCertifications}`
       return item
     })
     total.value = response.data.total
diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue
index e44dd67..194de53 100644
--- a/src/views/business/subpackage/apply/list.vue
+++ b/src/views/business/subpackage/apply/list.vue
@@ -302,7 +302,7 @@
         <search-item>
           <el-date-picker
             v-model="timeRange" type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="申请开始时间" end-placeholder="申请结束时间"
+            value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="申请开始时间" end-placeholder="申请结束时间" clearable
           />
         </search-item>
       </search-area>
diff --git a/src/views/business/subpackage/check/list.vue b/src/views/business/subpackage/check/list.vue
index 51ea419..a8b6744 100644
--- a/src/views/business/subpackage/check/list.vue
+++ b/src/views/business/subpackage/check/list.vue
@@ -111,8 +111,6 @@
 
 // 时间变更
 watch(timeRange, (val) => {
-  console.log(val[0])
-
   if (val) {
     listQuery.value.checkStartTime = `${val[0]}`
     listQuery.value.checkEndTime = `${val[1]}`
@@ -345,7 +343,8 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="timeRange" type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
+            v-model="timeRange"
+            clearable type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="验收开始时间" end-placeholder="验收结束时间"
           />
         </search-item>
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 98f4a39..a0db900 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -68,6 +68,7 @@
   else {
     listQuery.value.startTime = ''
     listQuery.value.endTime = ''
+    timeRange.value = ['', '']
   }
 })
 // 多选发生改变时
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index 6e41a94..ac98b8a 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -56,7 +56,17 @@
 const checkoutList = ref<string[]>([])
 // 文件上传input
 const fileRef = ref()
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -64,8 +74,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getSampleList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index 92e4b4a..6f465fc 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -67,7 +67,17 @@
     certificationStatusMap.value[`${item.value}`] = item.name
   })
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -75,8 +85,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getSampleList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IOvertimeList) => {
       return {
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index dbaa437..14464bf 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -86,6 +86,17 @@
     width: 160,
   },
 ]) // 表格
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 const fetchData = (isNowPage = false) => {
   loadingTable.value = true
@@ -93,8 +104,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.processResult = active.value
   getApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 60d1454..d0236cc 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -105,7 +105,17 @@
     align: 'center',
   },
 ])
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 const fetchData = (isNowPage = false) => {
   loadingTable.value = true
@@ -113,8 +123,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.approvalStatus = active.value
   getApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index aeb568e..5430b0f 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -103,10 +103,21 @@
 // 装载时间数组
 const checkTime = ref<string>('')
 const loadingTable = ref(false)
+// 时间变更
+watch(checkTime, (val) => {
+  if (val) {
+    listQuery.value.checkStartDate = `${val[0]}`
+    listQuery.value.checkEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.checkStartDate = ''
+    listQuery.value.checkEndDate = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.checkStartDate = checkTime.value[0] || ''
-  listQuery.value.checkEndDate = checkTime.value[1] || ''
+  // listQuery.value.checkStartDate = checkTime.value[0] || ''
+  // listQuery.value.checkEndDate = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 6229abf..9d30934 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -112,10 +112,21 @@
 // 装载时间数组
 const checkTime = ref('')
 const loadingTable = ref(false)
+// 时间变更
+watch(checkTime, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.startTime = checkTime.value[0] || ''
-  listQuery.value.endTime = checkTime.value[1] || ''
+  // listQuery.value.startTime = checkTime.value[0] || ''
+  // listQuery.value.endTime = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index daca294..de18467 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -66,6 +66,17 @@
 const checkoutList = ref<IManageChecklist[]>([])
 // 文件上传input
 const fileRef = ref()
+// 时间变更
+watch(checkDate, (val) => {
+  if (val) {
+    listQuery.value.checkStartDate = `${val[0]}`
+    listQuery.value.checkEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.checkStartDate = ''
+    listQuery.value.checkEndDate = ''
+  }
+})
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
@@ -73,8 +84,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.checkStartDate = checkDate.value[0] || ''
-  listQuery.value.checkEndDate = checkDate.value[1] || ''
+  // listQuery.value.checkStartDate = checkDate.value[0] || ''
+  // listQuery.value.checkEndDate = checkDate.value[1] || ''
   getcheckInfoList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: any) => {
       return {
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 00d283c..50b014c 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -99,6 +99,17 @@
     approvalStatusReserveMap.value[item.name] = `${item.value}`
   })
 }
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -106,8 +117,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.approvalStatus = active.value
   getReceiveApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/receive/solve/solveList.vue b/src/views/device/receive/solve/solveList.vue
index 809c0c1..ec1e8bb 100644
--- a/src/views/device/receive/solve/solveList.vue
+++ b/src/views/device/receive/solve/solveList.vue
@@ -120,7 +120,17 @@
   timeRange.value = ['', ''] // 把时间选择框置空
   fetchData(true)
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -128,8 +138,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getReceiveApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IsolveListType) => {
       return {
diff --git a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
index 4744536..b4fe085 100644
--- a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
@@ -43,7 +43,12 @@
   select.value = -1
   listPageApi(listQuery.value).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows
+      list.value = res.data.rows.map((item: { effectiveStatusName: string }) => {
+        return {
+          ...item,
+          isDisabled: item.effectiveStatusName === '已废止',
+        }
+      })
       total.value = res.data.total
     }
   })
@@ -142,7 +147,7 @@
           </el-table-column>
           <el-table-column label="" width="55" align="center" fixed="left">
             <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
+              <el-radio v-model="select" :disabled="scope.row.isDisabled" :label="scope.$index" class="radio" />
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index a030dcf..0dd5547 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -94,12 +94,34 @@
 const preparation = ref<string>('')
 // 到期开始以及结束
 const validTime = ref<string>('')
+// 筹建日期变更
+watch(preparation, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
+// 有效日期变更
+watch(validTime, (val) => {
+  if (val) {
+    listQuery.value.validStartTime = `${val[0]}`
+    listQuery.value.validEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.validStartTime = ''
+    listQuery.value.validEndTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.preparationStartDate = preparation.value[0] || ''
-  listQuery.value.preparationEndDate = preparation.value[1] || ''
-  listQuery.value.validStartTime = validTime.value[0] || ''
-  listQuery.value.validEndTime = validTime.value[1] || ''
+  // listQuery.value.preparationStartDate = preparation.value[0] || ''
+  // listQuery.value.preparationEndDate = preparation.value[1] || ''
+  // listQuery.value.validStartTime = validTime.value[0] || ''
+  // listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index 39d8683..bb69fe9 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -99,6 +99,17 @@
 const standardManagerStateList = ref<IOptions[]>([])
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
+// 时间变更
+watch(preparationDate, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
@@ -107,8 +118,8 @@
     listQuery.value.offset = 1
   }
   // 筹建日期
-  listQuery.value.preparationStartDate = preparationDate.value[0] || ''
-  listQuery.value.preparationEndDate = preparationDate.value[1] || ''
+  // listQuery.value.preparationStartDate = preparationDate.value[0] || ''
+  // listQuery.value.preparationEndDate = preparationDate.value[1] || ''
   getStandardList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: any) => {
       return {
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 37205fc..edf9dd7 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -793,7 +793,7 @@
             保存
           </el-button>
           <!-- 待审批 -->
-          <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'agree' })">
+          <!-- <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'agree' })">
             同意
           </el-button>
           <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'reject' })">
@@ -801,7 +801,7 @@
           </el-button>
           <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'refuse' })">
             拒绝
-          </el-button>
+          </el-button> -->
           <!-- </template> -->
         </template>
         <el-button v-if="(title === '详情' && $route.query?.approvalStatusName === '草稿箱' && isCancel)" type="primary" @click="editForm">
diff --git a/src/views/finance/businessSettlement/list.vue b/src/views/finance/businessSettlement/list.vue
index e942abb..9543947 100644
--- a/src/views/finance/businessSettlement/list.vue
+++ b/src/views/finance/businessSettlement/list.vue
@@ -43,6 +43,7 @@
 const list = ref<IList[]>([]) // 表格数据
 // 选中的内容
 const checkoutList = ref<string[]>([])
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
diff --git a/src/views/finance/contract/list.vue b/src/views/finance/contract/list.vue
index 7dcdca5..5f8eb4e 100644
--- a/src/views/finance/contract/list.vue
+++ b/src/views/finance/contract/list.vue
@@ -59,6 +59,17 @@
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 选中的内容
 const checkoutList = ref<string[]>([])
+// 时间变更
+watch(dateRange, (val) => {
+  if (val) {
+    listQuery.value.estimateSignStartDate = `${val[0]}`
+    listQuery.value.estimateSignEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.estimateSignStartDate = ''
+    listQuery.value.estimateSignEndDate = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -66,8 +77,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.estimateSignStartDate = dateRange.value[0] as string || ''
-  listQuery.value.estimateSignEndDate = dateRange.value[1] as string || ''
+  // listQuery.value.estimateSignStartDate = dateRange.value[0] as string || ''
+  // listQuery.value.estimateSignEndDate = dateRange.value[1] as string || ''
   getContractList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: { estimateSignDate: string; agreementAmount: number }) => {
       return {
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 1bce5f9..07b2296 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,7 +1,7 @@
-<!-- 新增或详情弹窗 -->
+<!-- 新增或详情 -->
 <script lang="ts" setup name="addNotice">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
@@ -15,6 +15,7 @@
 import { SCHEDULE } from '@/utils/scheduleDict'
 const $route = useRoute()
 const $router = useRouter()
+const submitId = ref('') // 提交id-保存接口获取
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
 const fileTypeName = ref('')
@@ -40,12 +41,12 @@
   formId: SCHEDULE.FILE_APPROVAL,
 }) // 表单
 const rules = ref<FormRules>({
-  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
-  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
-  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
-  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
-  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+  fileName: [{ required: true, message: '名称必填', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建必填', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位必填', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间必填', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人必填', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号必填', trigger: 'blur' }],
 }) // 表单验证规则
 
 const userList = ref<userType[]>([]) // 可使用人列表
@@ -57,12 +58,14 @@
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
-const PubList = ref<deptType[]>([])
+const PubList = ref([]) as any// 发布单位列表
 const PubListTree = ref([])
 // 获取发布单位列表
 const getPubList = () => {
   getDeptTreeList().then((res) => {
     PubList.value = res.data
+    console.log('0000', 'ppp', PubList.value)
+
     PubListTree.value = toTreeList(res.data, '0', true)
   })
 }
@@ -113,43 +116,57 @@
   effectiveStatusName.value = ''
 }
 // 提交
-const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+const saveForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
-    `确认${flag}吗？`,
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then((res) => {
+        const publisherId = ruleForm.publisher
+        const index = PubList.value.findIndex((item: { id: string }) => item.id === publisherId)
+        if (index !== -1) {
+          ruleForm.publisher = PubList.value[index].name as string
+        }
+        // 保存（草稿箱）
+        confirmDrafts(ruleForm).then((res) => {
+          ruleForm.fileNo = res.data.fileNo
+          submitId.value = res.data.id
+          ElMessage.success('保存成功')
+          // formEl?.resetFields()
+          // $router.go(-1)
+          close()
+        })
+      })
+    }
+  })
+}
+const submitForm = () => {
+  if (!submitId.value) {
+    ElMessage.warning('请先保存')
+    return false
+  }
+  ElMessageBox.confirm(
+    '确认提交吗？',
     '提示',
     {
       confirmButtonText: '确认',
       cancelButtonText: '取消',
       type: 'warning',
     },
-      ).then((res) => {
-        if (flag === '提交') {
-          confirmDrafts(ruleForm).then((res) => {
-            if (res.code === 200) {
-              console.log(res.data, '保存成功')
-              submitFile({ id: res.data.id, formId: SCHEDULE.FILE_APPROVAL }).then((res) => {
-                formEl?.resetFields()
-                ElMessage.success('提交成功')
-                $router.go(-1)
-                close()
-              })
-            }
-          })
-        }
-        else {
-          // 保存（草稿箱）
-          confirmDrafts(ruleForm).then((res) => {
-            ElMessage.success('保存成功')
-            formEl?.resetFields()
-            $router.go(-1)
-            close()
-          })
-        }
-      })
-    }
+  ).then((res) => {
+    submitFile({ id: submitId.value, formId: SCHEDULE.FILE_APPROVAL }).then((res) => {
+    // formEl?.resetFields()
+      ElMessage.success('已提交')
+      $router.go(-1)
+      close()
+    })
   })
 }
 // 取消
@@ -163,9 +180,14 @@
 const onFileChange = (event: any) => {
   // 原生上传
   // console.log(event.target.files)
+
   if (event.target.files?.length !== 0) {
     // 创建formdata对象
     const fd = new FormData()
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
@@ -173,9 +195,11 @@
         // 重置当前验证
         ruleFormRef.value?.clearValidate('minioFileName')
         ElMessage.success('文件上传成功')
+        loading.close()
       }
       else {
         ElMessage.error(res.message)
+        loading.close()
       }
     })
   }
@@ -215,10 +239,10 @@
   <app-container style="overflow: hidden;">
     <detail-page :title="`${fileTypeName}-${title}`">
       <template #btns>
-        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm()">
           提交
         </el-button>
-        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
+        <el-button v-if="title !== '详情'" type="primary" @click="saveForm(ruleFormRef)">
           保存
         </el-button>
         <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -258,7 +282,7 @@
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
                 style="width: 100%;"
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 135d059..c2b46c0 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -1,6 +1,7 @@
 <!-- 文件审批公共模板 -->
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { DateModelType } from 'element-plus'
 import type { TableRow } from './approve-interface'
 import type { fileResType } from '@/views/measure/file/file-interface'
 import { printJSON } from '@/utils/printUtils'
@@ -32,12 +33,13 @@
 const approvalStatusReserveMap = ref({ ...props.approvalStatusReserveMap }) // 审批状态字典{草稿箱: 1}
 const activeTitle = ref('') // active对应的审批状态名字
 
-const searchQuery = reactive({
+const searchQuery = ref({
   fileNo: '', // 编号
   fileName: '', // 名称
   fileCode: '', // 文件号
   createUser: '', // 创建人
-  createTime: '', // 创建
+  createStartTime: '', // 创建开始时间
+  createEndTime: '', // 创建结束时间
   approvalStatus: approvalStatus.value, // 审批状态
   limit: 20,
   offset: 1,
@@ -49,18 +51,31 @@
 const total = ref<number>(0) // 数据总条数
 const columns = ref<TableColumn[]>([
   { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
+  { text: '编号', value: 'fileNo', align: 'center', width: '160' },
   { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
+  { text: '类别', value: 'fileTypeName', align: 'center' },
   { text: '创建人', value: 'createUser', align: 'center' },
-  { text: '创建时间', value: 'createTime', align: 'center' },
-  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110' },
 ]) // 表格
 const list = ref<TableRow[]>([]) // 表格数据
+// 筛选时间段数据
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    searchQuery.value.createStartTime = `${val[0]}`
+    searchQuery.value.createEndTime = `${val[1]}`
+  }
+  else {
+    searchQuery.value.createStartTime = ''
+    searchQuery.value.createEndTime = ''
+  }
+})
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
-  approvallistPageApi(searchQuery).then((res) => {
+  approvallistPageApi(searchQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows.map((item: TableRow) => {
         return {
@@ -85,10 +100,10 @@
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
-    searchQuery.limit = val.size
+    searchQuery.value.limit = val.size
   }
   if (val && val.page) {
-    searchQuery.offset = val.page
+    searchQuery.value.offset = val.page
   }
   getList()
 }
@@ -216,12 +231,21 @@
 }
 // 重置
 const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.fileType = ''
-  searchQuery.createTime = ''
-  searchQuery.createUser = ''
+  searchQuery.value = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    fileCode: '', // 文件号
+    createUser: '', // 创建人
+    createStartTime: '', // 创建开始时间
+    createEndTime: '', // 创建结束时间
+    approvalStatus: approvalStatus.value, // 审批状态
+    limit: 20,
+    offset: 1,
+    fileType: '', // 文件类别
+    formId: SCHEDULE.FILE_APPROVAL,
+    ids: [] as string[],
+  }
+  timeRange.value = ['', '']
   getList()
 }
 // 表格被选中的行
@@ -230,27 +254,6 @@
 const multiSelect = (row: TableRow[]) => {
   selectList.value = row
 }
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  searchQuery.ids = []
-  if (selectList.value.length) {
-    selectList.value.forEach((item) => {
-      searchQuery.ids?.push(item.id as string)
-    })
-  }
-  exportFileApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
-    exportFile(res.data, props.name)
-    loading.close()
-    searchQuery.ids = []
-  }).catch((_) => {
-    loading.close()
-  })
-}
 // 打印
 function printList() {
   const selectIds = selectList.value.map(item => item.id)
@@ -278,8 +281,8 @@
   sessionStorage.setItem('approveFileMenu', props.name)
   approvalStatus.value = approvalStatusReserveMap.value[props.name]
   // approvalStatus.value = approvalStatusReserveMap.value[props.name] // 失效
-  searchQuery.approvalStatus = approvalStatusReserveMap.value[props.name] || '0'
-  $router.currentRoute.value.query.cacheActive = searchQuery.approvalStatus
+  searchQuery.value.approvalStatus = approvalStatusReserveMap.value[props.name] || '0'
+  $router.currentRoute.value.query.cacheActive = searchQuery.value.approvalStatus
   getList()
   // 缓存名称
 }, { deep: true, immediate: true })
@@ -312,8 +315,14 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss" placeholder="创建时间"
+            v-model="timeRange"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="创建开始时间"
+            end-placeholder="创建结束时间"
+            clearable
+            style="width: 360px;"
           />
         </search-item>
         <search-item>
@@ -323,10 +332,6 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <icon-button
-            v-if="proxy.hasPerm('/file/approve/export')" icon="icon-export" title="导出"
-            @click="exportExcelBtn"
-          />
           <icon-button v-if="proxy.hasPerm('/file/approve/print')" icon="icon-print" title="打印" @click="printList" />
         </template>
         <!-- 表格区域 -->
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 9dd3633..de9e080 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -85,7 +85,7 @@
 const getStatus = () => {
   getDictByCode('effectiveStatus').then((res) => {
     if (res.code === 200) {
-      effectiveStatusSelect.value = [...res.data, { name: '全部', value: '', id: 'quanbu' }]
+      effectiveStatusSelect.value = res.data
     }
   })
 }
@@ -373,8 +373,8 @@
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/add`)" icon="icon-add" title="新建" @click="add" />
-          <icon-button v-if="proxy.hasPerm(`/file/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
-          <icon-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <!-- <icon-button v-if="proxy.hasPerm(`/file/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" /> -->
+          <!-- <icon-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" /> -->
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/print`)" icon="icon-print" title="打印" @click="printList" />
         </template>
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 3510056..ed3ab8c 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -282,8 +282,8 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/measure/price/import')" icon="icon-import" title="批量导入" type="primary" />
-        <icon-button v-if="proxy.hasPerm('/measure/price/mould')" icon="icon-template" title="模板下载" type="primary" />
+        <!-- <icon-button v-if="proxy.hasPerm('/measure/price/import')" icon="icon-import" title="批量导入" type="primary" /> -->
+        <!-- <icon-button v-if="proxy.hasPerm('/measure/price/mould')" icon="icon-template" title="模板下载" type="primary" /> -->
         <icon-button v-if="proxy.hasPerm('/measure/price/add')" icon="icon-add" title="新建" type="primary" @click="add" />
         <icon-button v-if="proxy.hasPerm('/measure/price/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/measure/price/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 60eeebb..7b6f4ec 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -61,7 +61,8 @@
   categoryName: [{ required: true, message: '类别不能为空', trigger: ['blur', 'change'] }],
   itemName: [{ required: true, message: '项目不能为空', trigger: ['blur', 'change'] }],
   priceStandardName: [{ required: true, message: '依据标准不能为空', trigger: ['blur', 'change'] }],
-  price: [{ required: true, message: '标准价格不能为空', trigger: ['blur', 'change'] }],
+  price: [{ required: true, message: '标准价格不能为空', trigger: ['blur', 'change'] },
+    { pattern: /^(?!0+(?:\.0+)?$)(?:[1-9]\d*|0)(?:\.\d{1,2})?$/, message: '要求不小于0，且最多保留两位小数', trigger: ['blur', 'change'] }],
   operatorDiscountPermission: [{ required: true, message: '业务员折扣权限不能为空', trigger: ['blur', 'change'] }],
   directorDiscountPermission: [{ required: true, message: '负责人折扣权限不能为空', trigger: ['blur', 'change'] }],
 })
@@ -255,7 +256,7 @@
                   v-model.trim="formInline.priceStandardName"
                   clearable
                   :placeholder="pageType === 'detail' ? '' : '依据标准'"
-                  :disabled="pageType === 'detail'"
+                  disabled
                 >
                   <template v-if="pageType !== 'detail'" #append>
                     <el-button
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 5e62137..22d1d8a 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -24,16 +24,16 @@
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    // { name: '删除', type: 'danger' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    // { name: '删除', type: 'danger' },
     { name: '取消', type: 'info' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    // { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
+    { name: '删除', type: 'danger' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
@@ -41,9 +41,10 @@
   ],
   已取消: [
     { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
     { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
-
 }
 // 当前tab
 const currentTab = ref('全部')
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index d2fad4c..004b856 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -28,10 +28,6 @@
 const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  // 审批中状态时候长度返回错误
-  if (props.status === '3' || props.status === '6') {
-    props.buttons.length = 4 // 传递长度 + 判断条件下显示按钮长度
-  }
   return props.buttons.length * 40 + 23
 })
 
@@ -63,13 +59,13 @@
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '溯源供方编号', value: 'supplierNo', width: '160', align: 'center' },
-  { text: '溯源供方名称', value: 'supplierName', width: '120', align: 'center' },
+  { text: '溯源供方名称', value: 'supplierName', align: 'center' },
   { text: '业务内容', value: 'businessContent', align: 'center' },
   { text: '业务范围', value: 'businessScope', align: 'center' },
   { text: '负责人', value: 'director', align: 'center' },
   { text: '联系方式', value: 'phone', align: 'center' },
   { text: '地址', value: 'address', align: 'center' },
-  { text: '创建时间', value: 'name', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
   { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110px' },
 ])
 // 初始化路由
@@ -86,15 +82,20 @@
     listQuery.value.offset = 1
   }
   getapprovalListPage(listQuery.value).then((response) => {
-    list.value = response.data.rows
-    if (!companyAddress.value) {
-      companyAddress.value = [response.data.rows[0].companyCountry, response.data.rows[0].companyProvince, response.data.rows[0].companyCity, response.data.rows[0].companyArea, response.data.rows[0].companyAddress]
-    }
-    else if (isReset) {
-      companyAddress.value = [response.data.rows[0].companyCountry, response.data.rows[0].companyProvince, response.data.rows[0].companyCity, response.data.rows[0].companyArea, response.data.rows[0].companyAddress]
+    list.value = response.data.rows.map((item: { companyProvinceName: string; companyCityName: string }) => {
+      return {
+        ...item,
+        address: item.companyProvinceName === item.companyCityName ? item.companyCityName : item.companyProvinceName + item.companyCityName,
+      }
+    })
+    // if (!companyAddress.value) {
+    //   companyAddress.value = [response.data.rows[0].companyCountry, response.data.rows[0].companyProvince, response.data.rows[0].companyCity, response.data.rows[0].companyArea, response.data.rows[0].companyAddress]
+    // }
+    if (isReset) {
+      companyAddress.value = ['', '', '', '', '']
+      // companyAddress.value = [response.data.rows[0].companyCountry, response.data.rows[0].companyProvince, response.data.rows[0].companyCity, response.data.rows[0].companyArea, response.data.rows[0].companyAddress]
     }
     total.value = parseInt(response.data.total)
-    console.log(companyAddress.value)
     loadingTable.value = false
   }).catch((_) => {
     loadingTable.value = false
@@ -107,6 +108,7 @@
 }
 // 公司地址变化后给对象赋值
 function companyAddressChange(addressObj: IAddress) {
+  console.log('公司地址变化后给对象赋值')
   listQuery.value.companyCountry = addressObj.country
   listQuery.value.companyProvince = addressObj.province
   listQuery.value.companyCity = addressObj.city
@@ -191,30 +193,6 @@
   }
   fetchData(true, true)
 }
-// 导出
-const exportExcelBtn = () => {
-  const params: supplierExportQuery = {
-    approvalStatus: listQuery.value.approvalStatus,
-    businessContent: listQuery.value.businessContent,
-    companyArea: listQuery.value.companyArea,
-    companyCity: listQuery.value.companyCity,
-    companyProvince: listQuery.value.companyProvince,
-    formId: listQuery.value.formId,
-    supplierName: listQuery.value.supplierName,
-    supplierNo: listQuery.value.supplierNo,
-  }
-  if (checkoutList.value.length > 0) {
-    params.ids = checkoutList.value
-  }
-  // TODO: 审批列表导出
-  console.log(params)
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  loading.close()
-}
 
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -237,10 +215,7 @@
 const add = () => {
   $router.push('/source/add')
 }
-// 批量导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 审批结束回调
 const approvalSuccess = () => {
   fetchData(true)
@@ -259,7 +234,7 @@
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    sourceSubmit({ id: row.id, formId: SCHEDULE.SUPPLIER_APPROVAL }).then((res) => {
+    sourceSubmit({ id: row.id, formId: SCHEDULE.SUPPLIER_APPROVAL, processId: row.processId }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
@@ -311,7 +286,7 @@
   (newVal: string) => {
     console.log('change status', newVal)
     listQuery.value.approvalStatus = newVal
-    fetchData(false)
+    clearList()
   },
   { immediate: true })
 
@@ -429,7 +404,7 @@
                   编辑
                 </el-button>
                 <el-button
-                  v-if="row.approvalStatusName === '草稿箱' "
+                  v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                   size="small"
                   link
                   type="primary"
@@ -448,20 +423,8 @@
                 >
                   取消
                 </el-button>
-                <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-                <!-- <el-button
-                  v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
-                  size="small"
-                  link
-                  type="danger"
-                  :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-                  @click="clickBtn(row, '删除')"
-                >
-                  删除
-                </el-button> -->
-                <!-- ------------------------------------审批中的删除暂时去掉-------------------------------- -->
                 <el-button
-                  v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+                  v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/measure/source/components/sourceApprovalDetail.vue b/src/views/measure/source/components/sourceApprovalDetail.vue
index c507032..35683e7 100644
--- a/src/views/measure/source/components/sourceApprovalDetail.vue
+++ b/src/views/measure/source/components/sourceApprovalDetail.vue
@@ -8,12 +8,15 @@
 import { getSoucreListDetail } from '@/api/measure/source'
 import { cancelApproval, fetchApproval } from '@/api/approval'
 import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
-
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import type { IAddress } from '@/components/AddressSelect/address-interface'
+const approvalDialog = ref() // 审批对话ref
 const approvalRecord = ref() // 审批流程组件ref
 const infoId = ref('') // id
+const taskId = ref('') // 任务id 用于审批
+const processId = ref('') // 流程实例id
 const approvalType = ref('')
 const approvalStatusName = ref('') // 审批状态、控制草稿箱没有审批流程
-
 // 从路由中获取页面类型参数
 const $route = useRoute()
 if ($route.params && $route.params.type) {
@@ -70,8 +73,9 @@
   approvalStatus: '', // 审批状态
   approvalStatusName: '', // 审批状态名称
 })
-
-const traceSupplierPersonList: Ref<traceSupplierPerson[]> = ref([])
+const companyAddress = ref<string[]>([]) // 公司地址
+const invoiceAddress = ref<string[]>([]) // 开票地址
+const traceSupplierPersonList: Ref<traceSupplierPerson[]> = ref([]) // 人员列表
 const columns = [
   { text: '人员编号', value: 'personNo' },
   { text: '姓名', value: 'name' },
@@ -83,9 +87,15 @@
 const getInfo = () => {
   getSoucreListDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data
+    traceSupplierPersonList.value = res.data.traceSupplierPersonList
+    // for (const key in dataForm.value) {
+    //   dataForm.value[key] = res.data[key]
+    // }
+    companyAddress.value = [dataForm.value.companyCountryName, dataForm.value.companyProvinceName, dataForm.value.companyCityName, dataForm.value.companyAreaName, dataForm.value.companyAddress]
+    invoiceAddress.value = [dataForm.value.invoiceCountryName, dataForm.value.invoiceProvinceName, dataForm.value.invoiceCityName, dataForm.value.invoiceAreaName, dataForm.value.invoiceAddress]
   })
 }
-getInfo()
+
 // 初始化router
 const $router = useRouter()
 // 关闭新增页面的回调
@@ -106,12 +116,12 @@
 }
 // 审批结束回调
 const approvalSuccess = () => {
-  getInfo()
+  close() // 返回上一页
 }
 // 取消
 const handleCancel = () => {
   const params = {
-    processInstanceId: dataForm.value.processId!,
+    processInstanceId: processId.value!,
     comments: '取消审批',
   }
   ElMessageBox.confirm(
@@ -125,21 +135,21 @@
   ).then(() => {
     cancelApproval(params).then(() => {
       ElMessage.success('取消成功')
+      close()
     })
   })
 }
-const approvalDialog = ref()
 // 点击数据后的操作按钮
 const clickBtn = (buttonType: string) => {
   switch (buttonType) {
     case '同意':
-      approvalDialog.value.initDialog('agree', dataForm.value.taskId)
+      approvalDialog.value.initDialog('agree', taskId.value)
       break
     case '驳回':
-      approvalDialog.value.initDialog('reject', dataForm.value.taskId)
+      approvalDialog.value.initDialog('reject', taskId.value)
       break
     case '拒绝':
-      approvalDialog.value.initDialog('refuse', dataForm.value.taskId)
+      approvalDialog.value.initDialog('refuse', taskId.value)
       break
     case '取消':
       handleCancel()
@@ -148,10 +158,14 @@
 }
 onMounted(() => {
   dataForm.value.processId = $route.query.processId as string// 流程实例id
+  processId.value = $route.query.processId as string// 流程实例id
   approvalStatusName.value = $route.query.approvalStatusName as string
+  taskId.value = $route.query.taskId as string
+
   if (approvalStatusName.value !== '草稿箱') {
-    getApprovalRecord(dataForm.value.processId) // 查询审批记录
+    getApprovalRecord(processId.value) // 查询审批记录
   }
+  getInfo() // 获取详情
 })
 </script>
 
@@ -162,13 +176,13 @@
         <el-button v-if="approvalType === '2'" type="primary" @click="clickBtn('同意')">
           同意
         </el-button>
-        <el-button v-if="approvalType === '2'" type="primary" @click="clickBtn('拒绝')">
-          拒绝
-        </el-button>
         <el-button v-if="approvalType === '2'" type="primary" @click="clickBtn('驳回')">
           驳回
         </el-button>
-        <el-button v-if="approvalType === '3'" type="primary" @click="handleCancel()">
+        <el-button v-if="approvalType === '2'" type="danger" @click="clickBtn('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="approvalType === '3'" type="info" @click="handleCancel()">
           取消
         </el-button>
         <el-button type="info" @click="close">
@@ -201,6 +215,7 @@
       <!-- 审批流程 -->
       <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
     </detail-block>
+    <!-- 审批弹窗 -->
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index e352e61..cda7d0c 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -89,7 +89,7 @@
   getSoucreList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: ISupplier) => {
       if (item.companyProvinceName && item.companyCityName) {
-        item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
+        item.briefName = `${item.companyProvinceName}${item.companyCityName}`
       }
       else {
         item.briefName = item.companyProvinceName || item.companyCityName
@@ -184,9 +184,10 @@
   })
   if (list.value.length > 0) {
     const params = {
-      supplierNo: '', // 业务内容
-      supplierName: '', // 溯源供方名称
-      businessContent: '', // 溯源供方编号
+      supplierNo: listQuery.value.supplierNo, // 业务内容
+      supplierName: listQuery.value.supplierName, // 溯源供方名称
+      businessContent: listQuery.value.businessContent, // 溯源供方编号
+      formId: SCHEDULE.SUPPLIER_APPROVAL,
       ids: checkoutList.value,
     }
     exportSourceList(params).then((res) => {
@@ -256,8 +257,8 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
-        <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" />
+        <!-- <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" /> -->
+        <!-- <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" /> -->
         <icon-button v-if="proxy.hasPerm('/measure/measureSource/add')" icon="icon-add" title="新建" type="primary" @click="add" />
         <icon-button v-if="proxy.hasPerm('/measure/measureSource/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/measure/measureSource/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index 939c80a..b107e3e 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -3,7 +3,7 @@
  * 添加/编辑/详情溯源供方
  */
 import type { Ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import baseInfoDetail from './components/baseInfoDetail.vue'
 import type { ISupplier, traceSupplierPerson } from './list_interface'
@@ -266,21 +266,12 @@
   })
 }
 
-// 提交表单
-const submitFunc = () => {
-// 再提交
-  const params = {
-    id: formInline.value.id,
-    formId: curFormId, // 表单id
-  }
-  sourceSubmit(params).then((res) => {
-    ElMessage.success('提交成功')
-    close()
-  })
-}
-
 // 点击提交
 const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formInline.value.id) {
+    ElMessage.warning('请先保存!')
+    return false
+  }
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
@@ -291,54 +282,14 @@
           type: 'warning',
         },
       ).then(() => {
-        if (!formInline.value.id) {
-          ElMessage.warning('请先保存!')
-          return false
+        const params = {
+          id: formInline.value.id,
+          formId: curFormId, // 表单id
         }
-        else {
-          const params = {
-            id: formInline.value.id,
-            formId: curFormId, // 表单id
-          }
-          sourceSubmit(params).then((res) => {
-            ElMessage.success('提交成功')
-            close()
-          })
-        }
-      //   if (from.value == 'reject') { // 驳回调用驳回编辑接口
-      //     failUpdateSourceApproval(formInline.value).then(() => {
-      //       ElMessage.success('提交成功!')
-      //     })
-      //   }
-      //   else {
-      //     // 如果id存在, 调用更新接口
-      //     if (formInline.value.id) {
-      //     // 如果表单变更过,先保存，再提交
-      //       if (isChanged.value) {
-      //         sourceDraftUpdate(formInline.value).then((res) => {
-      //           if (res.code === 200) {
-      //             submitFunc()
-      //           }
-      //           else {
-      //             ElMessage.error('保存失败，请重新保存后提交')
-      //           }
-      //         })
-      //       }
-      //       else { // 表单未变更过，直接提交
-      //         submitFunc()
-      //       }
-      //     }
-      //     else {
-      //     // id不存在，调用保存接口，再提交
-      //       sourceSave(formInline.value).then((res) => {
-      //         if (res.code === 200) {
-      //           formInline.value.id = res.data.id
-      //           formInline.value.supplierNo = res.data.supplierNo
-      //           submitFunc()
-      //         }
-      //       })
-      //     }
-      //   }
+        sourceSubmit(params).then((res) => {
+          ElMessage.success('提交成功')
+          close()
+        })
       })
     }
   })
@@ -352,13 +303,20 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
         formInline.value.minioFileName = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
+        loading.close()
       }
       else {
+        loading.close()
         ElMessage.error(res.message)
       }
     })
@@ -632,7 +590,6 @@
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
-        @row-dblclick="dblclickRow"
       >
         <el-table-column type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index 59ebc56..b7cffc7 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -80,13 +80,6 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  console.log(trainTimeRange.value)
-  console.log('----', createTimeRange.value)
-
-  listQuery.value.createEndTime = createTimeRange.value[1] as string || ''
-  listQuery.value.createStartTime = createTimeRange.value[0] as string || ''
-  listQuery.value.trainEndTime = trainTimeRange.value[1] as string || ''
-  listQuery.value.trainStartTime = trainTimeRange.value[0] as string || ''
   getapprovalList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -143,7 +136,30 @@
     }
   })
 }
-
+// 培训时间数组变更
+watch(trainTimeRange, (val) => {
+  if (val) {
+    listQuery.value.trainStartTime = `${val[0]}`
+    listQuery.value.trainEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.trainStartTime = ''
+    listQuery.value.trainEndTime = ''
+    trainTimeRange.value = ['', '']
+  }
+})
+// 创建时间变更
+watch(createTimeRange, (val) => {
+  if (val) {
+    listQuery.value.createStartTime = `${val[0]}`
+    listQuery.value.createEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.createStartTime = ''
+    listQuery.value.createEndTime = ''
+    createTimeRange.value = ['', '']
+  }
+})
 // 取消
 const handleCancel = (row: IPlanList) => {
   const params = {
diff --git a/src/views/measure/train/components/planApprovalDetail.vue b/src/views/measure/train/components/planApprovalDetail.vue
index 38fca62..f323b13 100644
--- a/src/views/measure/train/components/planApprovalDetail.vue
+++ b/src/views/measure/train/components/planApprovalDetail.vue
@@ -173,7 +173,7 @@
 
 <template>
   <app-container>
-    <detail-page title="培训管理审批">
+    <detail-page title="培训计划审批-详情">
       <template #btns>
         <el-button v-for="(item, index) in buttonArray" :key="index" :type="item.type" @click="clickBtn(item.name)">
           {{ item.name }}

diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..9cf2b29 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -28,6 +28,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    DeptSelectByName: typeof import('./components/DeptSelectByName/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
diff --git a/src/views/business/board/standardReminder/list.vue b/src/views/business/board/standardReminder/list.vue
index 85efbb1..fd60743 100644
--- a/src/views/business/board/standardReminder/list.vue
+++ b/src/views/business/board/standardReminder/list.vue
@@ -94,12 +94,33 @@
 const preparation = ref<string>('')
 // 到期开始以及结束
 const validTime = ref<string>('')
+watch(preparation, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
+// 有效日期变更
+watch(validTime, (val) => {
+  if (val) {
+    listQuery.value.validStartTime = `${val[0]}`
+    listQuery.value.validEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.validStartTime = ''
+    listQuery.value.validEndTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.preparationStartDate = preparation.value[0] || ''
-  listQuery.value.preparationEndDate = preparation.value[1] || ''
-  listQuery.value.validStartTime = validTime.value[0] || ''
-  listQuery.value.validEndTime = validTime.value[1] || ''
+  // listQuery.value.preparationStartDate = preparation.value[0] || ''
+  // listQuery.value.preparationEndDate = preparation.value[1] || ''
+  // listQuery.value.validStartTime = validTime.value[0] || ''
+  // listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -223,16 +244,16 @@
   })
   if (list.value.length > 0) {
     const params = {
-      category: '', // 类别
-      id: '', // 主键id
-      managerState: '', // 管理状态
-      preparationEndDate: '', // 结束时间
-      preparationStartDate: '', // 开始时间
-      standardLaboratory: '', // 标准所在部门
-      standardName: '', // 标准名称
-      standardNo: '', // 标准编号
-      validEndTime: '', // 结束时间
-      validStartTime: '', // 开始时间
+      category: listQuery.value.category, // 类别
+      id: listQuery.value.id, // 主键id
+      managerState: listQuery.value.managerState, // 管理状态
+      preparationEndDate: listQuery.value.preparationEndDate, // 结束时间
+      preparationStartDate: listQuery.value.preparationStartDate, // 开始时间
+      standardLaboratory: listQuery.value.standardLaboratory, // 标准所在部门
+      standardName: listQuery.value.standardName, // 标准名称
+      standardNo: listQuery.value.standardNo, // 标准编号
+      validEndTime: listQuery.value.validEndTime, // 结束时间
+      validStartTime: listQuery.value.validStartTime, // 开始时间
       offset: 1, // 当前页
       limit: 20, // 每页多少条
       ids: checkoutList.value,
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 8666957..37ac73f 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -137,7 +137,7 @@
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  distributeDialogRef.value.initDialog(row.id, row.sampleId, row.orderId)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId, row.sampleStatus)
 }
 // 点击标签绑定
 const barCodeBind = ref()
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 807ea30..4e4eb46 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -37,11 +37,21 @@
   { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
   { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
 ])
-
+// 时间变更
+watch(trainTime, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 查询列表
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.startTime = trainTime.value[0] || ''
-  listQuery.value.endTime = trainTime.value[1] || ''
+  // listQuery.value.startTime = trainTime.value[0] || ''
+  // listQuery.value.endTime = trainTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2f7c1d0..bccde84 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -139,7 +139,17 @@
     id: '2', // 后端规定已收入传2
   })
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -147,8 +157,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.sampleStatus = active.value
   getInterChangeList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IinterchangeList) => {
@@ -280,7 +290,7 @@
       else if (type === 'delete') { // 无需检测
         interchangeStatusChange({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '7' }).then((res) => {
           if (res.code === 200) {
-            ElMessage.success(`已${title}`)
+            ElMessage.success('操作成功')
             fetchData(true)
           }
         })
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList.vue b/src/views/business/schedule/interchangeReceipt/receiptList.vue
index 275a053..83d93f4 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptList.vue
@@ -42,7 +42,17 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -50,8 +60,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getReceiptList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -124,13 +134,13 @@
   })
   if (list.value.length > 0) {
     const params = {
-      interchangeCode: '', // 交接单编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      reciever: '', // 接收人
-      deliverer: '', // 送样人
-      startTime: '', // 交接开始时间
-      endTime: '', // 交接结束时间
+      interchangeCode: listQuery.value.interchangeCode, // 交接单编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      reciever: listQuery.value.reciever, // 接收人
+      deliverer: listQuery.value.deliverer, // 送样人
+      startTime: listQuery.value.startTime, // 交接开始时间
+      endTime: listQuery.value.endTime, // 交接结束时间
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index cf0b532..f2fc852 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -26,8 +26,8 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   deliverer: '', // 送样人
-  isUrgent: 2, // 是否加急 2全部 1是 0否
-  status: 0, // 接收状态
+  isUrgent: '', // 是否加急 2全部 1是 0否
+  status: '', // 接收状态
   offset: 1,
   limit: 20,
 })
@@ -70,11 +70,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    isUrgentMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 2, // 是否加急全部后端定为2
-    })
+    // isUrgentMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 2, // 是否加急全部后端定为2
+    // })
   })
   // 接收状态
   getDictByCode('orderStatus').then((response) => {
@@ -85,11 +85,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    statusMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 0,
-    })
+    // statusMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 0,
+    // })
     console.log(statusMap.value)
   })
 }
@@ -125,8 +125,8 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     deliverer: '', // 送样人
-    isUrgent: 2, // 是否加急
-    status: 0, // 接收状态
+    isUrgent: '', // 是否加急 2全部 1是 0否
+    status: '', // 接收状态
     offset: 1,
     limit: 20,
   }
@@ -191,12 +191,12 @@
   })
   if (list.value.length > 0) {
     const params = {
-      orderCode: '', // 委托书编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      deliverer: '', // 送样人
-      isUrgent: 2, // 是否加急
-      status: 0, // 接收状态
+      orderCode: listQuery.value.orderCode, // 委托书编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      deliverer: listQuery.value.deliverer, // 送样人
+      isUrgent: listQuery.value.isUrgent, // 是否加急
+      status: listQuery.value.status, // 接收状态
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 2d92da9..14cd1ce 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -6,7 +6,7 @@
   customerName: string // 委托方名称
   deliverer: string // 送样人
   isUrgent: number | string // 是否加急
-  status: number // 接收状态
+  status: number | string// 接收状态
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 50308c7..25c5cf9 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -53,6 +53,7 @@
   handOutProperty: string // 分发性质-初次分发、退回分发
   id?: string // 实验室id
   customerId?: string // 客户id
+  certificationState?: string // 证书出具
 }
 
 // 实验室检测/我的检测列表
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index 7c17365..7159350 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -1,6 +1,6 @@
 <!-- 任务分发 -->
 <script lang="ts" setup name="TaskEdit">
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
 import ProcessConfig from './components/processConfig.vue'
@@ -11,6 +11,7 @@
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { UploadFile } from '@/api/measure/file'
 import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 interface dictType {
   id: string
@@ -251,16 +252,22 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    // UploadFile(fd).then((res) => {
-    //   if (res.code === 200) {
-    //     sampleForm.value.minioFileName = res.data[0]
-    //     // 重置当前验证
-    //     ElMessage.success('文件上传成功')
-    //   }
-    //   else {
-    //     ElMessage.error(res.message)
-    //   }
-    // })
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        sampleForm.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+        loading.close()
+      }
+      else {
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    })
   }
 }
 const upload = () => {
@@ -402,7 +409,7 @@
               <el-form-item label="校检类别:">
                 <el-select
                   v-model="sampleForm.measureCategory"
-                  :placeholder="roleType === 'detail' ? '' : '请选择校检类别'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择校检类别'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -424,7 +431,7 @@
               <el-form-item label="厂家国别:">
                 <el-select
                   v-model="sampleForm.manufacturerCountry"
-                  :placeholder="roleType === 'detail' ? '' : '请选择厂家国别'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择厂家国别'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -450,7 +457,7 @@
               <el-form-item label="ABC:">
                 <el-select
                   v-model="sampleForm.abc"
-                  :placeholder="roleType === 'detail' ? '' : '请选择ABC'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择ABC'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -504,8 +511,8 @@
               <el-form-item label="备注:">
                 <el-input
                   v-model="sampleForm.remark"
+                  autosize
                   type="textarea"
-                  :rows="2"
                   :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
                   :class="{ 'detail-input': roleType === 'detail' }"
@@ -516,7 +523,7 @@
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="sampleForm.measureType"
-                  :placeholder="roleType === 'detail' ? '' : '请选择检定方式'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择检定方式'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index dfbbf6a..6eeff55 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -81,7 +81,7 @@
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '165px' },
   { text: '样品属性', value: 'sampleBelongName', width: '100', align: 'center' },
   { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '90' },
-  { text: '证书出具', value: 'certificationState', align: 'center', width: '90', filter: (row: ITaskList) => { return `${row.alreadyCertifications}/${row.requireCertifications}` } },
+  { text: '证书出具', value: 'certificationState', align: 'center', width: '90' },
 ])
 // 表格数据
 const list = ref<ITaskList[]>([])
@@ -104,6 +104,7 @@
   getTaskList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: ITaskList) => {
       item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      item.certificationState = `${item.alreadyCertifications}/${item.requireCertifications}`
       return item
     })
     total.value = response.data.total
diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue
index e44dd67..194de53 100644
--- a/src/views/business/subpackage/apply/list.vue
+++ b/src/views/business/subpackage/apply/list.vue
@@ -302,7 +302,7 @@
         <search-item>
           <el-date-picker
             v-model="timeRange" type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="申请开始时间" end-placeholder="申请结束时间"
+            value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="申请开始时间" end-placeholder="申请结束时间" clearable
           />
         </search-item>
       </search-area>
diff --git a/src/views/business/subpackage/check/list.vue b/src/views/business/subpackage/check/list.vue
index 51ea419..a8b6744 100644
--- a/src/views/business/subpackage/check/list.vue
+++ b/src/views/business/subpackage/check/list.vue
@@ -111,8 +111,6 @@
 
 // 时间变更
 watch(timeRange, (val) => {
-  console.log(val[0])
-
   if (val) {
     listQuery.value.checkStartTime = `${val[0]}`
     listQuery.value.checkEndTime = `${val[1]}`
@@ -345,7 +343,8 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="timeRange" type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
+            v-model="timeRange"
+            clearable type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="验收开始时间" end-placeholder="验收结束时间"
           />
         </search-item>
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 98f4a39..a0db900 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -68,6 +68,7 @@
   else {
     listQuery.value.startTime = ''
     listQuery.value.endTime = ''
+    timeRange.value = ['', '']
   }
 })
 // 多选发生改变时
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index 6e41a94..ac98b8a 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -56,7 +56,17 @@
 const checkoutList = ref<string[]>([])
 // 文件上传input
 const fileRef = ref()
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -64,8 +74,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getSampleList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index 92e4b4a..6f465fc 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -67,7 +67,17 @@
     certificationStatusMap.value[`${item.value}`] = item.name
   })
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -75,8 +85,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getSampleList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IOvertimeList) => {
       return {
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index dbaa437..14464bf 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -86,6 +86,17 @@
     width: 160,
   },
 ]) // 表格
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 const fetchData = (isNowPage = false) => {
   loadingTable.value = true
@@ -93,8 +104,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.processResult = active.value
   getApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 60d1454..d0236cc 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -105,7 +105,17 @@
     align: 'center',
   },
 ])
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 const fetchData = (isNowPage = false) => {
   loadingTable.value = true
@@ -113,8 +123,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.approvalStatus = active.value
   getApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index aeb568e..5430b0f 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -103,10 +103,21 @@
 // 装载时间数组
 const checkTime = ref<string>('')
 const loadingTable = ref(false)
+// 时间变更
+watch(checkTime, (val) => {
+  if (val) {
+    listQuery.value.checkStartDate = `${val[0]}`
+    listQuery.value.checkEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.checkStartDate = ''
+    listQuery.value.checkEndDate = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.checkStartDate = checkTime.value[0] || ''
-  listQuery.value.checkEndDate = checkTime.value[1] || ''
+  // listQuery.value.checkStartDate = checkTime.value[0] || ''
+  // listQuery.value.checkEndDate = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 6229abf..9d30934 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -112,10 +112,21 @@
 // 装载时间数组
 const checkTime = ref('')
 const loadingTable = ref(false)
+// 时间变更
+watch(checkTime, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.startTime = checkTime.value[0] || ''
-  listQuery.value.endTime = checkTime.value[1] || ''
+  // listQuery.value.startTime = checkTime.value[0] || ''
+  // listQuery.value.endTime = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index daca294..de18467 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -66,6 +66,17 @@
 const checkoutList = ref<IManageChecklist[]>([])
 // 文件上传input
 const fileRef = ref()
+// 时间变更
+watch(checkDate, (val) => {
+  if (val) {
+    listQuery.value.checkStartDate = `${val[0]}`
+    listQuery.value.checkEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.checkStartDate = ''
+    listQuery.value.checkEndDate = ''
+  }
+})
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
@@ -73,8 +84,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.checkStartDate = checkDate.value[0] || ''
-  listQuery.value.checkEndDate = checkDate.value[1] || ''
+  // listQuery.value.checkStartDate = checkDate.value[0] || ''
+  // listQuery.value.checkEndDate = checkDate.value[1] || ''
   getcheckInfoList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: any) => {
       return {
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 00d283c..50b014c 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -99,6 +99,17 @@
     approvalStatusReserveMap.value[item.name] = `${item.value}`
   })
 }
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -106,8 +117,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.approvalStatus = active.value
   getReceiveApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/receive/solve/solveList.vue b/src/views/device/receive/solve/solveList.vue
index 809c0c1..ec1e8bb 100644
--- a/src/views/device/receive/solve/solveList.vue
+++ b/src/views/device/receive/solve/solveList.vue
@@ -120,7 +120,17 @@
   timeRange.value = ['', ''] // 把时间选择框置空
   fetchData(true)
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -128,8 +138,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getReceiveApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IsolveListType) => {
       return {
diff --git a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
index 4744536..b4fe085 100644
--- a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
@@ -43,7 +43,12 @@
   select.value = -1
   listPageApi(listQuery.value).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows
+      list.value = res.data.rows.map((item: { effectiveStatusName: string }) => {
+        return {
+          ...item,
+          isDisabled: item.effectiveStatusName === '已废止',
+        }
+      })
       total.value = res.data.total
     }
   })
@@ -142,7 +147,7 @@
           </el-table-column>
           <el-table-column label="" width="55" align="center" fixed="left">
             <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
+              <el-radio v-model="select" :disabled="scope.row.isDisabled" :label="scope.$index" class="radio" />
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index a030dcf..0dd5547 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -94,12 +94,34 @@
 const preparation = ref<string>('')
 // 到期开始以及结束
 const validTime = ref<string>('')
+// 筹建日期变更
+watch(preparation, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
+// 有效日期变更
+watch(validTime, (val) => {
+  if (val) {
+    listQuery.value.validStartTime = `${val[0]}`
+    listQuery.value.validEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.validStartTime = ''
+    listQuery.value.validEndTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.preparationStartDate = preparation.value[0] || ''
-  listQuery.value.preparationEndDate = preparation.value[1] || ''
-  listQuery.value.validStartTime = validTime.value[0] || ''
-  listQuery.value.validEndTime = validTime.value[1] || ''
+  // listQuery.value.preparationStartDate = preparation.value[0] || ''
+  // listQuery.value.preparationEndDate = preparation.value[1] || ''
+  // listQuery.value.validStartTime = validTime.value[0] || ''
+  // listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index 39d8683..bb69fe9 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -99,6 +99,17 @@
 const standardManagerStateList = ref<IOptions[]>([])
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
+// 时间变更
+watch(preparationDate, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
@@ -107,8 +118,8 @@
     listQuery.value.offset = 1
   }
   // 筹建日期
-  listQuery.value.preparationStartDate = preparationDate.value[0] || ''
-  listQuery.value.preparationEndDate = preparationDate.value[1] || ''
+  // listQuery.value.preparationStartDate = preparationDate.value[0] || ''
+  // listQuery.value.preparationEndDate = preparationDate.value[1] || ''
   getStandardList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: any) => {
       return {
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 37205fc..edf9dd7 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -793,7 +793,7 @@
             保存
           </el-button>
           <!-- 待审批 -->
-          <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'agree' })">
+          <!-- <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'agree' })">
             同意
           </el-button>
           <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'reject' })">
@@ -801,7 +801,7 @@
           </el-button>
           <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'refuse' })">
             拒绝
-          </el-button>
+          </el-button> -->
           <!-- </template> -->
         </template>
         <el-button v-if="(title === '详情' && $route.query?.approvalStatusName === '草稿箱' && isCancel)" type="primary" @click="editForm">
diff --git a/src/views/finance/businessSettlement/list.vue b/src/views/finance/businessSettlement/list.vue
index e942abb..9543947 100644
--- a/src/views/finance/businessSettlement/list.vue
+++ b/src/views/finance/businessSettlement/list.vue
@@ -43,6 +43,7 @@
 const list = ref<IList[]>([]) // 表格数据
 // 选中的内容
 const checkoutList = ref<string[]>([])
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
diff --git a/src/views/finance/contract/list.vue b/src/views/finance/contract/list.vue
index 7dcdca5..5f8eb4e 100644
--- a/src/views/finance/contract/list.vue
+++ b/src/views/finance/contract/list.vue
@@ -59,6 +59,17 @@
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 选中的内容
 const checkoutList = ref<string[]>([])
+// 时间变更
+watch(dateRange, (val) => {
+  if (val) {
+    listQuery.value.estimateSignStartDate = `${val[0]}`
+    listQuery.value.estimateSignEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.estimateSignStartDate = ''
+    listQuery.value.estimateSignEndDate = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -66,8 +77,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.estimateSignStartDate = dateRange.value[0] as string || ''
-  listQuery.value.estimateSignEndDate = dateRange.value[1] as string || ''
+  // listQuery.value.estimateSignStartDate = dateRange.value[0] as string || ''
+  // listQuery.value.estimateSignEndDate = dateRange.value[1] as string || ''
   getContractList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: { estimateSignDate: string; agreementAmount: number }) => {
       return {
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 1bce5f9..07b2296 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,7 +1,7 @@
-<!-- 新增或详情弹窗 -->
+<!-- 新增或详情 -->
 <script lang="ts" setup name="addNotice">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
@@ -15,6 +15,7 @@
 import { SCHEDULE } from '@/utils/scheduleDict'
 const $route = useRoute()
 const $router = useRouter()
+const submitId = ref('') // 提交id-保存接口获取
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
 const fileTypeName = ref('')
@@ -40,12 +41,12 @@
   formId: SCHEDULE.FILE_APPROVAL,
 }) // 表单
 const rules = ref<FormRules>({
-  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
-  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
-  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
-  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
-  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+  fileName: [{ required: true, message: '名称必填', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建必填', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位必填', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间必填', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人必填', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号必填', trigger: 'blur' }],
 }) // 表单验证规则
 
 const userList = ref<userType[]>([]) // 可使用人列表
@@ -57,12 +58,14 @@
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
-const PubList = ref<deptType[]>([])
+const PubList = ref([]) as any// 发布单位列表
 const PubListTree = ref([])
 // 获取发布单位列表
 const getPubList = () => {
   getDeptTreeList().then((res) => {
     PubList.value = res.data
+    console.log('0000', 'ppp', PubList.value)
+
     PubListTree.value = toTreeList(res.data, '0', true)
   })
 }
@@ -113,43 +116,57 @@
   effectiveStatusName.value = ''
 }
 // 提交
-const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+const saveForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
-    `确认${flag}吗？`,
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then((res) => {
+        const publisherId = ruleForm.publisher
+        const index = PubList.value.findIndex((item: { id: string }) => item.id === publisherId)
+        if (index !== -1) {
+          ruleForm.publisher = PubList.value[index].name as string
+        }
+        // 保存（草稿箱）
+        confirmDrafts(ruleForm).then((res) => {
+          ruleForm.fileNo = res.data.fileNo
+          submitId.value = res.data.id
+          ElMessage.success('保存成功')
+          // formEl?.resetFields()
+          // $router.go(-1)
+          close()
+        })
+      })
+    }
+  })
+}
+const submitForm = () => {
+  if (!submitId.value) {
+    ElMessage.warning('请先保存')
+    return false
+  }
+  ElMessageBox.confirm(
+    '确认提交吗？',
     '提示',
     {
       confirmButtonText: '确认',
       cancelButtonText: '取消',
       type: 'warning',
     },
-      ).then((res) => {
-        if (flag === '提交') {
-          confirmDrafts(ruleForm).then((res) => {
-            if (res.code === 200) {
-              console.log(res.data, '保存成功')
-              submitFile({ id: res.data.id, formId: SCHEDULE.FILE_APPROVAL }).then((res) => {
-                formEl?.resetFields()
-                ElMessage.success('提交成功')
-                $router.go(-1)
-                close()
-              })
-            }
-          })
-        }
-        else {
-          // 保存（草稿箱）
-          confirmDrafts(ruleForm).then((res) => {
-            ElMessage.success('保存成功')
-            formEl?.resetFields()
-            $router.go(-1)
-            close()
-          })
-        }
-      })
-    }
+  ).then((res) => {
+    submitFile({ id: submitId.value, formId: SCHEDULE.FILE_APPROVAL }).then((res) => {
+    // formEl?.resetFields()
+      ElMessage.success('已提交')
+      $router.go(-1)
+      close()
+    })
   })
 }
 // 取消
@@ -163,9 +180,14 @@
 const onFileChange = (event: any) => {
   // 原生上传
   // console.log(event.target.files)
+
   if (event.target.files?.length !== 0) {
     // 创建formdata对象
     const fd = new FormData()
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
@@ -173,9 +195,11 @@
         // 重置当前验证
         ruleFormRef.value?.clearValidate('minioFileName')
         ElMessage.success('文件上传成功')
+        loading.close()
       }
       else {
         ElMessage.error(res.message)
+        loading.close()
       }
     })
   }
@@ -215,10 +239,10 @@
   <app-container style="overflow: hidden;">
     <detail-page :title="`${fileTypeName}-${title}`">
       <template #btns>
-        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm()">
           提交
         </el-button>
-        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
+        <el-button v-if="title !== '详情'" type="primary" @click="saveForm(ruleFormRef)">
           保存
         </el-button>
         <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -258,7 +282,7 @@
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
                 style="width: 100%;"
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 135d059..c2b46c0 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -1,6 +1,7 @@
 <!-- 文件审批公共模板 -->
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { DateModelType } from 'element-plus'
 import type { TableRow } from './approve-interface'
 import type { fileResType } from '@/views/measure/file/file-interface'
 import { printJSON } from '@/utils/printUtils'
@@ -32,12 +33,13 @@
 const approvalStatusReserveMap = ref({ ...props.approvalStatusReserveMap }) // 审批状态字典{草稿箱: 1}
 const activeTitle = ref('') // active对应的审批状态名字
 
-const searchQuery = reactive({
+const searchQuery = ref({
   fileNo: '', // 编号
   fileName: '', // 名称
   fileCode: '', // 文件号
   createUser: '', // 创建人
-  createTime: '', // 创建
+  createStartTime: '', // 创建开始时间
+  createEndTime: '', // 创建结束时间
   approvalStatus: approvalStatus.value, // 审批状态
   limit: 20,
   offset: 1,
@@ -49,18 +51,31 @@
 const total = ref<number>(0) // 数据总条数
 const columns = ref<TableColumn[]>([
   { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
+  { text: '编号', value: 'fileNo', align: 'center', width: '160' },
   { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
+  { text: '类别', value: 'fileTypeName', align: 'center' },
   { text: '创建人', value: 'createUser', align: 'center' },
-  { text: '创建时间', value: 'createTime', align: 'center' },
-  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110' },
 ]) // 表格
 const list = ref<TableRow[]>([]) // 表格数据
+// 筛选时间段数据
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    searchQuery.value.createStartTime = `${val[0]}`
+    searchQuery.value.createEndTime = `${val[1]}`
+  }
+  else {
+    searchQuery.value.createStartTime = ''
+    searchQuery.value.createEndTime = ''
+  }
+})
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
-  approvallistPageApi(searchQuery).then((res) => {
+  approvallistPageApi(searchQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows.map((item: TableRow) => {
         return {
@@ -85,10 +100,10 @@
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
-    searchQuery.limit = val.size
+    searchQuery.value.limit = val.size
   }
   if (val && val.page) {
-    searchQuery.offset = val.page
+    searchQuery.value.offset = val.page
   }
   getList()
 }
@@ -216,12 +231,21 @@
 }
 // 重置
 const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.fileType = ''
-  searchQuery.createTime = ''
-  searchQuery.createUser = ''
+  searchQuery.value = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    fileCode: '', // 文件号
+    createUser: '', // 创建人
+    createStartTime: '', // 创建开始时间
+    createEndTime: '', // 创建结束时间
+    approvalStatus: approvalStatus.value, // 审批状态
+    limit: 20,
+    offset: 1,
+    fileType: '', // 文件类别
+    formId: SCHEDULE.FILE_APPROVAL,
+    ids: [] as string[],
+  }
+  timeRange.value = ['', '']
   getList()
 }
 // 表格被选中的行
@@ -230,27 +254,6 @@
 const multiSelect = (row: TableRow[]) => {
   selectList.value = row
 }
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  searchQuery.ids = []
-  if (selectList.value.length) {
-    selectList.value.forEach((item) => {
-      searchQuery.ids?.push(item.id as string)
-    })
-  }
-  exportFileApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
-    exportFile(res.data, props.name)
-    loading.close()
-    searchQuery.ids = []
-  }).catch((_) => {
-    loading.close()
-  })
-}
 // 打印
 function printList() {
   const selectIds = selectList.value.map(item => item.id)
@@ -278,8 +281,8 @@
   sessionStorage.setItem('approveFileMenu', props.name)
   approvalStatus.value = approvalStatusReserveMap.value[props.name]
   // approvalStatus.value = approvalStatusReserveMap.value[props.name] // 失效
-  searchQuery.approvalStatus = approvalStatusReserveMap.value[props.name] || '0'
-  $router.currentRoute.value.query.cacheActive = searchQuery.approvalStatus
+  searchQuery.value.approvalStatus = approvalStatusReserveMap.value[props.name] || '0'
+  $router.currentRoute.value.query.cacheActive = searchQuery.value.approvalStatus
   getList()
   // 缓存名称
 }, { deep: true, immediate: true })
@@ -312,8 +315,14 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss" placeholder="创建时间"
+            v-model="timeRange"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="创建开始时间"
+            end-placeholder="创建结束时间"
+            clearable
+            style="width: 360px;"
           />
         </search-item>
         <search-item>
@@ -323,10 +332,6 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <icon-button
-            v-if="proxy.hasPerm('/file/approve/export')" icon="icon-export" title="导出"
-            @click="exportExcelBtn"
-          />
           <icon-button v-if="proxy.hasPerm('/file/approve/print')" icon="icon-print" title="打印" @click="printList" />
         </template>
         <!-- 表格区域 -->
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 9dd3633..de9e080 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -85,7 +85,7 @@
 const getStatus = () => {
   getDictByCode('effectiveStatus').then((res) => {
     if (res.code === 200) {
-      effectiveStatusSelect.value = [...res.data, { name: '全部', value: '', id: 'quanbu' }]
+      effectiveStatusSelect.value = res.data
     }
   })
 }
@@ -373,8 +373,8 @@
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/add`)" icon="icon-add" title="新建" @click="add" />
-          <icon-button v-if="proxy.hasPerm(`/file/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
-          <icon-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <!-- <icon-button v-if="proxy.hasPerm(`/file/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" /> -->
+          <!-- <icon-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" /> -->
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/print`)" icon="icon-print" title="打印" @click="printList" />
         </template>
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 3510056..ed3ab8c 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -282,8 +282,8 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/measure/price/import')" icon="icon-import" title="批量导入" type="primary" />
-        <icon-button v-if="proxy.hasPerm('/measure/price/mould')" icon="icon-template" title="模板下载" type="primary" />
+        <!-- <icon-button v-if="proxy.hasPerm('/measure/price/import')" icon="icon-import" title="批量导入" type="primary" /> -->
+        <!-- <icon-button v-if="proxy.hasPerm('/measure/price/mould')" icon="icon-template" title="模板下载" type="primary" /> -->
         <icon-button v-if="proxy.hasPerm('/measure/price/add')" icon="icon-add" title="新建" type="primary" @click="add" />
         <icon-button v-if="proxy.hasPerm('/measure/price/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/measure/price/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 60eeebb..7b6f4ec 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -61,7 +61,8 @@
   categoryName: [{ required: true, message: '类别不能为空', trigger: ['blur', 'change'] }],
   itemName: [{ required: true, message: '项目不能为空', trigger: ['blur', 'change'] }],
   priceStandardName: [{ required: true, message: '依据标准不能为空', trigger: ['blur', 'change'] }],
-  price: [{ required: true, message: '标准价格不能为空', trigger: ['blur', 'change'] }],
+  price: [{ required: true, message: '标准价格不能为空', trigger: ['blur', 'change'] },
+    { pattern: /^(?!0+(?:\.0+)?$)(?:[1-9]\d*|0)(?:\.\d{1,2})?$/, message: '要求不小于0，且最多保留两位小数', trigger: ['blur', 'change'] }],
   operatorDiscountPermission: [{ required: true, message: '业务员折扣权限不能为空', trigger: ['blur', 'change'] }],
   directorDiscountPermission: [{ required: true, message: '负责人折扣权限不能为空', trigger: ['blur', 'change'] }],
 })
@@ -255,7 +256,7 @@
                   v-model.trim="formInline.priceStandardName"
                   clearable
                   :placeholder="pageType === 'detail' ? '' : '依据标准'"
-                  :disabled="pageType === 'detail'"
+                  disabled
                 >
                   <template v-if="pageType !== 'detail'" #append>
                     <el-button
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 5e62137..22d1d8a 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -24,16 +24,16 @@
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    // { name: '删除', type: 'danger' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    // { name: '删除', type: 'danger' },
     { name: '取消', type: 'info' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    // { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
+    { name: '删除', type: 'danger' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
@@ -41,9 +41,10 @@
   ],
   已取消: [
     { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
     { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
-
 }
 // 当前tab
 const currentTab = ref('全部')
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index d2fad4c..004b856 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -28,10 +28,6 @@
 const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  // 审批中状态时候长度返回错误
-  if (props.status === '3' || props.status === '6') {
-    props.buttons.length = 4 // 传递长度 + 判断条件下显示按钮长度
-  }
   return props.buttons.length * 40 + 23
 })
 
@@ -63,13 +59,13 @@
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '溯源供方编号', value: 'supplierNo', width: '160', align: 'center' },
-  { text: '溯源供方名称', value: 'supplierName', width: '120', align: 'center' },
+  { text: '溯源供方名称', value: 'supplierName', align: 'center' },
   { text: '业务内容', value: 'businessContent', align: 'center' },
   { text: '业务范围', value: 'businessScope', align: 'center' },
   { text: '负责人', value: 'director', align: 'center' },
   { text: '联系方式', value: 'phone', align: 'center' },
   { text: '地址', value: 'address', align: 'center' },
-  { text: '创建时间', value: 'name', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
   { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110px' },
 ])
 // 初始化路由
@@ -86,15 +82,20 @@
     listQuery.value.offset = 1
   }
   getapprovalListPage(listQuery.value).then((response) => {
-    list.value = response.data.rows
-    if (!companyAddress.value) {
-      companyAddress.value = [response.data.rows[0].companyCountry, response.data.rows[0].companyProvince, response.data.rows[0].companyCity, response.data.rows[0].companyArea, response.data.rows[0].companyAddress]
-    }
-    else if (isReset) {
-      companyAddress.value = [response.data.rows[0].companyCountry, response.data.rows[0].companyProvince, response.data.rows[0].companyCity, response.data.rows[0].companyArea, response.data.rows[0].companyAddress]
+    list.value = response.data.rows.map((item: { companyProvinceName: string; companyCityName: string }) => {
+      return {
+        ...item,
+        address: item.companyProvinceName === item.companyCityName ? item.companyCityName : item.companyProvinceName + item.companyCityName,
+      }
+    })
+    // if (!companyAddress.value) {
+    //   companyAddress.value = [response.data.rows[0].companyCountry, response.data.rows[0].companyProvince, response.data.rows[0].companyCity, response.data.rows[0].companyArea, response.data.rows[0].companyAddress]
+    // }
+    if (isReset) {
+      companyAddress.value = ['', '', '', '', '']
+      // companyAddress.value = [response.data.rows[0].companyCountry, response.data.rows[0].companyProvince, response.data.rows[0].companyCity, response.data.rows[0].companyArea, response.data.rows[0].companyAddress]
     }
     total.value = parseInt(response.data.total)
-    console.log(companyAddress.value)
     loadingTable.value = false
   }).catch((_) => {
     loadingTable.value = false
@@ -107,6 +108,7 @@
 }
 // 公司地址变化后给对象赋值
 function companyAddressChange(addressObj: IAddress) {
+  console.log('公司地址变化后给对象赋值')
   listQuery.value.companyCountry = addressObj.country
   listQuery.value.companyProvince = addressObj.province
   listQuery.value.companyCity = addressObj.city
@@ -191,30 +193,6 @@
   }
   fetchData(true, true)
 }
-// 导出
-const exportExcelBtn = () => {
-  const params: supplierExportQuery = {
-    approvalStatus: listQuery.value.approvalStatus,
-    businessContent: listQuery.value.businessContent,
-    companyArea: listQuery.value.companyArea,
-    companyCity: listQuery.value.companyCity,
-    companyProvince: listQuery.value.companyProvince,
-    formId: listQuery.value.formId,
-    supplierName: listQuery.value.supplierName,
-    supplierNo: listQuery.value.supplierNo,
-  }
-  if (checkoutList.value.length > 0) {
-    params.ids = checkoutList.value
-  }
-  // TODO: 审批列表导出
-  console.log(params)
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  loading.close()
-}
 
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -237,10 +215,7 @@
 const add = () => {
   $router.push('/source/add')
 }
-// 批量导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 审批结束回调
 const approvalSuccess = () => {
   fetchData(true)
@@ -259,7 +234,7 @@
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    sourceSubmit({ id: row.id, formId: SCHEDULE.SUPPLIER_APPROVAL }).then((res) => {
+    sourceSubmit({ id: row.id, formId: SCHEDULE.SUPPLIER_APPROVAL, processId: row.processId }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
@@ -311,7 +286,7 @@
   (newVal: string) => {
     console.log('change status', newVal)
     listQuery.value.approvalStatus = newVal
-    fetchData(false)
+    clearList()
   },
   { immediate: true })
 
@@ -429,7 +404,7 @@
                   编辑
                 </el-button>
                 <el-button
-                  v-if="row.approvalStatusName === '草稿箱' "
+                  v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                   size="small"
                   link
                   type="primary"
@@ -448,20 +423,8 @@
                 >
                   取消
                 </el-button>
-                <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-                <!-- <el-button
-                  v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
-                  size="small"
-                  link
-                  type="danger"
-                  :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-                  @click="clickBtn(row, '删除')"
-                >
-                  删除
-                </el-button> -->
-                <!-- ------------------------------------审批中的删除暂时去掉-------------------------------- -->
                 <el-button
-                  v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+                  v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/measure/source/components/sourceApprovalDetail.vue b/src/views/measure/source/components/sourceApprovalDetail.vue
index c507032..35683e7 100644
--- a/src/views/measure/source/components/sourceApprovalDetail.vue
+++ b/src/views/measure/source/components/sourceApprovalDetail.vue
@@ -8,12 +8,15 @@
 import { getSoucreListDetail } from '@/api/measure/source'
 import { cancelApproval, fetchApproval } from '@/api/approval'
 import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
-
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import type { IAddress } from '@/components/AddressSelect/address-interface'
+const approvalDialog = ref() // 审批对话ref
 const approvalRecord = ref() // 审批流程组件ref
 const infoId = ref('') // id
+const taskId = ref('') // 任务id 用于审批
+const processId = ref('') // 流程实例id
 const approvalType = ref('')
 const approvalStatusName = ref('') // 审批状态、控制草稿箱没有审批流程
-
 // 从路由中获取页面类型参数
 const $route = useRoute()
 if ($route.params && $route.params.type) {
@@ -70,8 +73,9 @@
   approvalStatus: '', // 审批状态
   approvalStatusName: '', // 审批状态名称
 })
-
-const traceSupplierPersonList: Ref<traceSupplierPerson[]> = ref([])
+const companyAddress = ref<string[]>([]) // 公司地址
+const invoiceAddress = ref<string[]>([]) // 开票地址
+const traceSupplierPersonList: Ref<traceSupplierPerson[]> = ref([]) // 人员列表
 const columns = [
   { text: '人员编号', value: 'personNo' },
   { text: '姓名', value: 'name' },
@@ -83,9 +87,15 @@
 const getInfo = () => {
   getSoucreListDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data
+    traceSupplierPersonList.value = res.data.traceSupplierPersonList
+    // for (const key in dataForm.value) {
+    //   dataForm.value[key] = res.data[key]
+    // }
+    companyAddress.value = [dataForm.value.companyCountryName, dataForm.value.companyProvinceName, dataForm.value.companyCityName, dataForm.value.companyAreaName, dataForm.value.companyAddress]
+    invoiceAddress.value = [dataForm.value.invoiceCountryName, dataForm.value.invoiceProvinceName, dataForm.value.invoiceCityName, dataForm.value.invoiceAreaName, dataForm.value.invoiceAddress]
   })
 }
-getInfo()
+
 // 初始化router
 const $router = useRouter()
 // 关闭新增页面的回调
@@ -106,12 +116,12 @@
 }
 // 审批结束回调
 const approvalSuccess = () => {
-  getInfo()
+  close() // 返回上一页
 }
 // 取消
 const handleCancel = () => {
   const params = {
-    processInstanceId: dataForm.value.processId!,
+    processInstanceId: processId.value!,
     comments: '取消审批',
   }
   ElMessageBox.confirm(
@@ -125,21 +135,21 @@
   ).then(() => {
     cancelApproval(params).then(() => {
       ElMessage.success('取消成功')
+      close()
     })
   })
 }
-const approvalDialog = ref()
 // 点击数据后的操作按钮
 const clickBtn = (buttonType: string) => {
   switch (buttonType) {
     case '同意':
-      approvalDialog.value.initDialog('agree', dataForm.value.taskId)
+      approvalDialog.value.initDialog('agree', taskId.value)
       break
     case '驳回':
-      approvalDialog.value.initDialog('reject', dataForm.value.taskId)
+      approvalDialog.value.initDialog('reject', taskId.value)
       break
     case '拒绝':
-      approvalDialog.value.initDialog('refuse', dataForm.value.taskId)
+      approvalDialog.value.initDialog('refuse', taskId.value)
       break
     case '取消':
       handleCancel()
@@ -148,10 +158,14 @@
 }
 onMounted(() => {
   dataForm.value.processId = $route.query.processId as string// 流程实例id
+  processId.value = $route.query.processId as string// 流程实例id
   approvalStatusName.value = $route.query.approvalStatusName as string
+  taskId.value = $route.query.taskId as string
+
   if (approvalStatusName.value !== '草稿箱') {
-    getApprovalRecord(dataForm.value.processId) // 查询审批记录
+    getApprovalRecord(processId.value) // 查询审批记录
   }
+  getInfo() // 获取详情
 })
 </script>
 
@@ -162,13 +176,13 @@
         <el-button v-if="approvalType === '2'" type="primary" @click="clickBtn('同意')">
           同意
         </el-button>
-        <el-button v-if="approvalType === '2'" type="primary" @click="clickBtn('拒绝')">
-          拒绝
-        </el-button>
         <el-button v-if="approvalType === '2'" type="primary" @click="clickBtn('驳回')">
           驳回
         </el-button>
-        <el-button v-if="approvalType === '3'" type="primary" @click="handleCancel()">
+        <el-button v-if="approvalType === '2'" type="danger" @click="clickBtn('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="approvalType === '3'" type="info" @click="handleCancel()">
           取消
         </el-button>
         <el-button type="info" @click="close">
@@ -201,6 +215,7 @@
       <!-- 审批流程 -->
       <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
     </detail-block>
+    <!-- 审批弹窗 -->
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index e352e61..cda7d0c 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -89,7 +89,7 @@
   getSoucreList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: ISupplier) => {
       if (item.companyProvinceName && item.companyCityName) {
-        item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
+        item.briefName = `${item.companyProvinceName}${item.companyCityName}`
       }
       else {
         item.briefName = item.companyProvinceName || item.companyCityName
@@ -184,9 +184,10 @@
   })
   if (list.value.length > 0) {
     const params = {
-      supplierNo: '', // 业务内容
-      supplierName: '', // 溯源供方名称
-      businessContent: '', // 溯源供方编号
+      supplierNo: listQuery.value.supplierNo, // 业务内容
+      supplierName: listQuery.value.supplierName, // 溯源供方名称
+      businessContent: listQuery.value.businessContent, // 溯源供方编号
+      formId: SCHEDULE.SUPPLIER_APPROVAL,
       ids: checkoutList.value,
     }
     exportSourceList(params).then((res) => {
@@ -256,8 +257,8 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
-        <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" />
+        <!-- <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" /> -->
+        <!-- <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" /> -->
         <icon-button v-if="proxy.hasPerm('/measure/measureSource/add')" icon="icon-add" title="新建" type="primary" @click="add" />
         <icon-button v-if="proxy.hasPerm('/measure/measureSource/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/measure/measureSource/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index 939c80a..b107e3e 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -3,7 +3,7 @@
  * 添加/编辑/详情溯源供方
  */
 import type { Ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import baseInfoDetail from './components/baseInfoDetail.vue'
 import type { ISupplier, traceSupplierPerson } from './list_interface'
@@ -266,21 +266,12 @@
   })
 }
 
-// 提交表单
-const submitFunc = () => {
-// 再提交
-  const params = {
-    id: formInline.value.id,
-    formId: curFormId, // 表单id
-  }
-  sourceSubmit(params).then((res) => {
-    ElMessage.success('提交成功')
-    close()
-  })
-}
-
 // 点击提交
 const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formInline.value.id) {
+    ElMessage.warning('请先保存!')
+    return false
+  }
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
@@ -291,54 +282,14 @@
           type: 'warning',
         },
       ).then(() => {
-        if (!formInline.value.id) {
-          ElMessage.warning('请先保存!')
-          return false
+        const params = {
+          id: formInline.value.id,
+          formId: curFormId, // 表单id
         }
-        else {
-          const params = {
-            id: formInline.value.id,
-            formId: curFormId, // 表单id
-          }
-          sourceSubmit(params).then((res) => {
-            ElMessage.success('提交成功')
-            close()
-          })
-        }
-      //   if (from.value == 'reject') { // 驳回调用驳回编辑接口
-      //     failUpdateSourceApproval(formInline.value).then(() => {
-      //       ElMessage.success('提交成功!')
-      //     })
-      //   }
-      //   else {
-      //     // 如果id存在, 调用更新接口
-      //     if (formInline.value.id) {
-      //     // 如果表单变更过,先保存，再提交
-      //       if (isChanged.value) {
-      //         sourceDraftUpdate(formInline.value).then((res) => {
-      //           if (res.code === 200) {
-      //             submitFunc()
-      //           }
-      //           else {
-      //             ElMessage.error('保存失败，请重新保存后提交')
-      //           }
-      //         })
-      //       }
-      //       else { // 表单未变更过，直接提交
-      //         submitFunc()
-      //       }
-      //     }
-      //     else {
-      //     // id不存在，调用保存接口，再提交
-      //       sourceSave(formInline.value).then((res) => {
-      //         if (res.code === 200) {
-      //           formInline.value.id = res.data.id
-      //           formInline.value.supplierNo = res.data.supplierNo
-      //           submitFunc()
-      //         }
-      //       })
-      //     }
-      //   }
+        sourceSubmit(params).then((res) => {
+          ElMessage.success('提交成功')
+          close()
+        })
       })
     }
   })
@@ -352,13 +303,20 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
         formInline.value.minioFileName = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
+        loading.close()
       }
       else {
+        loading.close()
         ElMessage.error(res.message)
       }
     })
@@ -632,7 +590,6 @@
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
-        @row-dblclick="dblclickRow"
       >
         <el-table-column type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index 59ebc56..b7cffc7 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -80,13 +80,6 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  console.log(trainTimeRange.value)
-  console.log('----', createTimeRange.value)
-
-  listQuery.value.createEndTime = createTimeRange.value[1] as string || ''
-  listQuery.value.createStartTime = createTimeRange.value[0] as string || ''
-  listQuery.value.trainEndTime = trainTimeRange.value[1] as string || ''
-  listQuery.value.trainStartTime = trainTimeRange.value[0] as string || ''
   getapprovalList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -143,7 +136,30 @@
     }
   })
 }
-
+// 培训时间数组变更
+watch(trainTimeRange, (val) => {
+  if (val) {
+    listQuery.value.trainStartTime = `${val[0]}`
+    listQuery.value.trainEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.trainStartTime = ''
+    listQuery.value.trainEndTime = ''
+    trainTimeRange.value = ['', '']
+  }
+})
+// 创建时间变更
+watch(createTimeRange, (val) => {
+  if (val) {
+    listQuery.value.createStartTime = `${val[0]}`
+    listQuery.value.createEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.createStartTime = ''
+    listQuery.value.createEndTime = ''
+    createTimeRange.value = ['', '']
+  }
+})
 // 取消
 const handleCancel = (row: IPlanList) => {
   const params = {
diff --git a/src/views/measure/train/components/planApprovalDetail.vue b/src/views/measure/train/components/planApprovalDetail.vue
index 38fca62..f323b13 100644
--- a/src/views/measure/train/components/planApprovalDetail.vue
+++ b/src/views/measure/train/components/planApprovalDetail.vue
@@ -173,7 +173,7 @@
 
 <template>
   <app-container>
-    <detail-page title="培训管理审批">
+    <detail-page title="培训计划审批-详情">
       <template #btns>
         <el-button v-for="(item, index) in buttonArray" :key="index" :type="item.type" @click="clickBtn(item.name)">
           {{ item.name }}
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index 895e50e..a21a916 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -36,10 +36,6 @@
 
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.trainStartTime = trainTime.value[0] || ''
-  listQuery.value.trainEndTime = trainTime.value[1] || ''
-  listQuery.value.createStartTime = createTime.value[0] || ''
-  listQuery.value.createEndTime = createTime.value[0] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -72,7 +68,28 @@
 const searchList = () => {
   fetchData(true)
 }
-
+// 培训时间数组变更
+watch(trainTime, (val) => {
+  if (val) {
+    listQuery.value.trainStartTime = `${val[0]}`
+    listQuery.value.trainEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.trainStartTime = ''
+    listQuery.value.trainEndTime = ''
+  }
+})
+// 创建时间变更
+watch(createTime, (val) => {
+  if (val) {
+    listQuery.value.createStartTime = `${val[0]}`
+    listQuery.value.createEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.createStartTime = ''
+    listQuery.value.createEndTime = ''
+  }
+})
 // 重置
 const clearList = () => {
   listQuery.value = {

diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..9cf2b29 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -28,6 +28,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    DeptSelectByName: typeof import('./components/DeptSelectByName/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
diff --git a/src/views/business/board/standardReminder/list.vue b/src/views/business/board/standardReminder/list.vue
index 85efbb1..fd60743 100644
--- a/src/views/business/board/standardReminder/list.vue
+++ b/src/views/business/board/standardReminder/list.vue
@@ -94,12 +94,33 @@
 const preparation = ref<string>('')
 // 到期开始以及结束
 const validTime = ref<string>('')
+watch(preparation, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
+// 有效日期变更
+watch(validTime, (val) => {
+  if (val) {
+    listQuery.value.validStartTime = `${val[0]}`
+    listQuery.value.validEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.validStartTime = ''
+    listQuery.value.validEndTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.preparationStartDate = preparation.value[0] || ''
-  listQuery.value.preparationEndDate = preparation.value[1] || ''
-  listQuery.value.validStartTime = validTime.value[0] || ''
-  listQuery.value.validEndTime = validTime.value[1] || ''
+  // listQuery.value.preparationStartDate = preparation.value[0] || ''
+  // listQuery.value.preparationEndDate = preparation.value[1] || ''
+  // listQuery.value.validStartTime = validTime.value[0] || ''
+  // listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -223,16 +244,16 @@
   })
   if (list.value.length > 0) {
     const params = {
-      category: '', // 类别
-      id: '', // 主键id
-      managerState: '', // 管理状态
-      preparationEndDate: '', // 结束时间
-      preparationStartDate: '', // 开始时间
-      standardLaboratory: '', // 标准所在部门
-      standardName: '', // 标准名称
-      standardNo: '', // 标准编号
-      validEndTime: '', // 结束时间
-      validStartTime: '', // 开始时间
+      category: listQuery.value.category, // 类别
+      id: listQuery.value.id, // 主键id
+      managerState: listQuery.value.managerState, // 管理状态
+      preparationEndDate: listQuery.value.preparationEndDate, // 结束时间
+      preparationStartDate: listQuery.value.preparationStartDate, // 开始时间
+      standardLaboratory: listQuery.value.standardLaboratory, // 标准所在部门
+      standardName: listQuery.value.standardName, // 标准名称
+      standardNo: listQuery.value.standardNo, // 标准编号
+      validEndTime: listQuery.value.validEndTime, // 结束时间
+      validStartTime: listQuery.value.validStartTime, // 开始时间
       offset: 1, // 当前页
       limit: 20, // 每页多少条
       ids: checkoutList.value,
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 8666957..37ac73f 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -137,7 +137,7 @@
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  distributeDialogRef.value.initDialog(row.id, row.sampleId, row.orderId)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId, row.sampleStatus)
 }
 // 点击标签绑定
 const barCodeBind = ref()
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 807ea30..4e4eb46 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -37,11 +37,21 @@
   { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
   { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
 ])
-
+// 时间变更
+watch(trainTime, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 查询列表
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.startTime = trainTime.value[0] || ''
-  listQuery.value.endTime = trainTime.value[1] || ''
+  // listQuery.value.startTime = trainTime.value[0] || ''
+  // listQuery.value.endTime = trainTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2f7c1d0..bccde84 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -139,7 +139,17 @@
     id: '2', // 后端规定已收入传2
   })
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -147,8 +157,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.sampleStatus = active.value
   getInterChangeList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IinterchangeList) => {
@@ -280,7 +290,7 @@
       else if (type === 'delete') { // 无需检测
         interchangeStatusChange({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '7' }).then((res) => {
           if (res.code === 200) {
-            ElMessage.success(`已${title}`)
+            ElMessage.success('操作成功')
             fetchData(true)
           }
         })
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList.vue b/src/views/business/schedule/interchangeReceipt/receiptList.vue
index 275a053..83d93f4 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptList.vue
@@ -42,7 +42,17 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -50,8 +60,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getReceiptList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -124,13 +134,13 @@
   })
   if (list.value.length > 0) {
     const params = {
-      interchangeCode: '', // 交接单编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      reciever: '', // 接收人
-      deliverer: '', // 送样人
-      startTime: '', // 交接开始时间
-      endTime: '', // 交接结束时间
+      interchangeCode: listQuery.value.interchangeCode, // 交接单编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      reciever: listQuery.value.reciever, // 接收人
+      deliverer: listQuery.value.deliverer, // 送样人
+      startTime: listQuery.value.startTime, // 交接开始时间
+      endTime: listQuery.value.endTime, // 交接结束时间
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index cf0b532..f2fc852 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -26,8 +26,8 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   deliverer: '', // 送样人
-  isUrgent: 2, // 是否加急 2全部 1是 0否
-  status: 0, // 接收状态
+  isUrgent: '', // 是否加急 2全部 1是 0否
+  status: '', // 接收状态
   offset: 1,
   limit: 20,
 })
@@ -70,11 +70,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    isUrgentMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 2, // 是否加急全部后端定为2
-    })
+    // isUrgentMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 2, // 是否加急全部后端定为2
+    // })
   })
   // 接收状态
   getDictByCode('orderStatus').then((response) => {
@@ -85,11 +85,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    statusMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 0,
-    })
+    // statusMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 0,
+    // })
     console.log(statusMap.value)
   })
 }
@@ -125,8 +125,8 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     deliverer: '', // 送样人
-    isUrgent: 2, // 是否加急
-    status: 0, // 接收状态
+    isUrgent: '', // 是否加急 2全部 1是 0否
+    status: '', // 接收状态
     offset: 1,
     limit: 20,
   }
@@ -191,12 +191,12 @@
   })
   if (list.value.length > 0) {
     const params = {
-      orderCode: '', // 委托书编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      deliverer: '', // 送样人
-      isUrgent: 2, // 是否加急
-      status: 0, // 接收状态
+      orderCode: listQuery.value.orderCode, // 委托书编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      deliverer: listQuery.value.deliverer, // 送样人
+      isUrgent: listQuery.value.isUrgent, // 是否加急
+      status: listQuery.value.status, // 接收状态
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 2d92da9..14cd1ce 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -6,7 +6,7 @@
   customerName: string // 委托方名称
   deliverer: string // 送样人
   isUrgent: number | string // 是否加急
-  status: number // 接收状态
+  status: number | string// 接收状态
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 50308c7..25c5cf9 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -53,6 +53,7 @@
   handOutProperty: string // 分发性质-初次分发、退回分发
   id?: string // 实验室id
   customerId?: string // 客户id
+  certificationState?: string // 证书出具
 }
 
 // 实验室检测/我的检测列表
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index 7c17365..7159350 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -1,6 +1,6 @@
 <!-- 任务分发 -->
 <script lang="ts" setup name="TaskEdit">
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
 import ProcessConfig from './components/processConfig.vue'
@@ -11,6 +11,7 @@
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { UploadFile } from '@/api/measure/file'
 import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 interface dictType {
   id: string
@@ -251,16 +252,22 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    // UploadFile(fd).then((res) => {
-    //   if (res.code === 200) {
-    //     sampleForm.value.minioFileName = res.data[0]
-    //     // 重置当前验证
-    //     ElMessage.success('文件上传成功')
-    //   }
-    //   else {
-    //     ElMessage.error(res.message)
-    //   }
-    // })
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        sampleForm.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+        loading.close()
+      }
+      else {
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    })
   }
 }
 const upload = () => {
@@ -402,7 +409,7 @@
               <el-form-item label="校检类别:">
                 <el-select
                   v-model="sampleForm.measureCategory"
-                  :placeholder="roleType === 'detail' ? '' : '请选择校检类别'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择校检类别'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -424,7 +431,7 @@
               <el-form-item label="厂家国别:">
                 <el-select
                   v-model="sampleForm.manufacturerCountry"
-                  :placeholder="roleType === 'detail' ? '' : '请选择厂家国别'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择厂家国别'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -450,7 +457,7 @@
               <el-form-item label="ABC:">
                 <el-select
                   v-model="sampleForm.abc"
-                  :placeholder="roleType === 'detail' ? '' : '请选择ABC'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择ABC'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -504,8 +511,8 @@
               <el-form-item label="备注:">
                 <el-input
                   v-model="sampleForm.remark"
+                  autosize
                   type="textarea"
-                  :rows="2"
                   :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
                   :class="{ 'detail-input': roleType === 'detail' }"
@@ -516,7 +523,7 @@
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="sampleForm.measureType"
-                  :placeholder="roleType === 'detail' ? '' : '请选择检定方式'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择检定方式'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index dfbbf6a..6eeff55 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -81,7 +81,7 @@
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '165px' },
   { text: '样品属性', value: 'sampleBelongName', width: '100', align: 'center' },
   { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '90' },
-  { text: '证书出具', value: 'certificationState', align: 'center', width: '90', filter: (row: ITaskList) => { return `${row.alreadyCertifications}/${row.requireCertifications}` } },
+  { text: '证书出具', value: 'certificationState', align: 'center', width: '90' },
 ])
 // 表格数据
 const list = ref<ITaskList[]>([])
@@ -104,6 +104,7 @@
   getTaskList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: ITaskList) => {
       item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      item.certificationState = `${item.alreadyCertifications}/${item.requireCertifications}`
       return item
     })
     total.value = response.data.total
diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue
index e44dd67..194de53 100644
--- a/src/views/business/subpackage/apply/list.vue
+++ b/src/views/business/subpackage/apply/list.vue
@@ -302,7 +302,7 @@
         <search-item>
           <el-date-picker
             v-model="timeRange" type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="申请开始时间" end-placeholder="申请结束时间"
+            value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="申请开始时间" end-placeholder="申请结束时间" clearable
           />
         </search-item>
       </search-area>
diff --git a/src/views/business/subpackage/check/list.vue b/src/views/business/subpackage/check/list.vue
index 51ea419..a8b6744 100644
--- a/src/views/business/subpackage/check/list.vue
+++ b/src/views/business/subpackage/check/list.vue
@@ -111,8 +111,6 @@
 
 // 时间变更
 watch(timeRange, (val) => {
-  console.log(val[0])
-
   if (val) {
     listQuery.value.checkStartTime = `${val[0]}`
     listQuery.value.checkEndTime = `${val[1]}`
@@ -345,7 +343,8 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="timeRange" type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
+            v-model="timeRange"
+            clearable type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="验收开始时间" end-placeholder="验收结束时间"
           />
         </search-item>
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 98f4a39..a0db900 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -68,6 +68,7 @@
   else {
     listQuery.value.startTime = ''
     listQuery.value.endTime = ''
+    timeRange.value = ['', '']
   }
 })
 // 多选发生改变时
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index 6e41a94..ac98b8a 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -56,7 +56,17 @@
 const checkoutList = ref<string[]>([])
 // 文件上传input
 const fileRef = ref()
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -64,8 +74,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getSampleList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index 92e4b4a..6f465fc 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -67,7 +67,17 @@
     certificationStatusMap.value[`${item.value}`] = item.name
   })
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -75,8 +85,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getSampleList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IOvertimeList) => {
       return {
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index dbaa437..14464bf 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -86,6 +86,17 @@
     width: 160,
   },
 ]) // 表格
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 const fetchData = (isNowPage = false) => {
   loadingTable.value = true
@@ -93,8 +104,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.processResult = active.value
   getApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 60d1454..d0236cc 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -105,7 +105,17 @@
     align: 'center',
   },
 ])
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 const fetchData = (isNowPage = false) => {
   loadingTable.value = true
@@ -113,8 +123,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.approvalStatus = active.value
   getApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index aeb568e..5430b0f 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -103,10 +103,21 @@
 // 装载时间数组
 const checkTime = ref<string>('')
 const loadingTable = ref(false)
+// 时间变更
+watch(checkTime, (val) => {
+  if (val) {
+    listQuery.value.checkStartDate = `${val[0]}`
+    listQuery.value.checkEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.checkStartDate = ''
+    listQuery.value.checkEndDate = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.checkStartDate = checkTime.value[0] || ''
-  listQuery.value.checkEndDate = checkTime.value[1] || ''
+  // listQuery.value.checkStartDate = checkTime.value[0] || ''
+  // listQuery.value.checkEndDate = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 6229abf..9d30934 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -112,10 +112,21 @@
 // 装载时间数组
 const checkTime = ref('')
 const loadingTable = ref(false)
+// 时间变更
+watch(checkTime, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.startTime = checkTime.value[0] || ''
-  listQuery.value.endTime = checkTime.value[1] || ''
+  // listQuery.value.startTime = checkTime.value[0] || ''
+  // listQuery.value.endTime = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index daca294..de18467 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -66,6 +66,17 @@
 const checkoutList = ref<IManageChecklist[]>([])
 // 文件上传input
 const fileRef = ref()
+// 时间变更
+watch(checkDate, (val) => {
+  if (val) {
+    listQuery.value.checkStartDate = `${val[0]}`
+    listQuery.value.checkEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.checkStartDate = ''
+    listQuery.value.checkEndDate = ''
+  }
+})
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
@@ -73,8 +84,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.checkStartDate = checkDate.value[0] || ''
-  listQuery.value.checkEndDate = checkDate.value[1] || ''
+  // listQuery.value.checkStartDate = checkDate.value[0] || ''
+  // listQuery.value.checkEndDate = checkDate.value[1] || ''
   getcheckInfoList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: any) => {
       return {
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 00d283c..50b014c 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -99,6 +99,17 @@
     approvalStatusReserveMap.value[item.name] = `${item.value}`
   })
 }
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -106,8 +117,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.approvalStatus = active.value
   getReceiveApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/receive/solve/solveList.vue b/src/views/device/receive/solve/solveList.vue
index 809c0c1..ec1e8bb 100644
--- a/src/views/device/receive/solve/solveList.vue
+++ b/src/views/device/receive/solve/solveList.vue
@@ -120,7 +120,17 @@
   timeRange.value = ['', ''] // 把时间选择框置空
   fetchData(true)
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -128,8 +138,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getReceiveApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IsolveListType) => {
       return {
diff --git a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
index 4744536..b4fe085 100644
--- a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
@@ -43,7 +43,12 @@
   select.value = -1
   listPageApi(listQuery.value).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows
+      list.value = res.data.rows.map((item: { effectiveStatusName: string }) => {
+        return {
+          ...item,
+          isDisabled: item.effectiveStatusName === '已废止',
+        }
+      })
       total.value = res.data.total
     }
   })
@@ -142,7 +147,7 @@
           </el-table-column>
           <el-table-column label="" width="55" align="center" fixed="left">
             <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
+              <el-radio v-model="select" :disabled="scope.row.isDisabled" :label="scope.$index" class="radio" />
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index a030dcf..0dd5547 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -94,12 +94,34 @@
 const preparation = ref<string>('')
 // 到期开始以及结束
 const validTime = ref<string>('')
+// 筹建日期变更
+watch(preparation, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
+// 有效日期变更
+watch(validTime, (val) => {
+  if (val) {
+    listQuery.value.validStartTime = `${val[0]}`
+    listQuery.value.validEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.validStartTime = ''
+    listQuery.value.validEndTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.preparationStartDate = preparation.value[0] || ''
-  listQuery.value.preparationEndDate = preparation.value[1] || ''
-  listQuery.value.validStartTime = validTime.value[0] || ''
-  listQuery.value.validEndTime = validTime.value[1] || ''
+  // listQuery.value.preparationStartDate = preparation.value[0] || ''
+  // listQuery.value.preparationEndDate = preparation.value[1] || ''
+  // listQuery.value.validStartTime = validTime.value[0] || ''
+  // listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index 39d8683..bb69fe9 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -99,6 +99,17 @@
 const standardManagerStateList = ref<IOptions[]>([])
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
+// 时间变更
+watch(preparationDate, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
@@ -107,8 +118,8 @@
     listQuery.value.offset = 1
   }
   // 筹建日期
-  listQuery.value.preparationStartDate = preparationDate.value[0] || ''
-  listQuery.value.preparationEndDate = preparationDate.value[1] || ''
+  // listQuery.value.preparationStartDate = preparationDate.value[0] || ''
+  // listQuery.value.preparationEndDate = preparationDate.value[1] || ''
   getStandardList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: any) => {
       return {
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 37205fc..edf9dd7 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -793,7 +793,7 @@
             保存
           </el-button>
           <!-- 待审批 -->
-          <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'agree' })">
+          <!-- <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'agree' })">
             同意
           </el-button>
           <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'reject' })">
@@ -801,7 +801,7 @@
           </el-button>
           <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'refuse' })">
             拒绝
-          </el-button>
+          </el-button> -->
           <!-- </template> -->
         </template>
         <el-button v-if="(title === '详情' && $route.query?.approvalStatusName === '草稿箱' && isCancel)" type="primary" @click="editForm">
diff --git a/src/views/finance/businessSettlement/list.vue b/src/views/finance/businessSettlement/list.vue
index e942abb..9543947 100644
--- a/src/views/finance/businessSettlement/list.vue
+++ b/src/views/finance/businessSettlement/list.vue
@@ -43,6 +43,7 @@
 const list = ref<IList[]>([]) // 表格数据
 // 选中的内容
 const checkoutList = ref<string[]>([])
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
diff --git a/src/views/finance/contract/list.vue b/src/views/finance/contract/list.vue
index 7dcdca5..5f8eb4e 100644
--- a/src/views/finance/contract/list.vue
+++ b/src/views/finance/contract/list.vue
@@ -59,6 +59,17 @@
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 选中的内容
 const checkoutList = ref<string[]>([])
+// 时间变更
+watch(dateRange, (val) => {
+  if (val) {
+    listQuery.value.estimateSignStartDate = `${val[0]}`
+    listQuery.value.estimateSignEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.estimateSignStartDate = ''
+    listQuery.value.estimateSignEndDate = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -66,8 +77,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.estimateSignStartDate = dateRange.value[0] as string || ''
-  listQuery.value.estimateSignEndDate = dateRange.value[1] as string || ''
+  // listQuery.value.estimateSignStartDate = dateRange.value[0] as string || ''
+  // listQuery.value.estimateSignEndDate = dateRange.value[1] as string || ''
   getContractList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: { estimateSignDate: string; agreementAmount: number }) => {
       return {
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 1bce5f9..07b2296 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,7 +1,7 @@
-<!-- 新增或详情弹窗 -->
+<!-- 新增或详情 -->
 <script lang="ts" setup name="addNotice">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
@@ -15,6 +15,7 @@
 import { SCHEDULE } from '@/utils/scheduleDict'
 const $route = useRoute()
 const $router = useRouter()
+const submitId = ref('') // 提交id-保存接口获取
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
 const fileTypeName = ref('')
@@ -40,12 +41,12 @@
   formId: SCHEDULE.FILE_APPROVAL,
 }) // 表单
 const rules = ref<FormRules>({
-  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
-  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
-  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
-  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
-  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+  fileName: [{ required: true, message: '名称必填', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建必填', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位必填', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间必填', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人必填', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号必填', trigger: 'blur' }],
 }) // 表单验证规则
 
 const userList = ref<userType[]>([]) // 可使用人列表
@@ -57,12 +58,14 @@
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
-const PubList = ref<deptType[]>([])
+const PubList = ref([]) as any// 发布单位列表
 const PubListTree = ref([])
 // 获取发布单位列表
 const getPubList = () => {
   getDeptTreeList().then((res) => {
     PubList.value = res.data
+    console.log('0000', 'ppp', PubList.value)
+
     PubListTree.value = toTreeList(res.data, '0', true)
   })
 }
@@ -113,43 +116,57 @@
   effectiveStatusName.value = ''
 }
 // 提交
-const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+const saveForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
-    `确认${flag}吗？`,
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then((res) => {
+        const publisherId = ruleForm.publisher
+        const index = PubList.value.findIndex((item: { id: string }) => item.id === publisherId)
+        if (index !== -1) {
+          ruleForm.publisher = PubList.value[index].name as string
+        }
+        // 保存（草稿箱）
+        confirmDrafts(ruleForm).then((res) => {
+          ruleForm.fileNo = res.data.fileNo
+          submitId.value = res.data.id
+          ElMessage.success('保存成功')
+          // formEl?.resetFields()
+          // $router.go(-1)
+          close()
+        })
+      })
+    }
+  })
+}
+const submitForm = () => {
+  if (!submitId.value) {
+    ElMessage.warning('请先保存')
+    return false
+  }
+  ElMessageBox.confirm(
+    '确认提交吗？',
     '提示',
     {
       confirmButtonText: '确认',
       cancelButtonText: '取消',
       type: 'warning',
     },
-      ).then((res) => {
-        if (flag === '提交') {
-          confirmDrafts(ruleForm).then((res) => {
-            if (res.code === 200) {
-              console.log(res.data, '保存成功')
-              submitFile({ id: res.data.id, formId: SCHEDULE.FILE_APPROVAL }).then((res) => {
-                formEl?.resetFields()
-                ElMessage.success('提交成功')
-                $router.go(-1)
-                close()
-              })
-            }
-          })
-        }
-        else {
-          // 保存（草稿箱）
-          confirmDrafts(ruleForm).then((res) => {
-            ElMessage.success('保存成功')
-            formEl?.resetFields()
-            $router.go(-1)
-            close()
-          })
-        }
-      })
-    }
+  ).then((res) => {
+    submitFile({ id: submitId.value, formId: SCHEDULE.FILE_APPROVAL }).then((res) => {
+    // formEl?.resetFields()
+      ElMessage.success('已提交')
+      $router.go(-1)
+      close()
+    })
   })
 }
 // 取消
@@ -163,9 +180,14 @@
 const onFileChange = (event: any) => {
   // 原生上传
   // console.log(event.target.files)
+
   if (event.target.files?.length !== 0) {
     // 创建formdata对象
     const fd = new FormData()
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
@@ -173,9 +195,11 @@
         // 重置当前验证
         ruleFormRef.value?.clearValidate('minioFileName')
         ElMessage.success('文件上传成功')
+        loading.close()
       }
       else {
         ElMessage.error(res.message)
+        loading.close()
       }
     })
   }
@@ -215,10 +239,10 @@
   <app-container style="overflow: hidden;">
     <detail-page :title="`${fileTypeName}-${title}`">
       <template #btns>
-        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm()">
           提交
         </el-button>
-        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
+        <el-button v-if="title !== '详情'" type="primary" @click="saveForm(ruleFormRef)">
           保存
         </el-button>
         <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -258,7 +282,7 @@
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
                 style="width: 100%;"
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 135d059..c2b46c0 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -1,6 +1,7 @@
 <!-- 文件审批公共模板 -->
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { DateModelType } from 'element-plus'
 import type { TableRow } from './approve-interface'
 import type { fileResType } from '@/views/measure/file/file-interface'
 import { printJSON } from '@/utils/printUtils'
@@ -32,12 +33,13 @@
 const approvalStatusReserveMap = ref({ ...props.approvalStatusReserveMap }) // 审批状态字典{草稿箱: 1}
 const activeTitle = ref('') // active对应的审批状态名字
 
-const searchQuery = reactive({
+const searchQuery = ref({
   fileNo: '', // 编号
   fileName: '', // 名称
   fileCode: '', // 文件号
   createUser: '', // 创建人
-  createTime: '', // 创建
+  createStartTime: '', // 创建开始时间
+  createEndTime: '', // 创建结束时间
   approvalStatus: approvalStatus.value, // 审批状态
   limit: 20,
   offset: 1,
@@ -49,18 +51,31 @@
 const total = ref<number>(0) // 数据总条数
 const columns = ref<TableColumn[]>([
   { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
+  { text: '编号', value: 'fileNo', align: 'center', width: '160' },
   { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
+  { text: '类别', value: 'fileTypeName', align: 'center' },
   { text: '创建人', value: 'createUser', align: 'center' },
-  { text: '创建时间', value: 'createTime', align: 'center' },
-  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110' },
 ]) // 表格
 const list = ref<TableRow[]>([]) // 表格数据
+// 筛选时间段数据
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    searchQuery.value.createStartTime = `${val[0]}`
+    searchQuery.value.createEndTime = `${val[1]}`
+  }
+  else {
+    searchQuery.value.createStartTime = ''
+    searchQuery.value.createEndTime = ''
+  }
+})
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
-  approvallistPageApi(searchQuery).then((res) => {
+  approvallistPageApi(searchQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows.map((item: TableRow) => {
         return {
@@ -85,10 +100,10 @@
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
-    searchQuery.limit = val.size
+    searchQuery.value.limit = val.size
   }
   if (val && val.page) {
-    searchQuery.offset = val.page
+    searchQuery.value.offset = val.page
   }
   getList()
 }
@@ -216,12 +231,21 @@
 }
 // 重置
 const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.fileType = ''
-  searchQuery.createTime = ''
-  searchQuery.createUser = ''
+  searchQuery.value = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    fileCode: '', // 文件号
+    createUser: '', // 创建人
+    createStartTime: '', // 创建开始时间
+    createEndTime: '', // 创建结束时间
+    approvalStatus: approvalStatus.value, // 审批状态
+    limit: 20,
+    offset: 1,
+    fileType: '', // 文件类别
+    formId: SCHEDULE.FILE_APPROVAL,
+    ids: [] as string[],
+  }
+  timeRange.value = ['', '']
   getList()
 }
 // 表格被选中的行
@@ -230,27 +254,6 @@
 const multiSelect = (row: TableRow[]) => {
   selectList.value = row
 }
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  searchQuery.ids = []
-  if (selectList.value.length) {
-    selectList.value.forEach((item) => {
-      searchQuery.ids?.push(item.id as string)
-    })
-  }
-  exportFileApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
-    exportFile(res.data, props.name)
-    loading.close()
-    searchQuery.ids = []
-  }).catch((_) => {
-    loading.close()
-  })
-}
 // 打印
 function printList() {
   const selectIds = selectList.value.map(item => item.id)
@@ -278,8 +281,8 @@
   sessionStorage.setItem('approveFileMenu', props.name)
   approvalStatus.value = approvalStatusReserveMap.value[props.name]
   // approvalStatus.value = approvalStatusReserveMap.value[props.name] // 失效
-  searchQuery.approvalStatus = approvalStatusReserveMap.value[props.name] || '0'
-  $router.currentRoute.value.query.cacheActive = searchQuery.approvalStatus
+  searchQuery.value.approvalStatus = approvalStatusReserveMap.value[props.name] || '0'
+  $router.currentRoute.value.query.cacheActive = searchQuery.value.approvalStatus
   getList()
   // 缓存名称
 }, { deep: true, immediate: true })
@@ -312,8 +315,14 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss" placeholder="创建时间"
+            v-model="timeRange"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="创建开始时间"
+            end-placeholder="创建结束时间"
+            clearable
+            style="width: 360px;"
           />
         </search-item>
         <search-item>
@@ -323,10 +332,6 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <icon-button
-            v-if="proxy.hasPerm('/file/approve/export')" icon="icon-export" title="导出"
-            @click="exportExcelBtn"
-          />
           <icon-button v-if="proxy.hasPerm('/file/approve/print')" icon="icon-print" title="打印" @click="printList" />
         </template>
         <!-- 表格区域 -->
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 9dd3633..de9e080 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -85,7 +85,7 @@
 const getStatus = () => {
   getDictByCode('effectiveStatus').then((res) => {
     if (res.code === 200) {
-      effectiveStatusSelect.value = [...res.data, { name: '全部', value: '', id: 'quanbu' }]
+      effectiveStatusSelect.value = res.data
     }
   })
 }
@@ -373,8 +373,8 @@
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/add`)" icon="icon-add" title="新建" @click="add" />
-          <icon-button v-if="proxy.hasPerm(`/file/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
-          <icon-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <!-- <icon-button v-if="proxy.hasPerm(`/file/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" /> -->
+          <!-- <icon-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" /> -->
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/print`)" icon="icon-print" title="打印" @click="printList" />
         </template>
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 3510056..ed3ab8c 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -282,8 +282,8 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/measure/price/import')" icon="icon-import" title="批量导入" type="primary" />
-        <icon-button v-if="proxy.hasPerm('/measure/price/mould')" icon="icon-template" title="模板下载" type="primary" />
+        <!-- <icon-button v-if="proxy.hasPerm('/measure/price/import')" icon="icon-import" title="批量导入" type="primary" /> -->
+        <!-- <icon-button v-if="proxy.hasPerm('/measure/price/mould')" icon="icon-template" title="模板下载" type="primary" /> -->
         <icon-button v-if="proxy.hasPerm('/measure/price/add')" icon="icon-add" title="新建" type="primary" @click="add" />
         <icon-button v-if="proxy.hasPerm('/measure/price/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/measure/price/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 60eeebb..7b6f4ec 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -61,7 +61,8 @@
   categoryName: [{ required: true, message: '类别不能为空', trigger: ['blur', 'change'] }],
   itemName: [{ required: true, message: '项目不能为空', trigger: ['blur', 'change'] }],
   priceStandardName: [{ required: true, message: '依据标准不能为空', trigger: ['blur', 'change'] }],
-  price: [{ required: true, message: '标准价格不能为空', trigger: ['blur', 'change'] }],
+  price: [{ required: true, message: '标准价格不能为空', trigger: ['blur', 'change'] },
+    { pattern: /^(?!0+(?:\.0+)?$)(?:[1-9]\d*|0)(?:\.\d{1,2})?$/, message: '要求不小于0，且最多保留两位小数', trigger: ['blur', 'change'] }],
   operatorDiscountPermission: [{ required: true, message: '业务员折扣权限不能为空', trigger: ['blur', 'change'] }],
   directorDiscountPermission: [{ required: true, message: '负责人折扣权限不能为空', trigger: ['blur', 'change'] }],
 })
@@ -255,7 +256,7 @@
                   v-model.trim="formInline.priceStandardName"
                   clearable
                   :placeholder="pageType === 'detail' ? '' : '依据标准'"
-                  :disabled="pageType === 'detail'"
+                  disabled
                 >
                   <template v-if="pageType !== 'detail'" #append>
                     <el-button
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 5e62137..22d1d8a 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -24,16 +24,16 @@
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    // { name: '删除', type: 'danger' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    // { name: '删除', type: 'danger' },
     { name: '取消', type: 'info' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    // { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
+    { name: '删除', type: 'danger' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
@@ -41,9 +41,10 @@
   ],
   已取消: [
     { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
     { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
-
 }
 // 当前tab
 const currentTab = ref('全部')
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index d2fad4c..004b856 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -28,10 +28,6 @@
 const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  // 审批中状态时候长度返回错误
-  if (props.status === '3' || props.status === '6') {
-    props.buttons.length = 4 // 传递长度 + 判断条件下显示按钮长度
-  }
   return props.buttons.length * 40 + 23
 })
 
@@ -63,13 +59,13 @@
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '溯源供方编号', value: 'supplierNo', width: '160', align: 'center' },
-  { text: '溯源供方名称', value: 'supplierName', width: '120', align: 'center' },
+  { text: '溯源供方名称', value: 'supplierName', align: 'center' },
   { text: '业务内容', value: 'businessContent', align: 'center' },
   { text: '业务范围', value: 'businessScope', align: 'center' },
   { text: '负责人', value: 'director', align: 'center' },
   { text: '联系方式', value: 'phone', align: 'center' },
   { text: '地址', value: 'address', align: 'center' },
-  { text: '创建时间', value: 'name', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
   { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110px' },
 ])
 // 初始化路由
@@ -86,15 +82,20 @@
     listQuery.value.offset = 1
   }
   getapprovalListPage(listQuery.value).then((response) => {
-    list.value = response.data.rows
-    if (!companyAddress.value) {
-      companyAddress.value = [response.data.rows[0].companyCountry, response.data.rows[0].companyProvince, response.data.rows[0].companyCity, response.data.rows[0].companyArea, response.data.rows[0].companyAddress]
-    }
-    else if (isReset) {
-      companyAddress.value = [response.data.rows[0].companyCountry, response.data.rows[0].companyProvince, response.data.rows[0].companyCity, response.data.rows[0].companyArea, response.data.rows[0].companyAddress]
+    list.value = response.data.rows.map((item: { companyProvinceName: string; companyCityName: string }) => {
+      return {
+        ...item,
+        address: item.companyProvinceName === item.companyCityName ? item.companyCityName : item.companyProvinceName + item.companyCityName,
+      }
+    })
+    // if (!companyAddress.value) {
+    //   companyAddress.value = [response.data.rows[0].companyCountry, response.data.rows[0].companyProvince, response.data.rows[0].companyCity, response.data.rows[0].companyArea, response.data.rows[0].companyAddress]
+    // }
+    if (isReset) {
+      companyAddress.value = ['', '', '', '', '']
+      // companyAddress.value = [response.data.rows[0].companyCountry, response.data.rows[0].companyProvince, response.data.rows[0].companyCity, response.data.rows[0].companyArea, response.data.rows[0].companyAddress]
     }
     total.value = parseInt(response.data.total)
-    console.log(companyAddress.value)
     loadingTable.value = false
   }).catch((_) => {
     loadingTable.value = false
@@ -107,6 +108,7 @@
 }
 // 公司地址变化后给对象赋值
 function companyAddressChange(addressObj: IAddress) {
+  console.log('公司地址变化后给对象赋值')
   listQuery.value.companyCountry = addressObj.country
   listQuery.value.companyProvince = addressObj.province
   listQuery.value.companyCity = addressObj.city
@@ -191,30 +193,6 @@
   }
   fetchData(true, true)
 }
-// 导出
-const exportExcelBtn = () => {
-  const params: supplierExportQuery = {
-    approvalStatus: listQuery.value.approvalStatus,
-    businessContent: listQuery.value.businessContent,
-    companyArea: listQuery.value.companyArea,
-    companyCity: listQuery.value.companyCity,
-    companyProvince: listQuery.value.companyProvince,
-    formId: listQuery.value.formId,
-    supplierName: listQuery.value.supplierName,
-    supplierNo: listQuery.value.supplierNo,
-  }
-  if (checkoutList.value.length > 0) {
-    params.ids = checkoutList.value
-  }
-  // TODO: 审批列表导出
-  console.log(params)
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  loading.close()
-}
 
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -237,10 +215,7 @@
 const add = () => {
   $router.push('/source/add')
 }
-// 批量导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 审批结束回调
 const approvalSuccess = () => {
   fetchData(true)
@@ -259,7 +234,7 @@
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    sourceSubmit({ id: row.id, formId: SCHEDULE.SUPPLIER_APPROVAL }).then((res) => {
+    sourceSubmit({ id: row.id, formId: SCHEDULE.SUPPLIER_APPROVAL, processId: row.processId }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
@@ -311,7 +286,7 @@
   (newVal: string) => {
     console.log('change status', newVal)
     listQuery.value.approvalStatus = newVal
-    fetchData(false)
+    clearList()
   },
   { immediate: true })
 
@@ -429,7 +404,7 @@
                   编辑
                 </el-button>
                 <el-button
-                  v-if="row.approvalStatusName === '草稿箱' "
+                  v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                   size="small"
                   link
                   type="primary"
@@ -448,20 +423,8 @@
                 >
                   取消
                 </el-button>
-                <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-                <!-- <el-button
-                  v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
-                  size="small"
-                  link
-                  type="danger"
-                  :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-                  @click="clickBtn(row, '删除')"
-                >
-                  删除
-                </el-button> -->
-                <!-- ------------------------------------审批中的删除暂时去掉-------------------------------- -->
                 <el-button
-                  v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+                  v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/measure/source/components/sourceApprovalDetail.vue b/src/views/measure/source/components/sourceApprovalDetail.vue
index c507032..35683e7 100644
--- a/src/views/measure/source/components/sourceApprovalDetail.vue
+++ b/src/views/measure/source/components/sourceApprovalDetail.vue
@@ -8,12 +8,15 @@
 import { getSoucreListDetail } from '@/api/measure/source'
 import { cancelApproval, fetchApproval } from '@/api/approval'
 import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
-
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import type { IAddress } from '@/components/AddressSelect/address-interface'
+const approvalDialog = ref() // 审批对话ref
 const approvalRecord = ref() // 审批流程组件ref
 const infoId = ref('') // id
+const taskId = ref('') // 任务id 用于审批
+const processId = ref('') // 流程实例id
 const approvalType = ref('')
 const approvalStatusName = ref('') // 审批状态、控制草稿箱没有审批流程
-
 // 从路由中获取页面类型参数
 const $route = useRoute()
 if ($route.params && $route.params.type) {
@@ -70,8 +73,9 @@
   approvalStatus: '', // 审批状态
   approvalStatusName: '', // 审批状态名称
 })
-
-const traceSupplierPersonList: Ref<traceSupplierPerson[]> = ref([])
+const companyAddress = ref<string[]>([]) // 公司地址
+const invoiceAddress = ref<string[]>([]) // 开票地址
+const traceSupplierPersonList: Ref<traceSupplierPerson[]> = ref([]) // 人员列表
 const columns = [
   { text: '人员编号', value: 'personNo' },
   { text: '姓名', value: 'name' },
@@ -83,9 +87,15 @@
 const getInfo = () => {
   getSoucreListDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data
+    traceSupplierPersonList.value = res.data.traceSupplierPersonList
+    // for (const key in dataForm.value) {
+    //   dataForm.value[key] = res.data[key]
+    // }
+    companyAddress.value = [dataForm.value.companyCountryName, dataForm.value.companyProvinceName, dataForm.value.companyCityName, dataForm.value.companyAreaName, dataForm.value.companyAddress]
+    invoiceAddress.value = [dataForm.value.invoiceCountryName, dataForm.value.invoiceProvinceName, dataForm.value.invoiceCityName, dataForm.value.invoiceAreaName, dataForm.value.invoiceAddress]
   })
 }
-getInfo()
+
 // 初始化router
 const $router = useRouter()
 // 关闭新增页面的回调
@@ -106,12 +116,12 @@
 }
 // 审批结束回调
 const approvalSuccess = () => {
-  getInfo()
+  close() // 返回上一页
 }
 // 取消
 const handleCancel = () => {
   const params = {
-    processInstanceId: dataForm.value.processId!,
+    processInstanceId: processId.value!,
     comments: '取消审批',
   }
   ElMessageBox.confirm(
@@ -125,21 +135,21 @@
   ).then(() => {
     cancelApproval(params).then(() => {
       ElMessage.success('取消成功')
+      close()
     })
   })
 }
-const approvalDialog = ref()
 // 点击数据后的操作按钮
 const clickBtn = (buttonType: string) => {
   switch (buttonType) {
     case '同意':
-      approvalDialog.value.initDialog('agree', dataForm.value.taskId)
+      approvalDialog.value.initDialog('agree', taskId.value)
       break
     case '驳回':
-      approvalDialog.value.initDialog('reject', dataForm.value.taskId)
+      approvalDialog.value.initDialog('reject', taskId.value)
       break
     case '拒绝':
-      approvalDialog.value.initDialog('refuse', dataForm.value.taskId)
+      approvalDialog.value.initDialog('refuse', taskId.value)
       break
     case '取消':
       handleCancel()
@@ -148,10 +158,14 @@
 }
 onMounted(() => {
   dataForm.value.processId = $route.query.processId as string// 流程实例id
+  processId.value = $route.query.processId as string// 流程实例id
   approvalStatusName.value = $route.query.approvalStatusName as string
+  taskId.value = $route.query.taskId as string
+
   if (approvalStatusName.value !== '草稿箱') {
-    getApprovalRecord(dataForm.value.processId) // 查询审批记录
+    getApprovalRecord(processId.value) // 查询审批记录
   }
+  getInfo() // 获取详情
 })
 </script>
 
@@ -162,13 +176,13 @@
         <el-button v-if="approvalType === '2'" type="primary" @click="clickBtn('同意')">
           同意
         </el-button>
-        <el-button v-if="approvalType === '2'" type="primary" @click="clickBtn('拒绝')">
-          拒绝
-        </el-button>
         <el-button v-if="approvalType === '2'" type="primary" @click="clickBtn('驳回')">
           驳回
         </el-button>
-        <el-button v-if="approvalType === '3'" type="primary" @click="handleCancel()">
+        <el-button v-if="approvalType === '2'" type="danger" @click="clickBtn('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="approvalType === '3'" type="info" @click="handleCancel()">
           取消
         </el-button>
         <el-button type="info" @click="close">
@@ -201,6 +215,7 @@
       <!-- 审批流程 -->
       <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
     </detail-block>
+    <!-- 审批弹窗 -->
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index e352e61..cda7d0c 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -89,7 +89,7 @@
   getSoucreList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: ISupplier) => {
       if (item.companyProvinceName && item.companyCityName) {
-        item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
+        item.briefName = `${item.companyProvinceName}${item.companyCityName}`
       }
       else {
         item.briefName = item.companyProvinceName || item.companyCityName
@@ -184,9 +184,10 @@
   })
   if (list.value.length > 0) {
     const params = {
-      supplierNo: '', // 业务内容
-      supplierName: '', // 溯源供方名称
-      businessContent: '', // 溯源供方编号
+      supplierNo: listQuery.value.supplierNo, // 业务内容
+      supplierName: listQuery.value.supplierName, // 溯源供方名称
+      businessContent: listQuery.value.businessContent, // 溯源供方编号
+      formId: SCHEDULE.SUPPLIER_APPROVAL,
       ids: checkoutList.value,
     }
     exportSourceList(params).then((res) => {
@@ -256,8 +257,8 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
-        <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" />
+        <!-- <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" /> -->
+        <!-- <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" /> -->
         <icon-button v-if="proxy.hasPerm('/measure/measureSource/add')" icon="icon-add" title="新建" type="primary" @click="add" />
         <icon-button v-if="proxy.hasPerm('/measure/measureSource/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/measure/measureSource/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index 939c80a..b107e3e 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -3,7 +3,7 @@
  * 添加/编辑/详情溯源供方
  */
 import type { Ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import baseInfoDetail from './components/baseInfoDetail.vue'
 import type { ISupplier, traceSupplierPerson } from './list_interface'
@@ -266,21 +266,12 @@
   })
 }
 
-// 提交表单
-const submitFunc = () => {
-// 再提交
-  const params = {
-    id: formInline.value.id,
-    formId: curFormId, // 表单id
-  }
-  sourceSubmit(params).then((res) => {
-    ElMessage.success('提交成功')
-    close()
-  })
-}
-
 // 点击提交
 const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formInline.value.id) {
+    ElMessage.warning('请先保存!')
+    return false
+  }
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
@@ -291,54 +282,14 @@
           type: 'warning',
         },
       ).then(() => {
-        if (!formInline.value.id) {
-          ElMessage.warning('请先保存!')
-          return false
+        const params = {
+          id: formInline.value.id,
+          formId: curFormId, // 表单id
         }
-        else {
-          const params = {
-            id: formInline.value.id,
-            formId: curFormId, // 表单id
-          }
-          sourceSubmit(params).then((res) => {
-            ElMessage.success('提交成功')
-            close()
-          })
-        }
-      //   if (from.value == 'reject') { // 驳回调用驳回编辑接口
-      //     failUpdateSourceApproval(formInline.value).then(() => {
-      //       ElMessage.success('提交成功!')
-      //     })
-      //   }
-      //   else {
-      //     // 如果id存在, 调用更新接口
-      //     if (formInline.value.id) {
-      //     // 如果表单变更过,先保存，再提交
-      //       if (isChanged.value) {
-      //         sourceDraftUpdate(formInline.value).then((res) => {
-      //           if (res.code === 200) {
-      //             submitFunc()
-      //           }
-      //           else {
-      //             ElMessage.error('保存失败，请重新保存后提交')
-      //           }
-      //         })
-      //       }
-      //       else { // 表单未变更过，直接提交
-      //         submitFunc()
-      //       }
-      //     }
-      //     else {
-      //     // id不存在，调用保存接口，再提交
-      //       sourceSave(formInline.value).then((res) => {
-      //         if (res.code === 200) {
-      //           formInline.value.id = res.data.id
-      //           formInline.value.supplierNo = res.data.supplierNo
-      //           submitFunc()
-      //         }
-      //       })
-      //     }
-      //   }
+        sourceSubmit(params).then((res) => {
+          ElMessage.success('提交成功')
+          close()
+        })
       })
     }
   })
@@ -352,13 +303,20 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
         formInline.value.minioFileName = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
+        loading.close()
       }
       else {
+        loading.close()
         ElMessage.error(res.message)
       }
     })
@@ -632,7 +590,6 @@
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
-        @row-dblclick="dblclickRow"
       >
         <el-table-column type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index 59ebc56..b7cffc7 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -80,13 +80,6 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  console.log(trainTimeRange.value)
-  console.log('----', createTimeRange.value)
-
-  listQuery.value.createEndTime = createTimeRange.value[1] as string || ''
-  listQuery.value.createStartTime = createTimeRange.value[0] as string || ''
-  listQuery.value.trainEndTime = trainTimeRange.value[1] as string || ''
-  listQuery.value.trainStartTime = trainTimeRange.value[0] as string || ''
   getapprovalList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -143,7 +136,30 @@
     }
   })
 }
-
+// 培训时间数组变更
+watch(trainTimeRange, (val) => {
+  if (val) {
+    listQuery.value.trainStartTime = `${val[0]}`
+    listQuery.value.trainEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.trainStartTime = ''
+    listQuery.value.trainEndTime = ''
+    trainTimeRange.value = ['', '']
+  }
+})
+// 创建时间变更
+watch(createTimeRange, (val) => {
+  if (val) {
+    listQuery.value.createStartTime = `${val[0]}`
+    listQuery.value.createEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.createStartTime = ''
+    listQuery.value.createEndTime = ''
+    createTimeRange.value = ['', '']
+  }
+})
 // 取消
 const handleCancel = (row: IPlanList) => {
   const params = {
diff --git a/src/views/measure/train/components/planApprovalDetail.vue b/src/views/measure/train/components/planApprovalDetail.vue
index 38fca62..f323b13 100644
--- a/src/views/measure/train/components/planApprovalDetail.vue
+++ b/src/views/measure/train/components/planApprovalDetail.vue
@@ -173,7 +173,7 @@
 
 <template>
   <app-container>
-    <detail-page title="培训管理审批">
+    <detail-page title="培训计划审批-详情">
       <template #btns>
         <el-button v-for="(item, index) in buttonArray" :key="index" :type="item.type" @click="clickBtn(item.name)">
           {{ item.name }}
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index 895e50e..a21a916 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -36,10 +36,6 @@
 
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.trainStartTime = trainTime.value[0] || ''
-  listQuery.value.trainEndTime = trainTime.value[1] || ''
-  listQuery.value.createStartTime = createTime.value[0] || ''
-  listQuery.value.createEndTime = createTime.value[0] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -72,7 +68,28 @@
 const searchList = () => {
   fetchData(true)
 }
-
+// 培训时间数组变更
+watch(trainTime, (val) => {
+  if (val) {
+    listQuery.value.trainStartTime = `${val[0]}`
+    listQuery.value.trainEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.trainStartTime = ''
+    listQuery.value.trainEndTime = ''
+  }
+})
+// 创建时间变更
+watch(createTime, (val) => {
+  if (val) {
+    listQuery.value.createStartTime = `${val[0]}`
+    listQuery.value.createEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.createStartTime = ''
+    listQuery.value.createEndTime = ''
+  }
+})
 // 重置
 const clearList = () => {
   listQuery.value = {
diff --git a/src/views/measure/train/planAdd.vue b/src/views/measure/train/planAdd.vue
index c407d35..20b2c4f 100644
--- a/src/views/measure/train/planAdd.vue
+++ b/src/views/measure/train/planAdd.vue
@@ -60,19 +60,19 @@
 const SelectionList = ref<IaddPersonListType[]>([])
 // 表单验证规则
 const rules = ref({
-  planNo: [{ required: true, message: '计划编号不能为空', trigger: ['blur', 'change'] }],
-  planName: [{ required: true, message: '培训名称不能为空', trigger: ['blur', 'change'] }],
-  trainPerson: [{ required: true, message: '培训对象不能为空', trigger: ['blur', 'change'] }],
-  trainNumber: [{ required: true, message: '培训人数不能为空', trigger: ['blur', 'change'] },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '培训人数只能为数字', trigger: ['blur', 'change'] },
+  planNo: [{ required: true, message: '计划编号必填', trigger: ['blur', 'change'] }],
+  planName: [{ required: true, message: '培训名称必填', trigger: ['blur', 'change'] }],
+  trainPerson: [{ required: true, message: '培训对象必填', trigger: ['blur', 'change'] }],
+  trainNumber: [{ required: true, message: '培训人数必填', trigger: ['blur', 'change'] },
+    { pattern: /(^[1-9]\d*$)/, message: '要求为正整数', trigger: ['blur', 'change'] },
   ],
-  trainHour: [{ required: true, message: '培训学时不能为空', trigger: ['blur', 'change'] }],
-  trainTime: [{ required: true, message: '培训时间不能为空', trigger: ['blur', 'change'] }],
-  trainAddress: [{ required: true, message: '培训地点不能为空', trigger: ['blur', 'change'] }],
-  deptId: [{ required: true, message: '主管部门不能为空', trigger: ['blur', 'change'] }],
-  effectiveCompany: [{ required: true, message: '实施单位不能为空', trigger: ['blur', 'change'] }],
-  director: [{ required: true, message: '负责人不能为空', trigger: ['blur', 'change'] }],
-  trainContent: [{ required: true, message: '培训内容不能为空', trigger: ['blur', 'change'] }],
+  trainHour: [{ required: true, message: '培训学时必填', trigger: ['blur', 'change'] }],
+  trainTime: [{ required: true, message: '培训时间必填', trigger: ['blur', 'change'] }],
+  trainAddress: [{ required: true, message: '培训地点必填', trigger: ['blur', 'change'] }],
+  deptId: [{ required: true, message: '主管部门必填', trigger: ['blur', 'change'] }],
+  effectiveCompany: [{ required: true, message: '实施单位必填', trigger: ['blur', 'change'] }],
+  director: [{ required: true, message: '负责人必填', trigger: ['blur', 'change'] }],
+  trainContent: [{ required: true, message: '培训内容必填', trigger: ['blur', 'change'] }],
 })
 
 // 从路由中获取页面类型参数
@@ -463,10 +463,10 @@
     </detail-page>
     <detail-block title="人员信息">
       <template #btns>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
+        <el-button v-if="pageType === 'detail'" type="primary" @click="addRow">
           增加行
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="info" @click="deleteList">
+        <el-button v-if="pageType === 'detail'" type="info" @click="deleteList">
           删除行
         </el-button>
       </template>

diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..9cf2b29 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -28,6 +28,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    DeptSelectByName: typeof import('./components/DeptSelectByName/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
diff --git a/src/views/business/board/standardReminder/list.vue b/src/views/business/board/standardReminder/list.vue
index 85efbb1..fd60743 100644
--- a/src/views/business/board/standardReminder/list.vue
+++ b/src/views/business/board/standardReminder/list.vue
@@ -94,12 +94,33 @@
 const preparation = ref<string>('')
 // 到期开始以及结束
 const validTime = ref<string>('')
+watch(preparation, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
+// 有效日期变更
+watch(validTime, (val) => {
+  if (val) {
+    listQuery.value.validStartTime = `${val[0]}`
+    listQuery.value.validEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.validStartTime = ''
+    listQuery.value.validEndTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.preparationStartDate = preparation.value[0] || ''
-  listQuery.value.preparationEndDate = preparation.value[1] || ''
-  listQuery.value.validStartTime = validTime.value[0] || ''
-  listQuery.value.validEndTime = validTime.value[1] || ''
+  // listQuery.value.preparationStartDate = preparation.value[0] || ''
+  // listQuery.value.preparationEndDate = preparation.value[1] || ''
+  // listQuery.value.validStartTime = validTime.value[0] || ''
+  // listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -223,16 +244,16 @@
   })
   if (list.value.length > 0) {
     const params = {
-      category: '', // 类别
-      id: '', // 主键id
-      managerState: '', // 管理状态
-      preparationEndDate: '', // 结束时间
-      preparationStartDate: '', // 开始时间
-      standardLaboratory: '', // 标准所在部门
-      standardName: '', // 标准名称
-      standardNo: '', // 标准编号
-      validEndTime: '', // 结束时间
-      validStartTime: '', // 开始时间
+      category: listQuery.value.category, // 类别
+      id: listQuery.value.id, // 主键id
+      managerState: listQuery.value.managerState, // 管理状态
+      preparationEndDate: listQuery.value.preparationEndDate, // 结束时间
+      preparationStartDate: listQuery.value.preparationStartDate, // 开始时间
+      standardLaboratory: listQuery.value.standardLaboratory, // 标准所在部门
+      standardName: listQuery.value.standardName, // 标准名称
+      standardNo: listQuery.value.standardNo, // 标准编号
+      validEndTime: listQuery.value.validEndTime, // 结束时间
+      validStartTime: listQuery.value.validStartTime, // 开始时间
       offset: 1, // 当前页
       limit: 20, // 每页多少条
       ids: checkoutList.value,
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 8666957..37ac73f 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -137,7 +137,7 @@
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  distributeDialogRef.value.initDialog(row.id, row.sampleId, row.orderId)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId, row.sampleStatus)
 }
 // 点击标签绑定
 const barCodeBind = ref()
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 807ea30..4e4eb46 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -37,11 +37,21 @@
   { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
   { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
 ])
-
+// 时间变更
+watch(trainTime, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 查询列表
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.startTime = trainTime.value[0] || ''
-  listQuery.value.endTime = trainTime.value[1] || ''
+  // listQuery.value.startTime = trainTime.value[0] || ''
+  // listQuery.value.endTime = trainTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2f7c1d0..bccde84 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -139,7 +139,17 @@
     id: '2', // 后端规定已收入传2
   })
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -147,8 +157,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.sampleStatus = active.value
   getInterChangeList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IinterchangeList) => {
@@ -280,7 +290,7 @@
       else if (type === 'delete') { // 无需检测
         interchangeStatusChange({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '7' }).then((res) => {
           if (res.code === 200) {
-            ElMessage.success(`已${title}`)
+            ElMessage.success('操作成功')
             fetchData(true)
           }
         })
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList.vue b/src/views/business/schedule/interchangeReceipt/receiptList.vue
index 275a053..83d93f4 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptList.vue
@@ -42,7 +42,17 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -50,8 +60,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getReceiptList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -124,13 +134,13 @@
   })
   if (list.value.length > 0) {
     const params = {
-      interchangeCode: '', // 交接单编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      reciever: '', // 接收人
-      deliverer: '', // 送样人
-      startTime: '', // 交接开始时间
-      endTime: '', // 交接结束时间
+      interchangeCode: listQuery.value.interchangeCode, // 交接单编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      reciever: listQuery.value.reciever, // 接收人
+      deliverer: listQuery.value.deliverer, // 送样人
+      startTime: listQuery.value.startTime, // 交接开始时间
+      endTime: listQuery.value.endTime, // 交接结束时间
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index cf0b532..f2fc852 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -26,8 +26,8 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   deliverer: '', // 送样人
-  isUrgent: 2, // 是否加急 2全部 1是 0否
-  status: 0, // 接收状态
+  isUrgent: '', // 是否加急 2全部 1是 0否
+  status: '', // 接收状态
   offset: 1,
   limit: 20,
 })
@@ -70,11 +70,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    isUrgentMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 2, // 是否加急全部后端定为2
-    })
+    // isUrgentMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 2, // 是否加急全部后端定为2
+    // })
   })
   // 接收状态
   getDictByCode('orderStatus').then((response) => {
@@ -85,11 +85,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    statusMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 0,
-    })
+    // statusMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 0,
+    // })
     console.log(statusMap.value)
   })
 }
@@ -125,8 +125,8 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     deliverer: '', // 送样人
-    isUrgent: 2, // 是否加急
-    status: 0, // 接收状态
+    isUrgent: '', // 是否加急 2全部 1是 0否
+    status: '', // 接收状态
     offset: 1,
     limit: 20,
   }
@@ -191,12 +191,12 @@
   })
   if (list.value.length > 0) {
     const params = {
-      orderCode: '', // 委托书编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      deliverer: '', // 送样人
-      isUrgent: 2, // 是否加急
-      status: 0, // 接收状态
+      orderCode: listQuery.value.orderCode, // 委托书编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      deliverer: listQuery.value.deliverer, // 送样人
+      isUrgent: listQuery.value.isUrgent, // 是否加急
+      status: listQuery.value.status, // 接收状态
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 2d92da9..14cd1ce 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -6,7 +6,7 @@
   customerName: string // 委托方名称
   deliverer: string // 送样人
   isUrgent: number | string // 是否加急
-  status: number // 接收状态
+  status: number | string// 接收状态
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 50308c7..25c5cf9 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -53,6 +53,7 @@
   handOutProperty: string // 分发性质-初次分发、退回分发
   id?: string // 实验室id
   customerId?: string // 客户id
+  certificationState?: string // 证书出具
 }
 
 // 实验室检测/我的检测列表
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index 7c17365..7159350 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -1,6 +1,6 @@
 <!-- 任务分发 -->
 <script lang="ts" setup name="TaskEdit">
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
 import ProcessConfig from './components/processConfig.vue'
@@ -11,6 +11,7 @@
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { UploadFile } from '@/api/measure/file'
 import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 interface dictType {
   id: string
@@ -251,16 +252,22 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    // UploadFile(fd).then((res) => {
-    //   if (res.code === 200) {
-    //     sampleForm.value.minioFileName = res.data[0]
-    //     // 重置当前验证
-    //     ElMessage.success('文件上传成功')
-    //   }
-    //   else {
-    //     ElMessage.error(res.message)
-    //   }
-    // })
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        sampleForm.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+        loading.close()
+      }
+      else {
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    })
   }
 }
 const upload = () => {
@@ -402,7 +409,7 @@
               <el-form-item label="校检类别:">
                 <el-select
                   v-model="sampleForm.measureCategory"
-                  :placeholder="roleType === 'detail' ? '' : '请选择校检类别'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择校检类别'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -424,7 +431,7 @@
               <el-form-item label="厂家国别:">
                 <el-select
                   v-model="sampleForm.manufacturerCountry"
-                  :placeholder="roleType === 'detail' ? '' : '请选择厂家国别'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择厂家国别'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -450,7 +457,7 @@
               <el-form-item label="ABC:">
                 <el-select
                   v-model="sampleForm.abc"
-                  :placeholder="roleType === 'detail' ? '' : '请选择ABC'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择ABC'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -504,8 +511,8 @@
               <el-form-item label="备注:">
                 <el-input
                   v-model="sampleForm.remark"
+                  autosize
                   type="textarea"
-                  :rows="2"
                   :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
                   :class="{ 'detail-input': roleType === 'detail' }"
@@ -516,7 +523,7 @@
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="sampleForm.measureType"
-                  :placeholder="roleType === 'detail' ? '' : '请选择检定方式'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择检定方式'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index dfbbf6a..6eeff55 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -81,7 +81,7 @@
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '165px' },
   { text: '样品属性', value: 'sampleBelongName', width: '100', align: 'center' },
   { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '90' },
-  { text: '证书出具', value: 'certificationState', align: 'center', width: '90', filter: (row: ITaskList) => { return `${row.alreadyCertifications}/${row.requireCertifications}` } },
+  { text: '证书出具', value: 'certificationState', align: 'center', width: '90' },
 ])
 // 表格数据
 const list = ref<ITaskList[]>([])
@@ -104,6 +104,7 @@
   getTaskList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: ITaskList) => {
       item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      item.certificationState = `${item.alreadyCertifications}/${item.requireCertifications}`
       return item
     })
     total.value = response.data.total
diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue
index e44dd67..194de53 100644
--- a/src/views/business/subpackage/apply/list.vue
+++ b/src/views/business/subpackage/apply/list.vue
@@ -302,7 +302,7 @@
         <search-item>
           <el-date-picker
             v-model="timeRange" type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="申请开始时间" end-placeholder="申请结束时间"
+            value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="申请开始时间" end-placeholder="申请结束时间" clearable
           />
         </search-item>
       </search-area>
diff --git a/src/views/business/subpackage/check/list.vue b/src/views/business/subpackage/check/list.vue
index 51ea419..a8b6744 100644
--- a/src/views/business/subpackage/check/list.vue
+++ b/src/views/business/subpackage/check/list.vue
@@ -111,8 +111,6 @@
 
 // 时间变更
 watch(timeRange, (val) => {
-  console.log(val[0])
-
   if (val) {
     listQuery.value.checkStartTime = `${val[0]}`
     listQuery.value.checkEndTime = `${val[1]}`
@@ -345,7 +343,8 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="timeRange" type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
+            v-model="timeRange"
+            clearable type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="验收开始时间" end-placeholder="验收结束时间"
           />
         </search-item>
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 98f4a39..a0db900 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -68,6 +68,7 @@
   else {
     listQuery.value.startTime = ''
     listQuery.value.endTime = ''
+    timeRange.value = ['', '']
   }
 })
 // 多选发生改变时
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index 6e41a94..ac98b8a 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -56,7 +56,17 @@
 const checkoutList = ref<string[]>([])
 // 文件上传input
 const fileRef = ref()
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -64,8 +74,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getSampleList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index 92e4b4a..6f465fc 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -67,7 +67,17 @@
     certificationStatusMap.value[`${item.value}`] = item.name
   })
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -75,8 +85,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getSampleList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IOvertimeList) => {
       return {
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index dbaa437..14464bf 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -86,6 +86,17 @@
     width: 160,
   },
 ]) // 表格
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 const fetchData = (isNowPage = false) => {
   loadingTable.value = true
@@ -93,8 +104,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.processResult = active.value
   getApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 60d1454..d0236cc 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -105,7 +105,17 @@
     align: 'center',
   },
 ])
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 const fetchData = (isNowPage = false) => {
   loadingTable.value = true
@@ -113,8 +123,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.approvalStatus = active.value
   getApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index aeb568e..5430b0f 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -103,10 +103,21 @@
 // 装载时间数组
 const checkTime = ref<string>('')
 const loadingTable = ref(false)
+// 时间变更
+watch(checkTime, (val) => {
+  if (val) {
+    listQuery.value.checkStartDate = `${val[0]}`
+    listQuery.value.checkEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.checkStartDate = ''
+    listQuery.value.checkEndDate = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.checkStartDate = checkTime.value[0] || ''
-  listQuery.value.checkEndDate = checkTime.value[1] || ''
+  // listQuery.value.checkStartDate = checkTime.value[0] || ''
+  // listQuery.value.checkEndDate = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 6229abf..9d30934 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -112,10 +112,21 @@
 // 装载时间数组
 const checkTime = ref('')
 const loadingTable = ref(false)
+// 时间变更
+watch(checkTime, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.startTime = checkTime.value[0] || ''
-  listQuery.value.endTime = checkTime.value[1] || ''
+  // listQuery.value.startTime = checkTime.value[0] || ''
+  // listQuery.value.endTime = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index daca294..de18467 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -66,6 +66,17 @@
 const checkoutList = ref<IManageChecklist[]>([])
 // 文件上传input
 const fileRef = ref()
+// 时间变更
+watch(checkDate, (val) => {
+  if (val) {
+    listQuery.value.checkStartDate = `${val[0]}`
+    listQuery.value.checkEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.checkStartDate = ''
+    listQuery.value.checkEndDate = ''
+  }
+})
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
@@ -73,8 +84,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.checkStartDate = checkDate.value[0] || ''
-  listQuery.value.checkEndDate = checkDate.value[1] || ''
+  // listQuery.value.checkStartDate = checkDate.value[0] || ''
+  // listQuery.value.checkEndDate = checkDate.value[1] || ''
   getcheckInfoList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: any) => {
       return {
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 00d283c..50b014c 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -99,6 +99,17 @@
     approvalStatusReserveMap.value[item.name] = `${item.value}`
   })
 }
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -106,8 +117,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.approvalStatus = active.value
   getReceiveApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/receive/solve/solveList.vue b/src/views/device/receive/solve/solveList.vue
index 809c0c1..ec1e8bb 100644
--- a/src/views/device/receive/solve/solveList.vue
+++ b/src/views/device/receive/solve/solveList.vue
@@ -120,7 +120,17 @@
   timeRange.value = ['', ''] // 把时间选择框置空
   fetchData(true)
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -128,8 +138,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getReceiveApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IsolveListType) => {
       return {
diff --git a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
index 4744536..b4fe085 100644
--- a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
@@ -43,7 +43,12 @@
   select.value = -1
   listPageApi(listQuery.value).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows
+      list.value = res.data.rows.map((item: { effectiveStatusName: string }) => {
+        return {
+          ...item,
+          isDisabled: item.effectiveStatusName === '已废止',
+        }
+      })
       total.value = res.data.total
     }
   })
@@ -142,7 +147,7 @@
           </el-table-column>
           <el-table-column label="" width="55" align="center" fixed="left">
             <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
+              <el-radio v-model="select" :disabled="scope.row.isDisabled" :label="scope.$index" class="radio" />
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index a030dcf..0dd5547 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -94,12 +94,34 @@
 const preparation = ref<string>('')
 // 到期开始以及结束
 const validTime = ref<string>('')
+// 筹建日期变更
+watch(preparation, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
+// 有效日期变更
+watch(validTime, (val) => {
+  if (val) {
+    listQuery.value.validStartTime = `${val[0]}`
+    listQuery.value.validEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.validStartTime = ''
+    listQuery.value.validEndTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.preparationStartDate = preparation.value[0] || ''
-  listQuery.value.preparationEndDate = preparation.value[1] || ''
-  listQuery.value.validStartTime = validTime.value[0] || ''
-  listQuery.value.validEndTime = validTime.value[1] || ''
+  // listQuery.value.preparationStartDate = preparation.value[0] || ''
+  // listQuery.value.preparationEndDate = preparation.value[1] || ''
+  // listQuery.value.validStartTime = validTime.value[0] || ''
+  // listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index 39d8683..bb69fe9 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -99,6 +99,17 @@
 const standardManagerStateList = ref<IOptions[]>([])
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
+// 时间变更
+watch(preparationDate, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
@@ -107,8 +118,8 @@
     listQuery.value.offset = 1
   }
   // 筹建日期
-  listQuery.value.preparationStartDate = preparationDate.value[0] || ''
-  listQuery.value.preparationEndDate = preparationDate.value[1] || ''
+  // listQuery.value.preparationStartDate = preparationDate.value[0] || ''
+  // listQuery.value.preparationEndDate = preparationDate.value[1] || ''
   getStandardList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: any) => {
       return {
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 37205fc..edf9dd7 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -793,7 +793,7 @@
             保存
           </el-button>
           <!-- 待审批 -->
-          <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'agree' })">
+          <!-- <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'agree' })">
             同意
           </el-button>
           <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'reject' })">
@@ -801,7 +801,7 @@
           </el-button>
           <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'refuse' })">
             拒绝
-          </el-button>
+          </el-button> -->
           <!-- </template> -->
         </template>
         <el-button v-if="(title === '详情' && $route.query?.approvalStatusName === '草稿箱' && isCancel)" type="primary" @click="editForm">
diff --git a/src/views/finance/businessSettlement/list.vue b/src/views/finance/businessSettlement/list.vue
index e942abb..9543947 100644
--- a/src/views/finance/businessSettlement/list.vue
+++ b/src/views/finance/businessSettlement/list.vue
@@ -43,6 +43,7 @@
 const list = ref<IList[]>([]) // 表格数据
 // 选中的内容
 const checkoutList = ref<string[]>([])
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
diff --git a/src/views/finance/contract/list.vue b/src/views/finance/contract/list.vue
index 7dcdca5..5f8eb4e 100644
--- a/src/views/finance/contract/list.vue
+++ b/src/views/finance/contract/list.vue
@@ -59,6 +59,17 @@
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 选中的内容
 const checkoutList = ref<string[]>([])
+// 时间变更
+watch(dateRange, (val) => {
+  if (val) {
+    listQuery.value.estimateSignStartDate = `${val[0]}`
+    listQuery.value.estimateSignEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.estimateSignStartDate = ''
+    listQuery.value.estimateSignEndDate = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -66,8 +77,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.estimateSignStartDate = dateRange.value[0] as string || ''
-  listQuery.value.estimateSignEndDate = dateRange.value[1] as string || ''
+  // listQuery.value.estimateSignStartDate = dateRange.value[0] as string || ''
+  // listQuery.value.estimateSignEndDate = dateRange.value[1] as string || ''
   getContractList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: { estimateSignDate: string; agreementAmount: number }) => {
       return {
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 1bce5f9..07b2296 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,7 +1,7 @@
-<!-- 新增或详情弹窗 -->
+<!-- 新增或详情 -->
 <script lang="ts" setup name="addNotice">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
@@ -15,6 +15,7 @@
 import { SCHEDULE } from '@/utils/scheduleDict'
 const $route = useRoute()
 const $router = useRouter()
+const submitId = ref('') // 提交id-保存接口获取
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
 const fileTypeName = ref('')
@@ -40,12 +41,12 @@
   formId: SCHEDULE.FILE_APPROVAL,
 }) // 表单
 const rules = ref<FormRules>({
-  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
-  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
-  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
-  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
-  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+  fileName: [{ required: true, message: '名称必填', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建必填', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位必填', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间必填', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人必填', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号必填', trigger: 'blur' }],
 }) // 表单验证规则
 
 const userList = ref<userType[]>([]) // 可使用人列表
@@ -57,12 +58,14 @@
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
-const PubList = ref<deptType[]>([])
+const PubList = ref([]) as any// 发布单位列表
 const PubListTree = ref([])
 // 获取发布单位列表
 const getPubList = () => {
   getDeptTreeList().then((res) => {
     PubList.value = res.data
+    console.log('0000', 'ppp', PubList.value)
+
     PubListTree.value = toTreeList(res.data, '0', true)
   })
 }
@@ -113,43 +116,57 @@
   effectiveStatusName.value = ''
 }
 // 提交
-const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+const saveForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
-    `确认${flag}吗？`,
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then((res) => {
+        const publisherId = ruleForm.publisher
+        const index = PubList.value.findIndex((item: { id: string }) => item.id === publisherId)
+        if (index !== -1) {
+          ruleForm.publisher = PubList.value[index].name as string
+        }
+        // 保存（草稿箱）
+        confirmDrafts(ruleForm).then((res) => {
+          ruleForm.fileNo = res.data.fileNo
+          submitId.value = res.data.id
+          ElMessage.success('保存成功')
+          // formEl?.resetFields()
+          // $router.go(-1)
+          close()
+        })
+      })
+    }
+  })
+}
+const submitForm = () => {
+  if (!submitId.value) {
+    ElMessage.warning('请先保存')
+    return false
+  }
+  ElMessageBox.confirm(
+    '确认提交吗？',
     '提示',
     {
       confirmButtonText: '确认',
       cancelButtonText: '取消',
       type: 'warning',
     },
-      ).then((res) => {
-        if (flag === '提交') {
-          confirmDrafts(ruleForm).then((res) => {
-            if (res.code === 200) {
-              console.log(res.data, '保存成功')
-              submitFile({ id: res.data.id, formId: SCHEDULE.FILE_APPROVAL }).then((res) => {
-                formEl?.resetFields()
-                ElMessage.success('提交成功')
-                $router.go(-1)
-                close()
-              })
-            }
-          })
-        }
-        else {
-          // 保存（草稿箱）
-          confirmDrafts(ruleForm).then((res) => {
-            ElMessage.success('保存成功')
-            formEl?.resetFields()
-            $router.go(-1)
-            close()
-          })
-        }
-      })
-    }
+  ).then((res) => {
+    submitFile({ id: submitId.value, formId: SCHEDULE.FILE_APPROVAL }).then((res) => {
+    // formEl?.resetFields()
+      ElMessage.success('已提交')
+      $router.go(-1)
+      close()
+    })
   })
 }
 // 取消
@@ -163,9 +180,14 @@
 const onFileChange = (event: any) => {
   // 原生上传
   // console.log(event.target.files)
+
   if (event.target.files?.length !== 0) {
     // 创建formdata对象
     const fd = new FormData()
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
@@ -173,9 +195,11 @@
         // 重置当前验证
         ruleFormRef.value?.clearValidate('minioFileName')
         ElMessage.success('文件上传成功')
+        loading.close()
       }
       else {
         ElMessage.error(res.message)
+        loading.close()
       }
     })
   }
@@ -215,10 +239,10 @@
   <app-container style="overflow: hidden;">
     <detail-page :title="`${fileTypeName}-${title}`">
       <template #btns>
-        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm()">
           提交
         </el-button>
-        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
+        <el-button v-if="title !== '详情'" type="primary" @click="saveForm(ruleFormRef)">
           保存
         </el-button>
         <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -258,7 +282,7 @@
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
                 style="width: 100%;"
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 135d059..c2b46c0 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -1,6 +1,7 @@
 <!-- 文件审批公共模板 -->
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { DateModelType } from 'element-plus'
 import type { TableRow } from './approve-interface'
 import type { fileResType } from '@/views/measure/file/file-interface'
 import { printJSON } from '@/utils/printUtils'
@@ -32,12 +33,13 @@
 const approvalStatusReserveMap = ref({ ...props.approvalStatusReserveMap }) // 审批状态字典{草稿箱: 1}
 const activeTitle = ref('') // active对应的审批状态名字
 
-const searchQuery = reactive({
+const searchQuery = ref({
   fileNo: '', // 编号
   fileName: '', // 名称
   fileCode: '', // 文件号
   createUser: '', // 创建人
-  createTime: '', // 创建
+  createStartTime: '', // 创建开始时间
+  createEndTime: '', // 创建结束时间
   approvalStatus: approvalStatus.value, // 审批状态
   limit: 20,
   offset: 1,
@@ -49,18 +51,31 @@
 const total = ref<number>(0) // 数据总条数
 const columns = ref<TableColumn[]>([
   { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
+  { text: '编号', value: 'fileNo', align: 'center', width: '160' },
   { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
+  { text: '类别', value: 'fileTypeName', align: 'center' },
   { text: '创建人', value: 'createUser', align: 'center' },
-  { text: '创建时间', value: 'createTime', align: 'center' },
-  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110' },
 ]) // 表格
 const list = ref<TableRow[]>([]) // 表格数据
+// 筛选时间段数据
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    searchQuery.value.createStartTime = `${val[0]}`
+    searchQuery.value.createEndTime = `${val[1]}`
+  }
+  else {
+    searchQuery.value.createStartTime = ''
+    searchQuery.value.createEndTime = ''
+  }
+})
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
-  approvallistPageApi(searchQuery).then((res) => {
+  approvallistPageApi(searchQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows.map((item: TableRow) => {
         return {
@@ -85,10 +100,10 @@
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
-    searchQuery.limit = val.size
+    searchQuery.value.limit = val.size
   }
   if (val && val.page) {
-    searchQuery.offset = val.page
+    searchQuery.value.offset = val.page
   }
   getList()
 }
@@ -216,12 +231,21 @@
 }
 // 重置
 const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.fileType = ''
-  searchQuery.createTime = ''
-  searchQuery.createUser = ''
+  searchQuery.value = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    fileCode: '', // 文件号
+    createUser: '', // 创建人
+    createStartTime: '', // 创建开始时间
+    createEndTime: '', // 创建结束时间
+    approvalStatus: approvalStatus.value, // 审批状态
+    limit: 20,
+    offset: 1,
+    fileType: '', // 文件类别
+    formId: SCHEDULE.FILE_APPROVAL,
+    ids: [] as string[],
+  }
+  timeRange.value = ['', '']
   getList()
 }
 // 表格被选中的行
@@ -230,27 +254,6 @@
 const multiSelect = (row: TableRow[]) => {
   selectList.value = row
 }
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  searchQuery.ids = []
-  if (selectList.value.length) {
-    selectList.value.forEach((item) => {
-      searchQuery.ids?.push(item.id as string)
-    })
-  }
-  exportFileApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
-    exportFile(res.data, props.name)
-    loading.close()
-    searchQuery.ids = []
-  }).catch((_) => {
-    loading.close()
-  })
-}
 // 打印
 function printList() {
   const selectIds = selectList.value.map(item => item.id)
@@ -278,8 +281,8 @@
   sessionStorage.setItem('approveFileMenu', props.name)
   approvalStatus.value = approvalStatusReserveMap.value[props.name]
   // approvalStatus.value = approvalStatusReserveMap.value[props.name] // 失效
-  searchQuery.approvalStatus = approvalStatusReserveMap.value[props.name] || '0'
-  $router.currentRoute.value.query.cacheActive = searchQuery.approvalStatus
+  searchQuery.value.approvalStatus = approvalStatusReserveMap.value[props.name] || '0'
+  $router.currentRoute.value.query.cacheActive = searchQuery.value.approvalStatus
   getList()
   // 缓存名称
 }, { deep: true, immediate: true })
@@ -312,8 +315,14 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss" placeholder="创建时间"
+            v-model="timeRange"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="创建开始时间"
+            end-placeholder="创建结束时间"
+            clearable
+            style="width: 360px;"
           />
         </search-item>
         <search-item>
@@ -323,10 +332,6 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <icon-button
-            v-if="proxy.hasPerm('/file/approve/export')" icon="icon-export" title="导出"
-            @click="exportExcelBtn"
-          />
           <icon-button v-if="proxy.hasPerm('/file/approve/print')" icon="icon-print" title="打印" @click="printList" />
         </template>
         <!-- 表格区域 -->
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 9dd3633..de9e080 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -85,7 +85,7 @@
 const getStatus = () => {
   getDictByCode('effectiveStatus').then((res) => {
     if (res.code === 200) {
-      effectiveStatusSelect.value = [...res.data, { name: '全部', value: '', id: 'quanbu' }]
+      effectiveStatusSelect.value = res.data
     }
   })
 }
@@ -373,8 +373,8 @@
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/add`)" icon="icon-add" title="新建" @click="add" />
-          <icon-button v-if="proxy.hasPerm(`/file/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
-          <icon-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <!-- <icon-button v-if="proxy.hasPerm(`/file/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" /> -->
+          <!-- <icon-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" /> -->
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/print`)" icon="icon-print" title="打印" @click="printList" />
         </template>
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 3510056..ed3ab8c 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -282,8 +282,8 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/measure/price/import')" icon="icon-import" title="批量导入" type="primary" />
-        <icon-button v-if="proxy.hasPerm('/measure/price/mould')" icon="icon-template" title="模板下载" type="primary" />
+        <!-- <icon-button v-if="proxy.hasPerm('/measure/price/import')" icon="icon-import" title="批量导入" type="primary" /> -->
+        <!-- <icon-button v-if="proxy.hasPerm('/measure/price/mould')" icon="icon-template" title="模板下载" type="primary" /> -->
         <icon-button v-if="proxy.hasPerm('/measure/price/add')" icon="icon-add" title="新建" type="primary" @click="add" />
         <icon-button v-if="proxy.hasPerm('/measure/price/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/measure/price/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 60eeebb..7b6f4ec 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -61,7 +61,8 @@
   categoryName: [{ required: true, message: '类别不能为空', trigger: ['blur', 'change'] }],
   itemName: [{ required: true, message: '项目不能为空', trigger: ['blur', 'change'] }],
   priceStandardName: [{ required: true, message: '依据标准不能为空', trigger: ['blur', 'change'] }],
-  price: [{ required: true, message: '标准价格不能为空', trigger: ['blur', 'change'] }],
+  price: [{ required: true, message: '标准价格不能为空', trigger: ['blur', 'change'] },
+    { pattern: /^(?!0+(?:\.0+)?$)(?:[1-9]\d*|0)(?:\.\d{1,2})?$/, message: '要求不小于0，且最多保留两位小数', trigger: ['blur', 'change'] }],
   operatorDiscountPermission: [{ required: true, message: '业务员折扣权限不能为空', trigger: ['blur', 'change'] }],
   directorDiscountPermission: [{ required: true, message: '负责人折扣权限不能为空', trigger: ['blur', 'change'] }],
 })
@@ -255,7 +256,7 @@
                   v-model.trim="formInline.priceStandardName"
                   clearable
                   :placeholder="pageType === 'detail' ? '' : '依据标准'"
-                  :disabled="pageType === 'detail'"
+                  disabled
                 >
                   <template v-if="pageType !== 'detail'" #append>
                     <el-button
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 5e62137..22d1d8a 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -24,16 +24,16 @@
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    // { name: '删除', type: 'danger' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    // { name: '删除', type: 'danger' },
     { name: '取消', type: 'info' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    // { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
+    { name: '删除', type: 'danger' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
@@ -41,9 +41,10 @@
   ],
   已取消: [
     { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
     { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
-
 }
 // 当前tab
 const currentTab = ref('全部')
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index d2fad4c..004b856 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -28,10 +28,6 @@
 const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  // 审批中状态时候长度返回错误
-  if (props.status === '3' || props.status === '6') {
-    props.buttons.length = 4 // 传递长度 + 判断条件下显示按钮长度
-  }
   return props.buttons.length * 40 + 23
 })
 
@@ -63,13 +59,13 @@
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '溯源供方编号', value: 'supplierNo', width: '160', align: 'center' },
-  { text: '溯源供方名称', value: 'supplierName', width: '120', align: 'center' },
+  { text: '溯源供方名称', value: 'supplierName', align: 'center' },
   { text: '业务内容', value: 'businessContent', align: 'center' },
   { text: '业务范围', value: 'businessScope', align: 'center' },
   { text: '负责人', value: 'director', align: 'center' },
   { text: '联系方式', value: 'phone', align: 'center' },
   { text: '地址', value: 'address', align: 'center' },
-  { text: '创建时间', value: 'name', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
   { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110px' },
 ])
 // 初始化路由
@@ -86,15 +82,20 @@
     listQuery.value.offset = 1
   }
   getapprovalListPage(listQuery.value).then((response) => {
-    list.value = response.data.rows
-    if (!companyAddress.value) {
-      companyAddress.value = [response.data.rows[0].companyCountry, response.data.rows[0].companyProvince, response.data.rows[0].companyCity, response.data.rows[0].companyArea, response.data.rows[0].companyAddress]
-    }
-    else if (isReset) {
-      companyAddress.value = [response.data.rows[0].companyCountry, response.data.rows[0].companyProvince, response.data.rows[0].companyCity, response.data.rows[0].companyArea, response.data.rows[0].companyAddress]
+    list.value = response.data.rows.map((item: { companyProvinceName: string; companyCityName: string }) => {
+      return {
+        ...item,
+        address: item.companyProvinceName === item.companyCityName ? item.companyCityName : item.companyProvinceName + item.companyCityName,
+      }
+    })
+    // if (!companyAddress.value) {
+    //   companyAddress.value = [response.data.rows[0].companyCountry, response.data.rows[0].companyProvince, response.data.rows[0].companyCity, response.data.rows[0].companyArea, response.data.rows[0].companyAddress]
+    // }
+    if (isReset) {
+      companyAddress.value = ['', '', '', '', '']
+      // companyAddress.value = [response.data.rows[0].companyCountry, response.data.rows[0].companyProvince, response.data.rows[0].companyCity, response.data.rows[0].companyArea, response.data.rows[0].companyAddress]
     }
     total.value = parseInt(response.data.total)
-    console.log(companyAddress.value)
     loadingTable.value = false
   }).catch((_) => {
     loadingTable.value = false
@@ -107,6 +108,7 @@
 }
 // 公司地址变化后给对象赋值
 function companyAddressChange(addressObj: IAddress) {
+  console.log('公司地址变化后给对象赋值')
   listQuery.value.companyCountry = addressObj.country
   listQuery.value.companyProvince = addressObj.province
   listQuery.value.companyCity = addressObj.city
@@ -191,30 +193,6 @@
   }
   fetchData(true, true)
 }
-// 导出
-const exportExcelBtn = () => {
-  const params: supplierExportQuery = {
-    approvalStatus: listQuery.value.approvalStatus,
-    businessContent: listQuery.value.businessContent,
-    companyArea: listQuery.value.companyArea,
-    companyCity: listQuery.value.companyCity,
-    companyProvince: listQuery.value.companyProvince,
-    formId: listQuery.value.formId,
-    supplierName: listQuery.value.supplierName,
-    supplierNo: listQuery.value.supplierNo,
-  }
-  if (checkoutList.value.length > 0) {
-    params.ids = checkoutList.value
-  }
-  // TODO: 审批列表导出
-  console.log(params)
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  loading.close()
-}
 
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -237,10 +215,7 @@
 const add = () => {
   $router.push('/source/add')
 }
-// 批量导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 审批结束回调
 const approvalSuccess = () => {
   fetchData(true)
@@ -259,7 +234,7 @@
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    sourceSubmit({ id: row.id, formId: SCHEDULE.SUPPLIER_APPROVAL }).then((res) => {
+    sourceSubmit({ id: row.id, formId: SCHEDULE.SUPPLIER_APPROVAL, processId: row.processId }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
@@ -311,7 +286,7 @@
   (newVal: string) => {
     console.log('change status', newVal)
     listQuery.value.approvalStatus = newVal
-    fetchData(false)
+    clearList()
   },
   { immediate: true })
 
@@ -429,7 +404,7 @@
                   编辑
                 </el-button>
                 <el-button
-                  v-if="row.approvalStatusName === '草稿箱' "
+                  v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                   size="small"
                   link
                   type="primary"
@@ -448,20 +423,8 @@
                 >
                   取消
                 </el-button>
-                <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-                <!-- <el-button
-                  v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
-                  size="small"
-                  link
-                  type="danger"
-                  :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-                  @click="clickBtn(row, '删除')"
-                >
-                  删除
-                </el-button> -->
-                <!-- ------------------------------------审批中的删除暂时去掉-------------------------------- -->
                 <el-button
-                  v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+                  v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/measure/source/components/sourceApprovalDetail.vue b/src/views/measure/source/components/sourceApprovalDetail.vue
index c507032..35683e7 100644
--- a/src/views/measure/source/components/sourceApprovalDetail.vue
+++ b/src/views/measure/source/components/sourceApprovalDetail.vue
@@ -8,12 +8,15 @@
 import { getSoucreListDetail } from '@/api/measure/source'
 import { cancelApproval, fetchApproval } from '@/api/approval'
 import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
-
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import type { IAddress } from '@/components/AddressSelect/address-interface'
+const approvalDialog = ref() // 审批对话ref
 const approvalRecord = ref() // 审批流程组件ref
 const infoId = ref('') // id
+const taskId = ref('') // 任务id 用于审批
+const processId = ref('') // 流程实例id
 const approvalType = ref('')
 const approvalStatusName = ref('') // 审批状态、控制草稿箱没有审批流程
-
 // 从路由中获取页面类型参数
 const $route = useRoute()
 if ($route.params && $route.params.type) {
@@ -70,8 +73,9 @@
   approvalStatus: '', // 审批状态
   approvalStatusName: '', // 审批状态名称
 })
-
-const traceSupplierPersonList: Ref<traceSupplierPerson[]> = ref([])
+const companyAddress = ref<string[]>([]) // 公司地址
+const invoiceAddress = ref<string[]>([]) // 开票地址
+const traceSupplierPersonList: Ref<traceSupplierPerson[]> = ref([]) // 人员列表
 const columns = [
   { text: '人员编号', value: 'personNo' },
   { text: '姓名', value: 'name' },
@@ -83,9 +87,15 @@
 const getInfo = () => {
   getSoucreListDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data
+    traceSupplierPersonList.value = res.data.traceSupplierPersonList
+    // for (const key in dataForm.value) {
+    //   dataForm.value[key] = res.data[key]
+    // }
+    companyAddress.value = [dataForm.value.companyCountryName, dataForm.value.companyProvinceName, dataForm.value.companyCityName, dataForm.value.companyAreaName, dataForm.value.companyAddress]
+    invoiceAddress.value = [dataForm.value.invoiceCountryName, dataForm.value.invoiceProvinceName, dataForm.value.invoiceCityName, dataForm.value.invoiceAreaName, dataForm.value.invoiceAddress]
   })
 }
-getInfo()
+
 // 初始化router
 const $router = useRouter()
 // 关闭新增页面的回调
@@ -106,12 +116,12 @@
 }
 // 审批结束回调
 const approvalSuccess = () => {
-  getInfo()
+  close() // 返回上一页
 }
 // 取消
 const handleCancel = () => {
   const params = {
-    processInstanceId: dataForm.value.processId!,
+    processInstanceId: processId.value!,
     comments: '取消审批',
   }
   ElMessageBox.confirm(
@@ -125,21 +135,21 @@
   ).then(() => {
     cancelApproval(params).then(() => {
       ElMessage.success('取消成功')
+      close()
     })
   })
 }
-const approvalDialog = ref()
 // 点击数据后的操作按钮
 const clickBtn = (buttonType: string) => {
   switch (buttonType) {
     case '同意':
-      approvalDialog.value.initDialog('agree', dataForm.value.taskId)
+      approvalDialog.value.initDialog('agree', taskId.value)
       break
     case '驳回':
-      approvalDialog.value.initDialog('reject', dataForm.value.taskId)
+      approvalDialog.value.initDialog('reject', taskId.value)
       break
     case '拒绝':
-      approvalDialog.value.initDialog('refuse', dataForm.value.taskId)
+      approvalDialog.value.initDialog('refuse', taskId.value)
       break
     case '取消':
       handleCancel()
@@ -148,10 +158,14 @@
 }
 onMounted(() => {
   dataForm.value.processId = $route.query.processId as string// 流程实例id
+  processId.value = $route.query.processId as string// 流程实例id
   approvalStatusName.value = $route.query.approvalStatusName as string
+  taskId.value = $route.query.taskId as string
+
   if (approvalStatusName.value !== '草稿箱') {
-    getApprovalRecord(dataForm.value.processId) // 查询审批记录
+    getApprovalRecord(processId.value) // 查询审批记录
   }
+  getInfo() // 获取详情
 })
 </script>
 
@@ -162,13 +176,13 @@
         <el-button v-if="approvalType === '2'" type="primary" @click="clickBtn('同意')">
           同意
         </el-button>
-        <el-button v-if="approvalType === '2'" type="primary" @click="clickBtn('拒绝')">
-          拒绝
-        </el-button>
         <el-button v-if="approvalType === '2'" type="primary" @click="clickBtn('驳回')">
           驳回
         </el-button>
-        <el-button v-if="approvalType === '3'" type="primary" @click="handleCancel()">
+        <el-button v-if="approvalType === '2'" type="danger" @click="clickBtn('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="approvalType === '3'" type="info" @click="handleCancel()">
           取消
         </el-button>
         <el-button type="info" @click="close">
@@ -201,6 +215,7 @@
       <!-- 审批流程 -->
       <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
     </detail-block>
+    <!-- 审批弹窗 -->
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index e352e61..cda7d0c 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -89,7 +89,7 @@
   getSoucreList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: ISupplier) => {
       if (item.companyProvinceName && item.companyCityName) {
-        item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
+        item.briefName = `${item.companyProvinceName}${item.companyCityName}`
       }
       else {
         item.briefName = item.companyProvinceName || item.companyCityName
@@ -184,9 +184,10 @@
   })
   if (list.value.length > 0) {
     const params = {
-      supplierNo: '', // 业务内容
-      supplierName: '', // 溯源供方名称
-      businessContent: '', // 溯源供方编号
+      supplierNo: listQuery.value.supplierNo, // 业务内容
+      supplierName: listQuery.value.supplierName, // 溯源供方名称
+      businessContent: listQuery.value.businessContent, // 溯源供方编号
+      formId: SCHEDULE.SUPPLIER_APPROVAL,
       ids: checkoutList.value,
     }
     exportSourceList(params).then((res) => {
@@ -256,8 +257,8 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
-        <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" />
+        <!-- <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" /> -->
+        <!-- <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" /> -->
         <icon-button v-if="proxy.hasPerm('/measure/measureSource/add')" icon="icon-add" title="新建" type="primary" @click="add" />
         <icon-button v-if="proxy.hasPerm('/measure/measureSource/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/measure/measureSource/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index 939c80a..b107e3e 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -3,7 +3,7 @@
  * 添加/编辑/详情溯源供方
  */
 import type { Ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import baseInfoDetail from './components/baseInfoDetail.vue'
 import type { ISupplier, traceSupplierPerson } from './list_interface'
@@ -266,21 +266,12 @@
   })
 }
 
-// 提交表单
-const submitFunc = () => {
-// 再提交
-  const params = {
-    id: formInline.value.id,
-    formId: curFormId, // 表单id
-  }
-  sourceSubmit(params).then((res) => {
-    ElMessage.success('提交成功')
-    close()
-  })
-}
-
 // 点击提交
 const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formInline.value.id) {
+    ElMessage.warning('请先保存!')
+    return false
+  }
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
@@ -291,54 +282,14 @@
           type: 'warning',
         },
       ).then(() => {
-        if (!formInline.value.id) {
-          ElMessage.warning('请先保存!')
-          return false
+        const params = {
+          id: formInline.value.id,
+          formId: curFormId, // 表单id
         }
-        else {
-          const params = {
-            id: formInline.value.id,
-            formId: curFormId, // 表单id
-          }
-          sourceSubmit(params).then((res) => {
-            ElMessage.success('提交成功')
-            close()
-          })
-        }
-      //   if (from.value == 'reject') { // 驳回调用驳回编辑接口
-      //     failUpdateSourceApproval(formInline.value).then(() => {
-      //       ElMessage.success('提交成功!')
-      //     })
-      //   }
-      //   else {
-      //     // 如果id存在, 调用更新接口
-      //     if (formInline.value.id) {
-      //     // 如果表单变更过,先保存，再提交
-      //       if (isChanged.value) {
-      //         sourceDraftUpdate(formInline.value).then((res) => {
-      //           if (res.code === 200) {
-      //             submitFunc()
-      //           }
-      //           else {
-      //             ElMessage.error('保存失败，请重新保存后提交')
-      //           }
-      //         })
-      //       }
-      //       else { // 表单未变更过，直接提交
-      //         submitFunc()
-      //       }
-      //     }
-      //     else {
-      //     // id不存在，调用保存接口，再提交
-      //       sourceSave(formInline.value).then((res) => {
-      //         if (res.code === 200) {
-      //           formInline.value.id = res.data.id
-      //           formInline.value.supplierNo = res.data.supplierNo
-      //           submitFunc()
-      //         }
-      //       })
-      //     }
-      //   }
+        sourceSubmit(params).then((res) => {
+          ElMessage.success('提交成功')
+          close()
+        })
       })
     }
   })
@@ -352,13 +303,20 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
         formInline.value.minioFileName = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
+        loading.close()
       }
       else {
+        loading.close()
         ElMessage.error(res.message)
       }
     })
@@ -632,7 +590,6 @@
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
-        @row-dblclick="dblclickRow"
       >
         <el-table-column type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index 59ebc56..b7cffc7 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -80,13 +80,6 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  console.log(trainTimeRange.value)
-  console.log('----', createTimeRange.value)
-
-  listQuery.value.createEndTime = createTimeRange.value[1] as string || ''
-  listQuery.value.createStartTime = createTimeRange.value[0] as string || ''
-  listQuery.value.trainEndTime = trainTimeRange.value[1] as string || ''
-  listQuery.value.trainStartTime = trainTimeRange.value[0] as string || ''
   getapprovalList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -143,7 +136,30 @@
     }
   })
 }
-
+// 培训时间数组变更
+watch(trainTimeRange, (val) => {
+  if (val) {
+    listQuery.value.trainStartTime = `${val[0]}`
+    listQuery.value.trainEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.trainStartTime = ''
+    listQuery.value.trainEndTime = ''
+    trainTimeRange.value = ['', '']
+  }
+})
+// 创建时间变更
+watch(createTimeRange, (val) => {
+  if (val) {
+    listQuery.value.createStartTime = `${val[0]}`
+    listQuery.value.createEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.createStartTime = ''
+    listQuery.value.createEndTime = ''
+    createTimeRange.value = ['', '']
+  }
+})
 // 取消
 const handleCancel = (row: IPlanList) => {
   const params = {
diff --git a/src/views/measure/train/components/planApprovalDetail.vue b/src/views/measure/train/components/planApprovalDetail.vue
index 38fca62..f323b13 100644
--- a/src/views/measure/train/components/planApprovalDetail.vue
+++ b/src/views/measure/train/components/planApprovalDetail.vue
@@ -173,7 +173,7 @@
 
 <template>
   <app-container>
-    <detail-page title="培训管理审批">
+    <detail-page title="培训计划审批-详情">
       <template #btns>
         <el-button v-for="(item, index) in buttonArray" :key="index" :type="item.type" @click="clickBtn(item.name)">
           {{ item.name }}
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index 895e50e..a21a916 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -36,10 +36,6 @@
 
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.trainStartTime = trainTime.value[0] || ''
-  listQuery.value.trainEndTime = trainTime.value[1] || ''
-  listQuery.value.createStartTime = createTime.value[0] || ''
-  listQuery.value.createEndTime = createTime.value[0] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -72,7 +68,28 @@
 const searchList = () => {
   fetchData(true)
 }
-
+// 培训时间数组变更
+watch(trainTime, (val) => {
+  if (val) {
+    listQuery.value.trainStartTime = `${val[0]}`
+    listQuery.value.trainEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.trainStartTime = ''
+    listQuery.value.trainEndTime = ''
+  }
+})
+// 创建时间变更
+watch(createTime, (val) => {
+  if (val) {
+    listQuery.value.createStartTime = `${val[0]}`
+    listQuery.value.createEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.createStartTime = ''
+    listQuery.value.createEndTime = ''
+  }
+})
 // 重置
 const clearList = () => {
   listQuery.value = {
diff --git a/src/views/measure/train/planAdd.vue b/src/views/measure/train/planAdd.vue
index c407d35..20b2c4f 100644
--- a/src/views/measure/train/planAdd.vue
+++ b/src/views/measure/train/planAdd.vue
@@ -60,19 +60,19 @@
 const SelectionList = ref<IaddPersonListType[]>([])
 // 表单验证规则
 const rules = ref({
-  planNo: [{ required: true, message: '计划编号不能为空', trigger: ['blur', 'change'] }],
-  planName: [{ required: true, message: '培训名称不能为空', trigger: ['blur', 'change'] }],
-  trainPerson: [{ required: true, message: '培训对象不能为空', trigger: ['blur', 'change'] }],
-  trainNumber: [{ required: true, message: '培训人数不能为空', trigger: ['blur', 'change'] },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '培训人数只能为数字', trigger: ['blur', 'change'] },
+  planNo: [{ required: true, message: '计划编号必填', trigger: ['blur', 'change'] }],
+  planName: [{ required: true, message: '培训名称必填', trigger: ['blur', 'change'] }],
+  trainPerson: [{ required: true, message: '培训对象必填', trigger: ['blur', 'change'] }],
+  trainNumber: [{ required: true, message: '培训人数必填', trigger: ['blur', 'change'] },
+    { pattern: /(^[1-9]\d*$)/, message: '要求为正整数', trigger: ['blur', 'change'] },
   ],
-  trainHour: [{ required: true, message: '培训学时不能为空', trigger: ['blur', 'change'] }],
-  trainTime: [{ required: true, message: '培训时间不能为空', trigger: ['blur', 'change'] }],
-  trainAddress: [{ required: true, message: '培训地点不能为空', trigger: ['blur', 'change'] }],
-  deptId: [{ required: true, message: '主管部门不能为空', trigger: ['blur', 'change'] }],
-  effectiveCompany: [{ required: true, message: '实施单位不能为空', trigger: ['blur', 'change'] }],
-  director: [{ required: true, message: '负责人不能为空', trigger: ['blur', 'change'] }],
-  trainContent: [{ required: true, message: '培训内容不能为空', trigger: ['blur', 'change'] }],
+  trainHour: [{ required: true, message: '培训学时必填', trigger: ['blur', 'change'] }],
+  trainTime: [{ required: true, message: '培训时间必填', trigger: ['blur', 'change'] }],
+  trainAddress: [{ required: true, message: '培训地点必填', trigger: ['blur', 'change'] }],
+  deptId: [{ required: true, message: '主管部门必填', trigger: ['blur', 'change'] }],
+  effectiveCompany: [{ required: true, message: '实施单位必填', trigger: ['blur', 'change'] }],
+  director: [{ required: true, message: '负责人必填', trigger: ['blur', 'change'] }],
+  trainContent: [{ required: true, message: '培训内容必填', trigger: ['blur', 'change'] }],
 })
 
 // 从路由中获取页面类型参数
@@ -463,10 +463,10 @@
     </detail-page>
     <detail-block title="人员信息">
       <template #btns>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
+        <el-button v-if="pageType === 'detail'" type="primary" @click="addRow">
           增加行
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="info" @click="deleteList">
+        <el-button v-if="pageType === 'detail'" type="info" @click="deleteList">
           删除行
         </el-button>
       </template>
diff --git a/src/views/measure/train/trainLog.vue b/src/views/measure/train/trainLog.vue
index 13ebd99..7e4f40d 100644
--- a/src/views/measure/train/trainLog.vue
+++ b/src/views/measure/train/trainLog.vue
@@ -1,6 +1,7 @@
 <!-- 培训记录列表 -->
 <script lang="ts" setup name="TrainLog">
 import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage } from 'element-plus'
 import type { ItrainLoglistQuery } from './plan_interface'
@@ -35,10 +36,6 @@
 // 初始化路由
 const $router = useRouter()
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.trainStartTime = trainTime.value[0] || ''
-  listQuery.value.trainEndTime = trainTime.value[1] || ''
-  listQuery.value.createStartTime = createTime.value[0] || ''
-  listQuery.value.createEndTime = createTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -64,6 +61,28 @@
   { text: '创建时间', value: 'createTime', width: '180', align: 'center' },
   { text: '备注', value: 'remark', align: 'center' },
 ])
+// 培训时间数组变更
+watch(trainTime, (val) => {
+  if (val) {
+    listQuery.value.trainStartTime = `${val[0]}`
+    listQuery.value.trainEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.trainStartTime = ''
+    listQuery.value.trainEndTime = ''
+  }
+})
+// 创建时间变更
+watch(createTime, (val) => {
+  if (val) {
+    listQuery.value.createStartTime = `${val[0]}`
+    listQuery.value.createEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.createStartTime = ''
+    listQuery.value.createEndTime = ''
+  }
+})
 
 // 搜索
 const searchList = () => {
@@ -94,12 +113,12 @@
   })
   if (list.value.length > 0) {
     const params = {
-      createEndTime: '',
-      createStartTime: '',
-      logNo: '',
-      trainEndTime: '',
-      trainName: '',
-      trainStartTime: '',
+      createEndTime: listQuery.value.createEndTime,
+      createStartTime: listQuery.value.createStartTime,
+      logNo: listQuery.value.logNo,
+      trainEndTime: listQuery.value.trainEndTime,
+      trainName: listQuery.value.trainName,
+      trainStartTime: listQuery.value.trainStartTime,
       ids: checkoutList.value,
     }
     exportLogList(params).then((res) => {
@@ -219,8 +238,8 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/measure/train/tarnLog/import')" icon="icon-import" title="批量导入" type="primary" />
-        <icon-button v-if="proxy.hasPerm('/measure/train/tarnLog/mould')" icon="icon-template" title="模板下载" type="primary" />
+        <!-- <icon-button v-if="proxy.hasPerm('/measure/train/tarnLog/import')" icon="icon-import" title="批量导入" type="primary" /> -->
+        <!-- <icon-button v-if="proxy.hasPerm('/measure/train/tarnLog/mould')" icon="icon-template" title="模板下载" type="primary" /> -->
         <icon-button v-if="proxy.hasPerm('/measure/train/tarnLog/add')" icon="icon-add" title="新建" type="primary" @click="add" />
         <icon-button v-if="proxy.hasPerm('/measure/train/tarnLog/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/measure/train/tarnLog/print')" icon="icon-print" title="打印" type="primary" @click="printList" />

diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..9cf2b29 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -28,6 +28,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    DeptSelectByName: typeof import('./components/DeptSelectByName/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
diff --git a/src/views/business/board/standardReminder/list.vue b/src/views/business/board/standardReminder/list.vue
index 85efbb1..fd60743 100644
--- a/src/views/business/board/standardReminder/list.vue
+++ b/src/views/business/board/standardReminder/list.vue
@@ -94,12 +94,33 @@
 const preparation = ref<string>('')
 // 到期开始以及结束
 const validTime = ref<string>('')
+watch(preparation, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
+// 有效日期变更
+watch(validTime, (val) => {
+  if (val) {
+    listQuery.value.validStartTime = `${val[0]}`
+    listQuery.value.validEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.validStartTime = ''
+    listQuery.value.validEndTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.preparationStartDate = preparation.value[0] || ''
-  listQuery.value.preparationEndDate = preparation.value[1] || ''
-  listQuery.value.validStartTime = validTime.value[0] || ''
-  listQuery.value.validEndTime = validTime.value[1] || ''
+  // listQuery.value.preparationStartDate = preparation.value[0] || ''
+  // listQuery.value.preparationEndDate = preparation.value[1] || ''
+  // listQuery.value.validStartTime = validTime.value[0] || ''
+  // listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -223,16 +244,16 @@
   })
   if (list.value.length > 0) {
     const params = {
-      category: '', // 类别
-      id: '', // 主键id
-      managerState: '', // 管理状态
-      preparationEndDate: '', // 结束时间
-      preparationStartDate: '', // 开始时间
-      standardLaboratory: '', // 标准所在部门
-      standardName: '', // 标准名称
-      standardNo: '', // 标准编号
-      validEndTime: '', // 结束时间
-      validStartTime: '', // 开始时间
+      category: listQuery.value.category, // 类别
+      id: listQuery.value.id, // 主键id
+      managerState: listQuery.value.managerState, // 管理状态
+      preparationEndDate: listQuery.value.preparationEndDate, // 结束时间
+      preparationStartDate: listQuery.value.preparationStartDate, // 开始时间
+      standardLaboratory: listQuery.value.standardLaboratory, // 标准所在部门
+      standardName: listQuery.value.standardName, // 标准名称
+      standardNo: listQuery.value.standardNo, // 标准编号
+      validEndTime: listQuery.value.validEndTime, // 结束时间
+      validStartTime: listQuery.value.validStartTime, // 开始时间
       offset: 1, // 当前页
       limit: 20, // 每页多少条
       ids: checkoutList.value,
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 8666957..37ac73f 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -137,7 +137,7 @@
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  distributeDialogRef.value.initDialog(row.id, row.sampleId, row.orderId)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId, row.sampleStatus)
 }
 // 点击标签绑定
 const barCodeBind = ref()
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 807ea30..4e4eb46 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -37,11 +37,21 @@
   { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
   { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
 ])
-
+// 时间变更
+watch(trainTime, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 查询列表
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.startTime = trainTime.value[0] || ''
-  listQuery.value.endTime = trainTime.value[1] || ''
+  // listQuery.value.startTime = trainTime.value[0] || ''
+  // listQuery.value.endTime = trainTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2f7c1d0..bccde84 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -139,7 +139,17 @@
     id: '2', // 后端规定已收入传2
   })
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -147,8 +157,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.sampleStatus = active.value
   getInterChangeList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IinterchangeList) => {
@@ -280,7 +290,7 @@
       else if (type === 'delete') { // 无需检测
         interchangeStatusChange({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '7' }).then((res) => {
           if (res.code === 200) {
-            ElMessage.success(`已${title}`)
+            ElMessage.success('操作成功')
             fetchData(true)
           }
         })
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList.vue b/src/views/business/schedule/interchangeReceipt/receiptList.vue
index 275a053..83d93f4 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptList.vue
@@ -42,7 +42,17 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -50,8 +60,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getReceiptList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -124,13 +134,13 @@
   })
   if (list.value.length > 0) {
     const params = {
-      interchangeCode: '', // 交接单编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      reciever: '', // 接收人
-      deliverer: '', // 送样人
-      startTime: '', // 交接开始时间
-      endTime: '', // 交接结束时间
+      interchangeCode: listQuery.value.interchangeCode, // 交接单编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      reciever: listQuery.value.reciever, // 接收人
+      deliverer: listQuery.value.deliverer, // 送样人
+      startTime: listQuery.value.startTime, // 交接开始时间
+      endTime: listQuery.value.endTime, // 交接结束时间
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index cf0b532..f2fc852 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -26,8 +26,8 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   deliverer: '', // 送样人
-  isUrgent: 2, // 是否加急 2全部 1是 0否
-  status: 0, // 接收状态
+  isUrgent: '', // 是否加急 2全部 1是 0否
+  status: '', // 接收状态
   offset: 1,
   limit: 20,
 })
@@ -70,11 +70,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    isUrgentMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 2, // 是否加急全部后端定为2
-    })
+    // isUrgentMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 2, // 是否加急全部后端定为2
+    // })
   })
   // 接收状态
   getDictByCode('orderStatus').then((response) => {
@@ -85,11 +85,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    statusMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 0,
-    })
+    // statusMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 0,
+    // })
     console.log(statusMap.value)
   })
 }
@@ -125,8 +125,8 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     deliverer: '', // 送样人
-    isUrgent: 2, // 是否加急
-    status: 0, // 接收状态
+    isUrgent: '', // 是否加急 2全部 1是 0否
+    status: '', // 接收状态
     offset: 1,
     limit: 20,
   }
@@ -191,12 +191,12 @@
   })
   if (list.value.length > 0) {
     const params = {
-      orderCode: '', // 委托书编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      deliverer: '', // 送样人
-      isUrgent: 2, // 是否加急
-      status: 0, // 接收状态
+      orderCode: listQuery.value.orderCode, // 委托书编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      deliverer: listQuery.value.deliverer, // 送样人
+      isUrgent: listQuery.value.isUrgent, // 是否加急
+      status: listQuery.value.status, // 接收状态
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 2d92da9..14cd1ce 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -6,7 +6,7 @@
   customerName: string // 委托方名称
   deliverer: string // 送样人
   isUrgent: number | string // 是否加急
-  status: number // 接收状态
+  status: number | string// 接收状态
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 50308c7..25c5cf9 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -53,6 +53,7 @@
   handOutProperty: string // 分发性质-初次分发、退回分发
   id?: string // 实验室id
   customerId?: string // 客户id
+  certificationState?: string // 证书出具
 }
 
 // 实验室检测/我的检测列表
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index 7c17365..7159350 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -1,6 +1,6 @@
 <!-- 任务分发 -->
 <script lang="ts" setup name="TaskEdit">
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
 import ProcessConfig from './components/processConfig.vue'
@@ -11,6 +11,7 @@
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { UploadFile } from '@/api/measure/file'
 import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 interface dictType {
   id: string
@@ -251,16 +252,22 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    // UploadFile(fd).then((res) => {
-    //   if (res.code === 200) {
-    //     sampleForm.value.minioFileName = res.data[0]
-    //     // 重置当前验证
-    //     ElMessage.success('文件上传成功')
-    //   }
-    //   else {
-    //     ElMessage.error(res.message)
-    //   }
-    // })
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        sampleForm.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+        loading.close()
+      }
+      else {
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    })
   }
 }
 const upload = () => {
@@ -402,7 +409,7 @@
               <el-form-item label="校检类别:">
                 <el-select
                   v-model="sampleForm.measureCategory"
-                  :placeholder="roleType === 'detail' ? '' : '请选择校检类别'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择校检类别'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -424,7 +431,7 @@
               <el-form-item label="厂家国别:">
                 <el-select
                   v-model="sampleForm.manufacturerCountry"
-                  :placeholder="roleType === 'detail' ? '' : '请选择厂家国别'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择厂家国别'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -450,7 +457,7 @@
               <el-form-item label="ABC:">
                 <el-select
                   v-model="sampleForm.abc"
-                  :placeholder="roleType === 'detail' ? '' : '请选择ABC'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择ABC'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -504,8 +511,8 @@
               <el-form-item label="备注:">
                 <el-input
                   v-model="sampleForm.remark"
+                  autosize
                   type="textarea"
-                  :rows="2"
                   :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
                   :class="{ 'detail-input': roleType === 'detail' }"
@@ -516,7 +523,7 @@
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="sampleForm.measureType"
-                  :placeholder="roleType === 'detail' ? '' : '请选择检定方式'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择检定方式'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index dfbbf6a..6eeff55 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -81,7 +81,7 @@
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '165px' },
   { text: '样品属性', value: 'sampleBelongName', width: '100', align: 'center' },
   { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '90' },
-  { text: '证书出具', value: 'certificationState', align: 'center', width: '90', filter: (row: ITaskList) => { return `${row.alreadyCertifications}/${row.requireCertifications}` } },
+  { text: '证书出具', value: 'certificationState', align: 'center', width: '90' },
 ])
 // 表格数据
 const list = ref<ITaskList[]>([])
@@ -104,6 +104,7 @@
   getTaskList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: ITaskList) => {
       item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      item.certificationState = `${item.alreadyCertifications}/${item.requireCertifications}`
       return item
     })
     total.value = response.data.total
diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue
index e44dd67..194de53 100644
--- a/src/views/business/subpackage/apply/list.vue
+++ b/src/views/business/subpackage/apply/list.vue
@@ -302,7 +302,7 @@
         <search-item>
           <el-date-picker
             v-model="timeRange" type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="申请开始时间" end-placeholder="申请结束时间"
+            value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="申请开始时间" end-placeholder="申请结束时间" clearable
           />
         </search-item>
       </search-area>
diff --git a/src/views/business/subpackage/check/list.vue b/src/views/business/subpackage/check/list.vue
index 51ea419..a8b6744 100644
--- a/src/views/business/subpackage/check/list.vue
+++ b/src/views/business/subpackage/check/list.vue
@@ -111,8 +111,6 @@
 
 // 时间变更
 watch(timeRange, (val) => {
-  console.log(val[0])
-
   if (val) {
     listQuery.value.checkStartTime = `${val[0]}`
     listQuery.value.checkEndTime = `${val[1]}`
@@ -345,7 +343,8 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="timeRange" type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
+            v-model="timeRange"
+            clearable type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="验收开始时间" end-placeholder="验收结束时间"
           />
         </search-item>
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 98f4a39..a0db900 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -68,6 +68,7 @@
   else {
     listQuery.value.startTime = ''
     listQuery.value.endTime = ''
+    timeRange.value = ['', '']
   }
 })
 // 多选发生改变时
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index 6e41a94..ac98b8a 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -56,7 +56,17 @@
 const checkoutList = ref<string[]>([])
 // 文件上传input
 const fileRef = ref()
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -64,8 +74,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getSampleList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index 92e4b4a..6f465fc 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -67,7 +67,17 @@
     certificationStatusMap.value[`${item.value}`] = item.name
   })
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -75,8 +85,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getSampleList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IOvertimeList) => {
       return {
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index dbaa437..14464bf 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -86,6 +86,17 @@
     width: 160,
   },
 ]) // 表格
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 const fetchData = (isNowPage = false) => {
   loadingTable.value = true
@@ -93,8 +104,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.processResult = active.value
   getApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 60d1454..d0236cc 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -105,7 +105,17 @@
     align: 'center',
   },
 ])
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 const fetchData = (isNowPage = false) => {
   loadingTable.value = true
@@ -113,8 +123,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.approvalStatus = active.value
   getApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index aeb568e..5430b0f 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -103,10 +103,21 @@
 // 装载时间数组
 const checkTime = ref<string>('')
 const loadingTable = ref(false)
+// 时间变更
+watch(checkTime, (val) => {
+  if (val) {
+    listQuery.value.checkStartDate = `${val[0]}`
+    listQuery.value.checkEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.checkStartDate = ''
+    listQuery.value.checkEndDate = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.checkStartDate = checkTime.value[0] || ''
-  listQuery.value.checkEndDate = checkTime.value[1] || ''
+  // listQuery.value.checkStartDate = checkTime.value[0] || ''
+  // listQuery.value.checkEndDate = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 6229abf..9d30934 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -112,10 +112,21 @@
 // 装载时间数组
 const checkTime = ref('')
 const loadingTable = ref(false)
+// 时间变更
+watch(checkTime, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.startTime = checkTime.value[0] || ''
-  listQuery.value.endTime = checkTime.value[1] || ''
+  // listQuery.value.startTime = checkTime.value[0] || ''
+  // listQuery.value.endTime = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index daca294..de18467 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -66,6 +66,17 @@
 const checkoutList = ref<IManageChecklist[]>([])
 // 文件上传input
 const fileRef = ref()
+// 时间变更
+watch(checkDate, (val) => {
+  if (val) {
+    listQuery.value.checkStartDate = `${val[0]}`
+    listQuery.value.checkEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.checkStartDate = ''
+    listQuery.value.checkEndDate = ''
+  }
+})
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
@@ -73,8 +84,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.checkStartDate = checkDate.value[0] || ''
-  listQuery.value.checkEndDate = checkDate.value[1] || ''
+  // listQuery.value.checkStartDate = checkDate.value[0] || ''
+  // listQuery.value.checkEndDate = checkDate.value[1] || ''
   getcheckInfoList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: any) => {
       return {
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 00d283c..50b014c 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -99,6 +99,17 @@
     approvalStatusReserveMap.value[item.name] = `${item.value}`
   })
 }
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -106,8 +117,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.approvalStatus = active.value
   getReceiveApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/receive/solve/solveList.vue b/src/views/device/receive/solve/solveList.vue
index 809c0c1..ec1e8bb 100644
--- a/src/views/device/receive/solve/solveList.vue
+++ b/src/views/device/receive/solve/solveList.vue
@@ -120,7 +120,17 @@
   timeRange.value = ['', ''] // 把时间选择框置空
   fetchData(true)
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -128,8 +138,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getReceiveApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IsolveListType) => {
       return {
diff --git a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
index 4744536..b4fe085 100644
--- a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
@@ -43,7 +43,12 @@
   select.value = -1
   listPageApi(listQuery.value).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows
+      list.value = res.data.rows.map((item: { effectiveStatusName: string }) => {
+        return {
+          ...item,
+          isDisabled: item.effectiveStatusName === '已废止',
+        }
+      })
       total.value = res.data.total
     }
   })
@@ -142,7 +147,7 @@
           </el-table-column>
           <el-table-column label="" width="55" align="center" fixed="left">
             <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
+              <el-radio v-model="select" :disabled="scope.row.isDisabled" :label="scope.$index" class="radio" />
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index a030dcf..0dd5547 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -94,12 +94,34 @@
 const preparation = ref<string>('')
 // 到期开始以及结束
 const validTime = ref<string>('')
+// 筹建日期变更
+watch(preparation, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
+// 有效日期变更
+watch(validTime, (val) => {
+  if (val) {
+    listQuery.value.validStartTime = `${val[0]}`
+    listQuery.value.validEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.validStartTime = ''
+    listQuery.value.validEndTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.preparationStartDate = preparation.value[0] || ''
-  listQuery.value.preparationEndDate = preparation.value[1] || ''
-  listQuery.value.validStartTime = validTime.value[0] || ''
-  listQuery.value.validEndTime = validTime.value[1] || ''
+  // listQuery.value.preparationStartDate = preparation.value[0] || ''
+  // listQuery.value.preparationEndDate = preparation.value[1] || ''
+  // listQuery.value.validStartTime = validTime.value[0] || ''
+  // listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index 39d8683..bb69fe9 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -99,6 +99,17 @@
 const standardManagerStateList = ref<IOptions[]>([])
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
+// 时间变更
+watch(preparationDate, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
@@ -107,8 +118,8 @@
     listQuery.value.offset = 1
   }
   // 筹建日期
-  listQuery.value.preparationStartDate = preparationDate.value[0] || ''
-  listQuery.value.preparationEndDate = preparationDate.value[1] || ''
+  // listQuery.value.preparationStartDate = preparationDate.value[0] || ''
+  // listQuery.value.preparationEndDate = preparationDate.value[1] || ''
   getStandardList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: any) => {
       return {
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 37205fc..edf9dd7 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -793,7 +793,7 @@
             保存
           </el-button>
           <!-- 待审批 -->
-          <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'agree' })">
+          <!-- <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'agree' })">
             同意
           </el-button>
           <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'reject' })">
@@ -801,7 +801,7 @@
           </el-button>
           <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'refuse' })">
             拒绝
-          </el-button>
+          </el-button> -->
           <!-- </template> -->
         </template>
         <el-button v-if="(title === '详情' && $route.query?.approvalStatusName === '草稿箱' && isCancel)" type="primary" @click="editForm">
diff --git a/src/views/finance/businessSettlement/list.vue b/src/views/finance/businessSettlement/list.vue
index e942abb..9543947 100644
--- a/src/views/finance/businessSettlement/list.vue
+++ b/src/views/finance/businessSettlement/list.vue
@@ -43,6 +43,7 @@
 const list = ref<IList[]>([]) // 表格数据
 // 选中的内容
 const checkoutList = ref<string[]>([])
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
diff --git a/src/views/finance/contract/list.vue b/src/views/finance/contract/list.vue
index 7dcdca5..5f8eb4e 100644
--- a/src/views/finance/contract/list.vue
+++ b/src/views/finance/contract/list.vue
@@ -59,6 +59,17 @@
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 选中的内容
 const checkoutList = ref<string[]>([])
+// 时间变更
+watch(dateRange, (val) => {
+  if (val) {
+    listQuery.value.estimateSignStartDate = `${val[0]}`
+    listQuery.value.estimateSignEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.estimateSignStartDate = ''
+    listQuery.value.estimateSignEndDate = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -66,8 +77,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.estimateSignStartDate = dateRange.value[0] as string || ''
-  listQuery.value.estimateSignEndDate = dateRange.value[1] as string || ''
+  // listQuery.value.estimateSignStartDate = dateRange.value[0] as string || ''
+  // listQuery.value.estimateSignEndDate = dateRange.value[1] as string || ''
   getContractList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: { estimateSignDate: string; agreementAmount: number }) => {
       return {
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 1bce5f9..07b2296 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,7 +1,7 @@
-<!-- 新增或详情弹窗 -->
+<!-- 新增或详情 -->
 <script lang="ts" setup name="addNotice">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
@@ -15,6 +15,7 @@
 import { SCHEDULE } from '@/utils/scheduleDict'
 const $route = useRoute()
 const $router = useRouter()
+const submitId = ref('') // 提交id-保存接口获取
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
 const fileTypeName = ref('')
@@ -40,12 +41,12 @@
   formId: SCHEDULE.FILE_APPROVAL,
 }) // 表单
 const rules = ref<FormRules>({
-  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
-  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
-  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
-  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
-  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+  fileName: [{ required: true, message: '名称必填', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建必填', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位必填', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间必填', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人必填', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号必填', trigger: 'blur' }],
 }) // 表单验证规则
 
 const userList = ref<userType[]>([]) // 可使用人列表
@@ -57,12 +58,14 @@
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
-const PubList = ref<deptType[]>([])
+const PubList = ref([]) as any// 发布单位列表
 const PubListTree = ref([])
 // 获取发布单位列表
 const getPubList = () => {
   getDeptTreeList().then((res) => {
     PubList.value = res.data
+    console.log('0000', 'ppp', PubList.value)
+
     PubListTree.value = toTreeList(res.data, '0', true)
   })
 }
@@ -113,43 +116,57 @@
   effectiveStatusName.value = ''
 }
 // 提交
-const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+const saveForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
-    `确认${flag}吗？`,
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then((res) => {
+        const publisherId = ruleForm.publisher
+        const index = PubList.value.findIndex((item: { id: string }) => item.id === publisherId)
+        if (index !== -1) {
+          ruleForm.publisher = PubList.value[index].name as string
+        }
+        // 保存（草稿箱）
+        confirmDrafts(ruleForm).then((res) => {
+          ruleForm.fileNo = res.data.fileNo
+          submitId.value = res.data.id
+          ElMessage.success('保存成功')
+          // formEl?.resetFields()
+          // $router.go(-1)
+          close()
+        })
+      })
+    }
+  })
+}
+const submitForm = () => {
+  if (!submitId.value) {
+    ElMessage.warning('请先保存')
+    return false
+  }
+  ElMessageBox.confirm(
+    '确认提交吗？',
     '提示',
     {
       confirmButtonText: '确认',
       cancelButtonText: '取消',
       type: 'warning',
     },
-      ).then((res) => {
-        if (flag === '提交') {
-          confirmDrafts(ruleForm).then((res) => {
-            if (res.code === 200) {
-              console.log(res.data, '保存成功')
-              submitFile({ id: res.data.id, formId: SCHEDULE.FILE_APPROVAL }).then((res) => {
-                formEl?.resetFields()
-                ElMessage.success('提交成功')
-                $router.go(-1)
-                close()
-              })
-            }
-          })
-        }
-        else {
-          // 保存（草稿箱）
-          confirmDrafts(ruleForm).then((res) => {
-            ElMessage.success('保存成功')
-            formEl?.resetFields()
-            $router.go(-1)
-            close()
-          })
-        }
-      })
-    }
+  ).then((res) => {
+    submitFile({ id: submitId.value, formId: SCHEDULE.FILE_APPROVAL }).then((res) => {
+    // formEl?.resetFields()
+      ElMessage.success('已提交')
+      $router.go(-1)
+      close()
+    })
   })
 }
 // 取消
@@ -163,9 +180,14 @@
 const onFileChange = (event: any) => {
   // 原生上传
   // console.log(event.target.files)
+
   if (event.target.files?.length !== 0) {
     // 创建formdata对象
     const fd = new FormData()
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
@@ -173,9 +195,11 @@
         // 重置当前验证
         ruleFormRef.value?.clearValidate('minioFileName')
         ElMessage.success('文件上传成功')
+        loading.close()
       }
       else {
         ElMessage.error(res.message)
+        loading.close()
       }
     })
   }
@@ -215,10 +239,10 @@
   <app-container style="overflow: hidden;">
     <detail-page :title="`${fileTypeName}-${title}`">
       <template #btns>
-        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm()">
           提交
         </el-button>
-        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
+        <el-button v-if="title !== '详情'" type="primary" @click="saveForm(ruleFormRef)">
           保存
         </el-button>
         <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -258,7 +282,7 @@
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
                 style="width: 100%;"
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 135d059..c2b46c0 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -1,6 +1,7 @@
 <!-- 文件审批公共模板 -->
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { DateModelType } from 'element-plus'
 import type { TableRow } from './approve-interface'
 import type { fileResType } from '@/views/measure/file/file-interface'
 import { printJSON } from '@/utils/printUtils'
@@ -32,12 +33,13 @@
 const approvalStatusReserveMap = ref({ ...props.approvalStatusReserveMap }) // 审批状态字典{草稿箱: 1}
 const activeTitle = ref('') // active对应的审批状态名字
 
-const searchQuery = reactive({
+const searchQuery = ref({
   fileNo: '', // 编号
   fileName: '', // 名称
   fileCode: '', // 文件号
   createUser: '', // 创建人
-  createTime: '', // 创建
+  createStartTime: '', // 创建开始时间
+  createEndTime: '', // 创建结束时间
   approvalStatus: approvalStatus.value, // 审批状态
   limit: 20,
   offset: 1,
@@ -49,18 +51,31 @@
 const total = ref<number>(0) // 数据总条数
 const columns = ref<TableColumn[]>([
   { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
+  { text: '编号', value: 'fileNo', align: 'center', width: '160' },
   { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
+  { text: '类别', value: 'fileTypeName', align: 'center' },
   { text: '创建人', value: 'createUser', align: 'center' },
-  { text: '创建时间', value: 'createTime', align: 'center' },
-  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110' },
 ]) // 表格
 const list = ref<TableRow[]>([]) // 表格数据
+// 筛选时间段数据
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    searchQuery.value.createStartTime = `${val[0]}`
+    searchQuery.value.createEndTime = `${val[1]}`
+  }
+  else {
+    searchQuery.value.createStartTime = ''
+    searchQuery.value.createEndTime = ''
+  }
+})
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
-  approvallistPageApi(searchQuery).then((res) => {
+  approvallistPageApi(searchQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows.map((item: TableRow) => {
         return {
@@ -85,10 +100,10 @@
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
-    searchQuery.limit = val.size
+    searchQuery.value.limit = val.size
   }
   if (val && val.page) {
-    searchQuery.offset = val.page
+    searchQuery.value.offset = val.page
   }
   getList()
 }
@@ -216,12 +231,21 @@
 }
 // 重置
 const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.fileType = ''
-  searchQuery.createTime = ''
-  searchQuery.createUser = ''
+  searchQuery.value = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    fileCode: '', // 文件号
+    createUser: '', // 创建人
+    createStartTime: '', // 创建开始时间
+    createEndTime: '', // 创建结束时间
+    approvalStatus: approvalStatus.value, // 审批状态
+    limit: 20,
+    offset: 1,
+    fileType: '', // 文件类别
+    formId: SCHEDULE.FILE_APPROVAL,
+    ids: [] as string[],
+  }
+  timeRange.value = ['', '']
   getList()
 }
 // 表格被选中的行
@@ -230,27 +254,6 @@
 const multiSelect = (row: TableRow[]) => {
   selectList.value = row
 }
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  searchQuery.ids = []
-  if (selectList.value.length) {
-    selectList.value.forEach((item) => {
-      searchQuery.ids?.push(item.id as string)
-    })
-  }
-  exportFileApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
-    exportFile(res.data, props.name)
-    loading.close()
-    searchQuery.ids = []
-  }).catch((_) => {
-    loading.close()
-  })
-}
 // 打印
 function printList() {
   const selectIds = selectList.value.map(item => item.id)
@@ -278,8 +281,8 @@
   sessionStorage.setItem('approveFileMenu', props.name)
   approvalStatus.value = approvalStatusReserveMap.value[props.name]
   // approvalStatus.value = approvalStatusReserveMap.value[props.name] // 失效
-  searchQuery.approvalStatus = approvalStatusReserveMap.value[props.name] || '0'
-  $router.currentRoute.value.query.cacheActive = searchQuery.approvalStatus
+  searchQuery.value.approvalStatus = approvalStatusReserveMap.value[props.name] || '0'
+  $router.currentRoute.value.query.cacheActive = searchQuery.value.approvalStatus
   getList()
   // 缓存名称
 }, { deep: true, immediate: true })
@@ -312,8 +315,14 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss" placeholder="创建时间"
+            v-model="timeRange"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="创建开始时间"
+            end-placeholder="创建结束时间"
+            clearable
+            style="width: 360px;"
           />
         </search-item>
         <search-item>
@@ -323,10 +332,6 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <icon-button
-            v-if="proxy.hasPerm('/file/approve/export')" icon="icon-export" title="导出"
-            @click="exportExcelBtn"
-          />
           <icon-button v-if="proxy.hasPerm('/file/approve/print')" icon="icon-print" title="打印" @click="printList" />
         </template>
         <!-- 表格区域 -->
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 9dd3633..de9e080 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -85,7 +85,7 @@
 const getStatus = () => {
   getDictByCode('effectiveStatus').then((res) => {
     if (res.code === 200) {
-      effectiveStatusSelect.value = [...res.data, { name: '全部', value: '', id: 'quanbu' }]
+      effectiveStatusSelect.value = res.data
     }
   })
 }
@@ -373,8 +373,8 @@
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/add`)" icon="icon-add" title="新建" @click="add" />
-          <icon-button v-if="proxy.hasPerm(`/file/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
-          <icon-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <!-- <icon-button v-if="proxy.hasPerm(`/file/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" /> -->
+          <!-- <icon-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" /> -->
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/print`)" icon="icon-print" title="打印" @click="printList" />
         </template>
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 3510056..ed3ab8c 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -282,8 +282,8 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/measure/price/import')" icon="icon-import" title="批量导入" type="primary" />
-        <icon-button v-if="proxy.hasPerm('/measure/price/mould')" icon="icon-template" title="模板下载" type="primary" />
+        <!-- <icon-button v-if="proxy.hasPerm('/measure/price/import')" icon="icon-import" title="批量导入" type="primary" /> -->
+        <!-- <icon-button v-if="proxy.hasPerm('/measure/price/mould')" icon="icon-template" title="模板下载" type="primary" /> -->
         <icon-button v-if="proxy.hasPerm('/measure/price/add')" icon="icon-add" title="新建" type="primary" @click="add" />
         <icon-button v-if="proxy.hasPerm('/measure/price/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/measure/price/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 60eeebb..7b6f4ec 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -61,7 +61,8 @@
   categoryName: [{ required: true, message: '类别不能为空', trigger: ['blur', 'change'] }],
   itemName: [{ required: true, message: '项目不能为空', trigger: ['blur', 'change'] }],
   priceStandardName: [{ required: true, message: '依据标准不能为空', trigger: ['blur', 'change'] }],
-  price: [{ required: true, message: '标准价格不能为空', trigger: ['blur', 'change'] }],
+  price: [{ required: true, message: '标准价格不能为空', trigger: ['blur', 'change'] },
+    { pattern: /^(?!0+(?:\.0+)?$)(?:[1-9]\d*|0)(?:\.\d{1,2})?$/, message: '要求不小于0，且最多保留两位小数', trigger: ['blur', 'change'] }],
   operatorDiscountPermission: [{ required: true, message: '业务员折扣权限不能为空', trigger: ['blur', 'change'] }],
   directorDiscountPermission: [{ required: true, message: '负责人折扣权限不能为空', trigger: ['blur', 'change'] }],
 })
@@ -255,7 +256,7 @@
                   v-model.trim="formInline.priceStandardName"
                   clearable
                   :placeholder="pageType === 'detail' ? '' : '依据标准'"
-                  :disabled="pageType === 'detail'"
+                  disabled
                 >
                   <template v-if="pageType !== 'detail'" #append>
                     <el-button
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 5e62137..22d1d8a 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -24,16 +24,16 @@
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    // { name: '删除', type: 'danger' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    // { name: '删除', type: 'danger' },
     { name: '取消', type: 'info' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    // { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
+    { name: '删除', type: 'danger' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
@@ -41,9 +41,10 @@
   ],
   已取消: [
     { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
     { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
-
 }
 // 当前tab
 const currentTab = ref('全部')
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index d2fad4c..004b856 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -28,10 +28,6 @@
 const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  // 审批中状态时候长度返回错误
-  if (props.status === '3' || props.status === '6') {
-    props.buttons.length = 4 // 传递长度 + 判断条件下显示按钮长度
-  }
   return props.buttons.length * 40 + 23
 })
 
@@ -63,13 +59,13 @@
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '溯源供方编号', value: 'supplierNo', width: '160', align: 'center' },
-  { text: '溯源供方名称', value: 'supplierName', width: '120', align: 'center' },
+  { text: '溯源供方名称', value: 'supplierName', align: 'center' },
   { text: '业务内容', value: 'businessContent', align: 'center' },
   { text: '业务范围', value: 'businessScope', align: 'center' },
   { text: '负责人', value: 'director', align: 'center' },
   { text: '联系方式', value: 'phone', align: 'center' },
   { text: '地址', value: 'address', align: 'center' },
-  { text: '创建时间', value: 'name', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
   { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110px' },
 ])
 // 初始化路由
@@ -86,15 +82,20 @@
     listQuery.value.offset = 1
   }
   getapprovalListPage(listQuery.value).then((response) => {
-    list.value = response.data.rows
-    if (!companyAddress.value) {
-      companyAddress.value = [response.data.rows[0].companyCountry, response.data.rows[0].companyProvince, response.data.rows[0].companyCity, response.data.rows[0].companyArea, response.data.rows[0].companyAddress]
-    }
-    else if (isReset) {
-      companyAddress.value = [response.data.rows[0].companyCountry, response.data.rows[0].companyProvince, response.data.rows[0].companyCity, response.data.rows[0].companyArea, response.data.rows[0].companyAddress]
+    list.value = response.data.rows.map((item: { companyProvinceName: string; companyCityName: string }) => {
+      return {
+        ...item,
+        address: item.companyProvinceName === item.companyCityName ? item.companyCityName : item.companyProvinceName + item.companyCityName,
+      }
+    })
+    // if (!companyAddress.value) {
+    //   companyAddress.value = [response.data.rows[0].companyCountry, response.data.rows[0].companyProvince, response.data.rows[0].companyCity, response.data.rows[0].companyArea, response.data.rows[0].companyAddress]
+    // }
+    if (isReset) {
+      companyAddress.value = ['', '', '', '', '']
+      // companyAddress.value = [response.data.rows[0].companyCountry, response.data.rows[0].companyProvince, response.data.rows[0].companyCity, response.data.rows[0].companyArea, response.data.rows[0].companyAddress]
     }
     total.value = parseInt(response.data.total)
-    console.log(companyAddress.value)
     loadingTable.value = false
   }).catch((_) => {
     loadingTable.value = false
@@ -107,6 +108,7 @@
 }
 // 公司地址变化后给对象赋值
 function companyAddressChange(addressObj: IAddress) {
+  console.log('公司地址变化后给对象赋值')
   listQuery.value.companyCountry = addressObj.country
   listQuery.value.companyProvince = addressObj.province
   listQuery.value.companyCity = addressObj.city
@@ -191,30 +193,6 @@
   }
   fetchData(true, true)
 }
-// 导出
-const exportExcelBtn = () => {
-  const params: supplierExportQuery = {
-    approvalStatus: listQuery.value.approvalStatus,
-    businessContent: listQuery.value.businessContent,
-    companyArea: listQuery.value.companyArea,
-    companyCity: listQuery.value.companyCity,
-    companyProvince: listQuery.value.companyProvince,
-    formId: listQuery.value.formId,
-    supplierName: listQuery.value.supplierName,
-    supplierNo: listQuery.value.supplierNo,
-  }
-  if (checkoutList.value.length > 0) {
-    params.ids = checkoutList.value
-  }
-  // TODO: 审批列表导出
-  console.log(params)
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  loading.close()
-}
 
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -237,10 +215,7 @@
 const add = () => {
   $router.push('/source/add')
 }
-// 批量导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 审批结束回调
 const approvalSuccess = () => {
   fetchData(true)
@@ -259,7 +234,7 @@
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    sourceSubmit({ id: row.id, formId: SCHEDULE.SUPPLIER_APPROVAL }).then((res) => {
+    sourceSubmit({ id: row.id, formId: SCHEDULE.SUPPLIER_APPROVAL, processId: row.processId }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
@@ -311,7 +286,7 @@
   (newVal: string) => {
     console.log('change status', newVal)
     listQuery.value.approvalStatus = newVal
-    fetchData(false)
+    clearList()
   },
   { immediate: true })
 
@@ -429,7 +404,7 @@
                   编辑
                 </el-button>
                 <el-button
-                  v-if="row.approvalStatusName === '草稿箱' "
+                  v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                   size="small"
                   link
                   type="primary"
@@ -448,20 +423,8 @@
                 >
                   取消
                 </el-button>
-                <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-                <!-- <el-button
-                  v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
-                  size="small"
-                  link
-                  type="danger"
-                  :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-                  @click="clickBtn(row, '删除')"
-                >
-                  删除
-                </el-button> -->
-                <!-- ------------------------------------审批中的删除暂时去掉-------------------------------- -->
                 <el-button
-                  v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+                  v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/measure/source/components/sourceApprovalDetail.vue b/src/views/measure/source/components/sourceApprovalDetail.vue
index c507032..35683e7 100644
--- a/src/views/measure/source/components/sourceApprovalDetail.vue
+++ b/src/views/measure/source/components/sourceApprovalDetail.vue
@@ -8,12 +8,15 @@
 import { getSoucreListDetail } from '@/api/measure/source'
 import { cancelApproval, fetchApproval } from '@/api/approval'
 import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
-
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import type { IAddress } from '@/components/AddressSelect/address-interface'
+const approvalDialog = ref() // 审批对话ref
 const approvalRecord = ref() // 审批流程组件ref
 const infoId = ref('') // id
+const taskId = ref('') // 任务id 用于审批
+const processId = ref('') // 流程实例id
 const approvalType = ref('')
 const approvalStatusName = ref('') // 审批状态、控制草稿箱没有审批流程
-
 // 从路由中获取页面类型参数
 const $route = useRoute()
 if ($route.params && $route.params.type) {
@@ -70,8 +73,9 @@
   approvalStatus: '', // 审批状态
   approvalStatusName: '', // 审批状态名称
 })
-
-const traceSupplierPersonList: Ref<traceSupplierPerson[]> = ref([])
+const companyAddress = ref<string[]>([]) // 公司地址
+const invoiceAddress = ref<string[]>([]) // 开票地址
+const traceSupplierPersonList: Ref<traceSupplierPerson[]> = ref([]) // 人员列表
 const columns = [
   { text: '人员编号', value: 'personNo' },
   { text: '姓名', value: 'name' },
@@ -83,9 +87,15 @@
 const getInfo = () => {
   getSoucreListDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data
+    traceSupplierPersonList.value = res.data.traceSupplierPersonList
+    // for (const key in dataForm.value) {
+    //   dataForm.value[key] = res.data[key]
+    // }
+    companyAddress.value = [dataForm.value.companyCountryName, dataForm.value.companyProvinceName, dataForm.value.companyCityName, dataForm.value.companyAreaName, dataForm.value.companyAddress]
+    invoiceAddress.value = [dataForm.value.invoiceCountryName, dataForm.value.invoiceProvinceName, dataForm.value.invoiceCityName, dataForm.value.invoiceAreaName, dataForm.value.invoiceAddress]
   })
 }
-getInfo()
+
 // 初始化router
 const $router = useRouter()
 // 关闭新增页面的回调
@@ -106,12 +116,12 @@
 }
 // 审批结束回调
 const approvalSuccess = () => {
-  getInfo()
+  close() // 返回上一页
 }
 // 取消
 const handleCancel = () => {
   const params = {
-    processInstanceId: dataForm.value.processId!,
+    processInstanceId: processId.value!,
     comments: '取消审批',
   }
   ElMessageBox.confirm(
@@ -125,21 +135,21 @@
   ).then(() => {
     cancelApproval(params).then(() => {
       ElMessage.success('取消成功')
+      close()
     })
   })
 }
-const approvalDialog = ref()
 // 点击数据后的操作按钮
 const clickBtn = (buttonType: string) => {
   switch (buttonType) {
     case '同意':
-      approvalDialog.value.initDialog('agree', dataForm.value.taskId)
+      approvalDialog.value.initDialog('agree', taskId.value)
       break
     case '驳回':
-      approvalDialog.value.initDialog('reject', dataForm.value.taskId)
+      approvalDialog.value.initDialog('reject', taskId.value)
       break
     case '拒绝':
-      approvalDialog.value.initDialog('refuse', dataForm.value.taskId)
+      approvalDialog.value.initDialog('refuse', taskId.value)
       break
     case '取消':
       handleCancel()
@@ -148,10 +158,14 @@
 }
 onMounted(() => {
   dataForm.value.processId = $route.query.processId as string// 流程实例id
+  processId.value = $route.query.processId as string// 流程实例id
   approvalStatusName.value = $route.query.approvalStatusName as string
+  taskId.value = $route.query.taskId as string
+
   if (approvalStatusName.value !== '草稿箱') {
-    getApprovalRecord(dataForm.value.processId) // 查询审批记录
+    getApprovalRecord(processId.value) // 查询审批记录
   }
+  getInfo() // 获取详情
 })
 </script>
 
@@ -162,13 +176,13 @@
         <el-button v-if="approvalType === '2'" type="primary" @click="clickBtn('同意')">
           同意
         </el-button>
-        <el-button v-if="approvalType === '2'" type="primary" @click="clickBtn('拒绝')">
-          拒绝
-        </el-button>
         <el-button v-if="approvalType === '2'" type="primary" @click="clickBtn('驳回')">
           驳回
         </el-button>
-        <el-button v-if="approvalType === '3'" type="primary" @click="handleCancel()">
+        <el-button v-if="approvalType === '2'" type="danger" @click="clickBtn('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="approvalType === '3'" type="info" @click="handleCancel()">
           取消
         </el-button>
         <el-button type="info" @click="close">
@@ -201,6 +215,7 @@
       <!-- 审批流程 -->
       <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
     </detail-block>
+    <!-- 审批弹窗 -->
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index e352e61..cda7d0c 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -89,7 +89,7 @@
   getSoucreList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: ISupplier) => {
       if (item.companyProvinceName && item.companyCityName) {
-        item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
+        item.briefName = `${item.companyProvinceName}${item.companyCityName}`
       }
       else {
         item.briefName = item.companyProvinceName || item.companyCityName
@@ -184,9 +184,10 @@
   })
   if (list.value.length > 0) {
     const params = {
-      supplierNo: '', // 业务内容
-      supplierName: '', // 溯源供方名称
-      businessContent: '', // 溯源供方编号
+      supplierNo: listQuery.value.supplierNo, // 业务内容
+      supplierName: listQuery.value.supplierName, // 溯源供方名称
+      businessContent: listQuery.value.businessContent, // 溯源供方编号
+      formId: SCHEDULE.SUPPLIER_APPROVAL,
       ids: checkoutList.value,
     }
     exportSourceList(params).then((res) => {
@@ -256,8 +257,8 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
-        <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" />
+        <!-- <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" /> -->
+        <!-- <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" /> -->
         <icon-button v-if="proxy.hasPerm('/measure/measureSource/add')" icon="icon-add" title="新建" type="primary" @click="add" />
         <icon-button v-if="proxy.hasPerm('/measure/measureSource/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/measure/measureSource/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index 939c80a..b107e3e 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -3,7 +3,7 @@
  * 添加/编辑/详情溯源供方
  */
 import type { Ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import baseInfoDetail from './components/baseInfoDetail.vue'
 import type { ISupplier, traceSupplierPerson } from './list_interface'
@@ -266,21 +266,12 @@
   })
 }
 
-// 提交表单
-const submitFunc = () => {
-// 再提交
-  const params = {
-    id: formInline.value.id,
-    formId: curFormId, // 表单id
-  }
-  sourceSubmit(params).then((res) => {
-    ElMessage.success('提交成功')
-    close()
-  })
-}
-
 // 点击提交
 const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formInline.value.id) {
+    ElMessage.warning('请先保存!')
+    return false
+  }
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
@@ -291,54 +282,14 @@
           type: 'warning',
         },
       ).then(() => {
-        if (!formInline.value.id) {
-          ElMessage.warning('请先保存!')
-          return false
+        const params = {
+          id: formInline.value.id,
+          formId: curFormId, // 表单id
         }
-        else {
-          const params = {
-            id: formInline.value.id,
-            formId: curFormId, // 表单id
-          }
-          sourceSubmit(params).then((res) => {
-            ElMessage.success('提交成功')
-            close()
-          })
-        }
-      //   if (from.value == 'reject') { // 驳回调用驳回编辑接口
-      //     failUpdateSourceApproval(formInline.value).then(() => {
-      //       ElMessage.success('提交成功!')
-      //     })
-      //   }
-      //   else {
-      //     // 如果id存在, 调用更新接口
-      //     if (formInline.value.id) {
-      //     // 如果表单变更过,先保存，再提交
-      //       if (isChanged.value) {
-      //         sourceDraftUpdate(formInline.value).then((res) => {
-      //           if (res.code === 200) {
-      //             submitFunc()
-      //           }
-      //           else {
-      //             ElMessage.error('保存失败，请重新保存后提交')
-      //           }
-      //         })
-      //       }
-      //       else { // 表单未变更过，直接提交
-      //         submitFunc()
-      //       }
-      //     }
-      //     else {
-      //     // id不存在，调用保存接口，再提交
-      //       sourceSave(formInline.value).then((res) => {
-      //         if (res.code === 200) {
-      //           formInline.value.id = res.data.id
-      //           formInline.value.supplierNo = res.data.supplierNo
-      //           submitFunc()
-      //         }
-      //       })
-      //     }
-      //   }
+        sourceSubmit(params).then((res) => {
+          ElMessage.success('提交成功')
+          close()
+        })
       })
     }
   })
@@ -352,13 +303,20 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
         formInline.value.minioFileName = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
+        loading.close()
       }
       else {
+        loading.close()
         ElMessage.error(res.message)
       }
     })
@@ -632,7 +590,6 @@
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
-        @row-dblclick="dblclickRow"
       >
         <el-table-column type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index 59ebc56..b7cffc7 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -80,13 +80,6 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  console.log(trainTimeRange.value)
-  console.log('----', createTimeRange.value)
-
-  listQuery.value.createEndTime = createTimeRange.value[1] as string || ''
-  listQuery.value.createStartTime = createTimeRange.value[0] as string || ''
-  listQuery.value.trainEndTime = trainTimeRange.value[1] as string || ''
-  listQuery.value.trainStartTime = trainTimeRange.value[0] as string || ''
   getapprovalList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -143,7 +136,30 @@
     }
   })
 }
-
+// 培训时间数组变更
+watch(trainTimeRange, (val) => {
+  if (val) {
+    listQuery.value.trainStartTime = `${val[0]}`
+    listQuery.value.trainEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.trainStartTime = ''
+    listQuery.value.trainEndTime = ''
+    trainTimeRange.value = ['', '']
+  }
+})
+// 创建时间变更
+watch(createTimeRange, (val) => {
+  if (val) {
+    listQuery.value.createStartTime = `${val[0]}`
+    listQuery.value.createEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.createStartTime = ''
+    listQuery.value.createEndTime = ''
+    createTimeRange.value = ['', '']
+  }
+})
 // 取消
 const handleCancel = (row: IPlanList) => {
   const params = {
diff --git a/src/views/measure/train/components/planApprovalDetail.vue b/src/views/measure/train/components/planApprovalDetail.vue
index 38fca62..f323b13 100644
--- a/src/views/measure/train/components/planApprovalDetail.vue
+++ b/src/views/measure/train/components/planApprovalDetail.vue
@@ -173,7 +173,7 @@
 
 <template>
   <app-container>
-    <detail-page title="培训管理审批">
+    <detail-page title="培训计划审批-详情">
       <template #btns>
         <el-button v-for="(item, index) in buttonArray" :key="index" :type="item.type" @click="clickBtn(item.name)">
           {{ item.name }}
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index 895e50e..a21a916 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -36,10 +36,6 @@
 
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.trainStartTime = trainTime.value[0] || ''
-  listQuery.value.trainEndTime = trainTime.value[1] || ''
-  listQuery.value.createStartTime = createTime.value[0] || ''
-  listQuery.value.createEndTime = createTime.value[0] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -72,7 +68,28 @@
 const searchList = () => {
   fetchData(true)
 }
-
+// 培训时间数组变更
+watch(trainTime, (val) => {
+  if (val) {
+    listQuery.value.trainStartTime = `${val[0]}`
+    listQuery.value.trainEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.trainStartTime = ''
+    listQuery.value.trainEndTime = ''
+  }
+})
+// 创建时间变更
+watch(createTime, (val) => {
+  if (val) {
+    listQuery.value.createStartTime = `${val[0]}`
+    listQuery.value.createEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.createStartTime = ''
+    listQuery.value.createEndTime = ''
+  }
+})
 // 重置
 const clearList = () => {
   listQuery.value = {
diff --git a/src/views/measure/train/planAdd.vue b/src/views/measure/train/planAdd.vue
index c407d35..20b2c4f 100644
--- a/src/views/measure/train/planAdd.vue
+++ b/src/views/measure/train/planAdd.vue
@@ -60,19 +60,19 @@
 const SelectionList = ref<IaddPersonListType[]>([])
 // 表单验证规则
 const rules = ref({
-  planNo: [{ required: true, message: '计划编号不能为空', trigger: ['blur', 'change'] }],
-  planName: [{ required: true, message: '培训名称不能为空', trigger: ['blur', 'change'] }],
-  trainPerson: [{ required: true, message: '培训对象不能为空', trigger: ['blur', 'change'] }],
-  trainNumber: [{ required: true, message: '培训人数不能为空', trigger: ['blur', 'change'] },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '培训人数只能为数字', trigger: ['blur', 'change'] },
+  planNo: [{ required: true, message: '计划编号必填', trigger: ['blur', 'change'] }],
+  planName: [{ required: true, message: '培训名称必填', trigger: ['blur', 'change'] }],
+  trainPerson: [{ required: true, message: '培训对象必填', trigger: ['blur', 'change'] }],
+  trainNumber: [{ required: true, message: '培训人数必填', trigger: ['blur', 'change'] },
+    { pattern: /(^[1-9]\d*$)/, message: '要求为正整数', trigger: ['blur', 'change'] },
   ],
-  trainHour: [{ required: true, message: '培训学时不能为空', trigger: ['blur', 'change'] }],
-  trainTime: [{ required: true, message: '培训时间不能为空', trigger: ['blur', 'change'] }],
-  trainAddress: [{ required: true, message: '培训地点不能为空', trigger: ['blur', 'change'] }],
-  deptId: [{ required: true, message: '主管部门不能为空', trigger: ['blur', 'change'] }],
-  effectiveCompany: [{ required: true, message: '实施单位不能为空', trigger: ['blur', 'change'] }],
-  director: [{ required: true, message: '负责人不能为空', trigger: ['blur', 'change'] }],
-  trainContent: [{ required: true, message: '培训内容不能为空', trigger: ['blur', 'change'] }],
+  trainHour: [{ required: true, message: '培训学时必填', trigger: ['blur', 'change'] }],
+  trainTime: [{ required: true, message: '培训时间必填', trigger: ['blur', 'change'] }],
+  trainAddress: [{ required: true, message: '培训地点必填', trigger: ['blur', 'change'] }],
+  deptId: [{ required: true, message: '主管部门必填', trigger: ['blur', 'change'] }],
+  effectiveCompany: [{ required: true, message: '实施单位必填', trigger: ['blur', 'change'] }],
+  director: [{ required: true, message: '负责人必填', trigger: ['blur', 'change'] }],
+  trainContent: [{ required: true, message: '培训内容必填', trigger: ['blur', 'change'] }],
 })
 
 // 从路由中获取页面类型参数
@@ -463,10 +463,10 @@
     </detail-page>
     <detail-block title="人员信息">
       <template #btns>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
+        <el-button v-if="pageType === 'detail'" type="primary" @click="addRow">
           增加行
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="info" @click="deleteList">
+        <el-button v-if="pageType === 'detail'" type="info" @click="deleteList">
           删除行
         </el-button>
       </template>
diff --git a/src/views/measure/train/trainLog.vue b/src/views/measure/train/trainLog.vue
index 13ebd99..7e4f40d 100644
--- a/src/views/measure/train/trainLog.vue
+++ b/src/views/measure/train/trainLog.vue
@@ -1,6 +1,7 @@
 <!-- 培训记录列表 -->
 <script lang="ts" setup name="TrainLog">
 import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage } from 'element-plus'
 import type { ItrainLoglistQuery } from './plan_interface'
@@ -35,10 +36,6 @@
 // 初始化路由
 const $router = useRouter()
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.trainStartTime = trainTime.value[0] || ''
-  listQuery.value.trainEndTime = trainTime.value[1] || ''
-  listQuery.value.createStartTime = createTime.value[0] || ''
-  listQuery.value.createEndTime = createTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -64,6 +61,28 @@
   { text: '创建时间', value: 'createTime', width: '180', align: 'center' },
   { text: '备注', value: 'remark', align: 'center' },
 ])
+// 培训时间数组变更
+watch(trainTime, (val) => {
+  if (val) {
+    listQuery.value.trainStartTime = `${val[0]}`
+    listQuery.value.trainEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.trainStartTime = ''
+    listQuery.value.trainEndTime = ''
+  }
+})
+// 创建时间变更
+watch(createTime, (val) => {
+  if (val) {
+    listQuery.value.createStartTime = `${val[0]}`
+    listQuery.value.createEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.createStartTime = ''
+    listQuery.value.createEndTime = ''
+  }
+})
 
 // 搜索
 const searchList = () => {
@@ -94,12 +113,12 @@
   })
   if (list.value.length > 0) {
     const params = {
-      createEndTime: '',
-      createStartTime: '',
-      logNo: '',
-      trainEndTime: '',
-      trainName: '',
-      trainStartTime: '',
+      createEndTime: listQuery.value.createEndTime,
+      createStartTime: listQuery.value.createStartTime,
+      logNo: listQuery.value.logNo,
+      trainEndTime: listQuery.value.trainEndTime,
+      trainName: listQuery.value.trainName,
+      trainStartTime: listQuery.value.trainStartTime,
       ids: checkoutList.value,
     }
     exportLogList(params).then((res) => {
@@ -219,8 +238,8 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/measure/train/tarnLog/import')" icon="icon-import" title="批量导入" type="primary" />
-        <icon-button v-if="proxy.hasPerm('/measure/train/tarnLog/mould')" icon="icon-template" title="模板下载" type="primary" />
+        <!-- <icon-button v-if="proxy.hasPerm('/measure/train/tarnLog/import')" icon="icon-import" title="批量导入" type="primary" /> -->
+        <!-- <icon-button v-if="proxy.hasPerm('/measure/train/tarnLog/mould')" icon="icon-template" title="模板下载" type="primary" /> -->
         <icon-button v-if="proxy.hasPerm('/measure/train/tarnLog/add')" icon="icon-add" title="新建" type="primary" @click="add" />
         <icon-button v-if="proxy.hasPerm('/measure/train/tarnLog/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/measure/train/tarnLog/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
diff --git a/src/views/measure/train/trainLogAdd.vue b/src/views/measure/train/trainLogAdd.vue
index 4280295..2c9e9d0 100644
--- a/src/views/measure/train/trainLogAdd.vue
+++ b/src/views/measure/train/trainLogAdd.vue
@@ -53,6 +53,7 @@
 const trainList = ref<IObject[]>([]) // 人员信息列表数据
 // 表头
 const columns = ref([
+  { text: '学员名称', value: 'name', required: true },
   { text: '单位名称', value: 'company', required: true },
   { text: '技术职称', value: 'technologyJob', required: true },
   { text: '签到时间', value: 'signTime', width: '180', required: true },
@@ -60,21 +61,21 @@
 ])
 // 校验规则
 const rules = ref({
-  logNo: [{ required: true, message: '编号不能为空', trigger: ['blur', 'change'] }],
-  preparer: [{ required: true, message: '填表人不能为空', trigger: ['blur', 'change'] }],
+  logNo: [{ required: true, message: '编号必填', trigger: ['blur', 'change'] }],
+  preparer: [{ required: true, message: '填表人必填', trigger: ['blur', 'change'] }],
   planNo: [{ required: true, message: '计划编号必选', trigger: ['blur', 'change'] }],
-  trainName: [{ required: true, message: '培训名称不能为空', trigger: ['blur', 'change'] }],
-  trainPerson: [{ required: true, message: '培训对象不能为空', trigger: ['blur', 'change'] }],
-  trainNumber: [{ required: true, message: '培训人数不能为空', trigger: ['blur', 'change'] },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '培训人数只能为数字', trigger: ['blur', 'change'] },
+  trainName: [{ required: true, message: '培训名称必填', trigger: ['blur', 'change'] }],
+  trainPerson: [{ required: true, message: '培训对象必填', trigger: ['blur', 'change'] }],
+  trainNumber: [{ required: true, message: '培训人数必填', trigger: ['blur', 'change'] },
+    { pattern: /(^[1-9]\d*$)/, message: '要求为正整数', trigger: ['blur', 'change'] },
   ],
-  trainHour: [{ required: true, message: '培训学时不能为空', trigger: ['blur', 'change'] }],
-  trainTime: [{ required: true, message: '培训时间不能为空', trigger: ['blur', 'change'] }],
-  trainAddress: [{ required: true, message: '培训地点不能为空', trigger: ['blur', 'change'] }],
-  trainEffect: [{ required: true, message: '培训效果不能为空', trigger: ['blur', 'change'] }],
-  problems: [{ required: true, message: '存在问题不能为空', trigger: ['blur', 'change'] }],
-  improveMethod: [{ required: true, message: '改进措施不能为空', trigger: ['blur', 'change'] }],
-  trainContent: [{ required: true, message: '培训内容不能为空', trigger: ['blur', 'change'] }],
+  trainHour: [{ required: true, message: '培训学时必填', trigger: ['blur', 'change'] }],
+  trainTime: [{ required: true, message: '培训时间必填', trigger: ['blur', 'change'] }],
+  trainAddress: [{ required: true, message: '培训地点必填', trigger: ['blur', 'change'] }],
+  trainEffect: [{ required: true, message: '培训效果必填', trigger: ['blur', 'change'] }],
+  problems: [{ required: true, message: '存在问题必填', trigger: ['blur', 'change'] }],
+  improveMethod: [{ required: true, message: '改进措施必填', trigger: ['blur', 'change'] }],
+  trainContent: [{ required: true, message: '培训内容必填', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 const userListRef = ref()
 const SelectionList = ref<IObject[]>([])
@@ -89,7 +90,7 @@
 // 新增行
 const addRow = () => {
   if (formInline.value.planId === '') {
-    return ElMessage.warning('还未选择计划编号')
+    return ElMessage.warning('请先选择培训名称')
   }
   const index = trainList.value.findIndex(item => !item.name)
   if (index !== -1) {
@@ -248,9 +249,9 @@
         <el-button v-if=" pageType === 'detail'" v-print="printObj" type="primary" @click="getAddList(ruleFormRef, '打印')">
           打印
         </el-button>
-        <el-button v-if=" pageType === 'detail'" type="primary" @click="pageType = 'edit'">
+        <!-- <el-button v-if=" pageType === 'detail'" type="primary" @click="pageType = 'edit'">
           编辑
-        </el-button>
+        </el-button> -->
         <el-button type="info" @click="close">
           关闭
         </el-button>
@@ -428,23 +429,23 @@
       </el-form>
     </detail-page>
     <detail-block title="人员信息">
-      <template #btns>
-        <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="addRow">
+      <!-- <template #btns>
+        <el-button v-if="pageType === 'add'" type="primary" :disabled="pageType === 'detail'" @click="addRow">
           增加行
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="info" :disabled="pageType === 'detail'" @click="deleteList">
+        <el-button v-if="pageType === 'add'" type="info" :disabled="pageType === 'detail'" @click="deleteList">
           删除行
         </el-button>
-      </template>
+      </template> -->
       <el-table
         :data="trainList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column type="selection" width="55" />
+        <!-- <el-table-column type="selection" width="55" /> -->
         <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column align="center" label="学员名称">
+        <!-- <el-table-column align="center" label="学员名称">
           <template #header>
             <span style="color: red;">*</span><span>学员名称</span>
           </template>
@@ -457,7 +458,7 @@
               </template>
             </el-input>
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column v-for="(item, index) in columns" :key="index" :width="item.width" align="center" :label="item.text" :prop="item.value">
           <template #header>
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
@@ -475,10 +476,9 @@
             <!-- <el-input v-if="item.text === '考核结果' && pageType !== 'detail'" v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" /> -->
 
             <el-select
-              v-if="item.text === '考核结果' && pageType !== 'detail'"
+              v-if="item.text === '考核结果' && pageType === 'edit'"
               v-model="scope.row.examResult"
-              :placeholder="pageType === 'detail' ? '' : '请选择考核结果'"
-              :disabled="pageType === 'detail'"
+              placeholder="请选择考核结果"
             >
               <el-option v-for="item of ['优秀', '良好', '及格', '不及格']" :key="item" :label="item" :value="item" />
             </el-select>

diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..9cf2b29 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -28,6 +28,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    DeptSelectByName: typeof import('./components/DeptSelectByName/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
diff --git a/src/views/business/board/standardReminder/list.vue b/src/views/business/board/standardReminder/list.vue
index 85efbb1..fd60743 100644
--- a/src/views/business/board/standardReminder/list.vue
+++ b/src/views/business/board/standardReminder/list.vue
@@ -94,12 +94,33 @@
 const preparation = ref<string>('')
 // 到期开始以及结束
 const validTime = ref<string>('')
+watch(preparation, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
+// 有效日期变更
+watch(validTime, (val) => {
+  if (val) {
+    listQuery.value.validStartTime = `${val[0]}`
+    listQuery.value.validEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.validStartTime = ''
+    listQuery.value.validEndTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.preparationStartDate = preparation.value[0] || ''
-  listQuery.value.preparationEndDate = preparation.value[1] || ''
-  listQuery.value.validStartTime = validTime.value[0] || ''
-  listQuery.value.validEndTime = validTime.value[1] || ''
+  // listQuery.value.preparationStartDate = preparation.value[0] || ''
+  // listQuery.value.preparationEndDate = preparation.value[1] || ''
+  // listQuery.value.validStartTime = validTime.value[0] || ''
+  // listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -223,16 +244,16 @@
   })
   if (list.value.length > 0) {
     const params = {
-      category: '', // 类别
-      id: '', // 主键id
-      managerState: '', // 管理状态
-      preparationEndDate: '', // 结束时间
-      preparationStartDate: '', // 开始时间
-      standardLaboratory: '', // 标准所在部门
-      standardName: '', // 标准名称
-      standardNo: '', // 标准编号
-      validEndTime: '', // 结束时间
-      validStartTime: '', // 开始时间
+      category: listQuery.value.category, // 类别
+      id: listQuery.value.id, // 主键id
+      managerState: listQuery.value.managerState, // 管理状态
+      preparationEndDate: listQuery.value.preparationEndDate, // 结束时间
+      preparationStartDate: listQuery.value.preparationStartDate, // 开始时间
+      standardLaboratory: listQuery.value.standardLaboratory, // 标准所在部门
+      standardName: listQuery.value.standardName, // 标准名称
+      standardNo: listQuery.value.standardNo, // 标准编号
+      validEndTime: listQuery.value.validEndTime, // 结束时间
+      validStartTime: listQuery.value.validStartTime, // 开始时间
       offset: 1, // 当前页
       limit: 20, // 每页多少条
       ids: checkoutList.value,
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 8666957..37ac73f 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -137,7 +137,7 @@
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  distributeDialogRef.value.initDialog(row.id, row.sampleId, row.orderId)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId, row.sampleStatus)
 }
 // 点击标签绑定
 const barCodeBind = ref()
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 807ea30..4e4eb46 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -37,11 +37,21 @@
   { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
   { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
 ])
-
+// 时间变更
+watch(trainTime, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 查询列表
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.startTime = trainTime.value[0] || ''
-  listQuery.value.endTime = trainTime.value[1] || ''
+  // listQuery.value.startTime = trainTime.value[0] || ''
+  // listQuery.value.endTime = trainTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2f7c1d0..bccde84 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -139,7 +139,17 @@
     id: '2', // 后端规定已收入传2
   })
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -147,8 +157,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.sampleStatus = active.value
   getInterChangeList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IinterchangeList) => {
@@ -280,7 +290,7 @@
       else if (type === 'delete') { // 无需检测
         interchangeStatusChange({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '7' }).then((res) => {
           if (res.code === 200) {
-            ElMessage.success(`已${title}`)
+            ElMessage.success('操作成功')
             fetchData(true)
           }
         })
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList.vue b/src/views/business/schedule/interchangeReceipt/receiptList.vue
index 275a053..83d93f4 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptList.vue
@@ -42,7 +42,17 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -50,8 +60,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getReceiptList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -124,13 +134,13 @@
   })
   if (list.value.length > 0) {
     const params = {
-      interchangeCode: '', // 交接单编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      reciever: '', // 接收人
-      deliverer: '', // 送样人
-      startTime: '', // 交接开始时间
-      endTime: '', // 交接结束时间
+      interchangeCode: listQuery.value.interchangeCode, // 交接单编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      reciever: listQuery.value.reciever, // 接收人
+      deliverer: listQuery.value.deliverer, // 送样人
+      startTime: listQuery.value.startTime, // 交接开始时间
+      endTime: listQuery.value.endTime, // 交接结束时间
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index cf0b532..f2fc852 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -26,8 +26,8 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   deliverer: '', // 送样人
-  isUrgent: 2, // 是否加急 2全部 1是 0否
-  status: 0, // 接收状态
+  isUrgent: '', // 是否加急 2全部 1是 0否
+  status: '', // 接收状态
   offset: 1,
   limit: 20,
 })
@@ -70,11 +70,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    isUrgentMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 2, // 是否加急全部后端定为2
-    })
+    // isUrgentMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 2, // 是否加急全部后端定为2
+    // })
   })
   // 接收状态
   getDictByCode('orderStatus').then((response) => {
@@ -85,11 +85,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    statusMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: 0,
-    })
+    // statusMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: 0,
+    // })
     console.log(statusMap.value)
   })
 }
@@ -125,8 +125,8 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     deliverer: '', // 送样人
-    isUrgent: 2, // 是否加急
-    status: 0, // 接收状态
+    isUrgent: '', // 是否加急 2全部 1是 0否
+    status: '', // 接收状态
     offset: 1,
     limit: 20,
   }
@@ -191,12 +191,12 @@
   })
   if (list.value.length > 0) {
     const params = {
-      orderCode: '', // 委托书编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      deliverer: '', // 送样人
-      isUrgent: 2, // 是否加急
-      status: 0, // 接收状态
+      orderCode: listQuery.value.orderCode, // 委托书编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      deliverer: listQuery.value.deliverer, // 送样人
+      isUrgent: listQuery.value.isUrgent, // 是否加急
+      status: listQuery.value.status, // 接收状态
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 2d92da9..14cd1ce 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -6,7 +6,7 @@
   customerName: string // 委托方名称
   deliverer: string // 送样人
   isUrgent: number | string // 是否加急
-  status: number // 接收状态
+  status: number | string// 接收状态
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 50308c7..25c5cf9 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -53,6 +53,7 @@
   handOutProperty: string // 分发性质-初次分发、退回分发
   id?: string // 实验室id
   customerId?: string // 客户id
+  certificationState?: string // 证书出具
 }
 
 // 实验室检测/我的检测列表
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index 7c17365..7159350 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -1,6 +1,6 @@
 <!-- 任务分发 -->
 <script lang="ts" setup name="TaskEdit">
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
 import ProcessConfig from './components/processConfig.vue'
@@ -11,6 +11,7 @@
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { UploadFile } from '@/api/measure/file'
 import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 interface dictType {
   id: string
@@ -251,16 +252,22 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    // UploadFile(fd).then((res) => {
-    //   if (res.code === 200) {
-    //     sampleForm.value.minioFileName = res.data[0]
-    //     // 重置当前验证
-    //     ElMessage.success('文件上传成功')
-    //   }
-    //   else {
-    //     ElMessage.error(res.message)
-    //   }
-    // })
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        sampleForm.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+        loading.close()
+      }
+      else {
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    })
   }
 }
 const upload = () => {
@@ -402,7 +409,7 @@
               <el-form-item label="校检类别:">
                 <el-select
                   v-model="sampleForm.measureCategory"
-                  :placeholder="roleType === 'detail' ? '' : '请选择校检类别'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择校检类别'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -424,7 +431,7 @@
               <el-form-item label="厂家国别:">
                 <el-select
                   v-model="sampleForm.manufacturerCountry"
-                  :placeholder="roleType === 'detail' ? '' : '请选择厂家国别'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择厂家国别'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -450,7 +457,7 @@
               <el-form-item label="ABC:">
                 <el-select
                   v-model="sampleForm.abc"
-                  :placeholder="roleType === 'detail' ? '' : '请选择ABC'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择ABC'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
@@ -504,8 +511,8 @@
               <el-form-item label="备注:">
                 <el-input
                   v-model="sampleForm.remark"
+                  autosize
                   type="textarea"
-                  :rows="2"
                   :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
                   :class="{ 'detail-input': roleType === 'detail' }"
@@ -516,7 +523,7 @@
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="sampleForm.measureType"
-                  :placeholder="roleType === 'detail' ? '' : '请选择检定方式'"
+                  :placeholder="roleType === 'detail' ? ' ' : '请选择检定方式'"
                   :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index dfbbf6a..6eeff55 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -81,7 +81,7 @@
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '165px' },
   { text: '样品属性', value: 'sampleBelongName', width: '100', align: 'center' },
   { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '90' },
-  { text: '证书出具', value: 'certificationState', align: 'center', width: '90', filter: (row: ITaskList) => { return `${row.alreadyCertifications}/${row.requireCertifications}` } },
+  { text: '证书出具', value: 'certificationState', align: 'center', width: '90' },
 ])
 // 表格数据
 const list = ref<ITaskList[]>([])
@@ -104,6 +104,7 @@
   getTaskList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: ITaskList) => {
       item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      item.certificationState = `${item.alreadyCertifications}/${item.requireCertifications}`
       return item
     })
     total.value = response.data.total
diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue
index e44dd67..194de53 100644
--- a/src/views/business/subpackage/apply/list.vue
+++ b/src/views/business/subpackage/apply/list.vue
@@ -302,7 +302,7 @@
         <search-item>
           <el-date-picker
             v-model="timeRange" type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="申请开始时间" end-placeholder="申请结束时间"
+            value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="申请开始时间" end-placeholder="申请结束时间" clearable
           />
         </search-item>
       </search-area>
diff --git a/src/views/business/subpackage/check/list.vue b/src/views/business/subpackage/check/list.vue
index 51ea419..a8b6744 100644
--- a/src/views/business/subpackage/check/list.vue
+++ b/src/views/business/subpackage/check/list.vue
@@ -111,8 +111,6 @@
 
 // 时间变更
 watch(timeRange, (val) => {
-  console.log(val[0])
-
   if (val) {
     listQuery.value.checkStartTime = `${val[0]}`
     listQuery.value.checkEndTime = `${val[1]}`
@@ -345,7 +343,8 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="timeRange" type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
+            v-model="timeRange"
+            clearable type="datetimerange" range-separator="到" format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="验收开始时间" end-placeholder="验收结束时间"
           />
         </search-item>
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 98f4a39..a0db900 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -68,6 +68,7 @@
   else {
     listQuery.value.startTime = ''
     listQuery.value.endTime = ''
+    timeRange.value = ['', '']
   }
 })
 // 多选发生改变时
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index 6e41a94..ac98b8a 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -56,7 +56,17 @@
 const checkoutList = ref<string[]>([])
 // 文件上传input
 const fileRef = ref()
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -64,8 +74,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getSampleList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index 92e4b4a..6f465fc 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -67,7 +67,17 @@
     certificationStatusMap.value[`${item.value}`] = item.name
   })
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -75,8 +85,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getSampleList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IOvertimeList) => {
       return {
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index dbaa437..14464bf 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -86,6 +86,17 @@
     width: 160,
   },
 ]) // 表格
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 const fetchData = (isNowPage = false) => {
   loadingTable.value = true
@@ -93,8 +104,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.processResult = active.value
   getApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 60d1454..d0236cc 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -105,7 +105,17 @@
     align: 'center',
   },
 ])
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 const fetchData = (isNowPage = false) => {
   loadingTable.value = true
@@ -113,8 +123,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.approvalStatus = active.value
   getApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index aeb568e..5430b0f 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -103,10 +103,21 @@
 // 装载时间数组
 const checkTime = ref<string>('')
 const loadingTable = ref(false)
+// 时间变更
+watch(checkTime, (val) => {
+  if (val) {
+    listQuery.value.checkStartDate = `${val[0]}`
+    listQuery.value.checkEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.checkStartDate = ''
+    listQuery.value.checkEndDate = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.checkStartDate = checkTime.value[0] || ''
-  listQuery.value.checkEndDate = checkTime.value[1] || ''
+  // listQuery.value.checkStartDate = checkTime.value[0] || ''
+  // listQuery.value.checkEndDate = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 6229abf..9d30934 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -112,10 +112,21 @@
 // 装载时间数组
 const checkTime = ref('')
 const loadingTable = ref(false)
+// 时间变更
+watch(checkTime, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.startTime = checkTime.value[0] || ''
-  listQuery.value.endTime = checkTime.value[1] || ''
+  // listQuery.value.startTime = checkTime.value[0] || ''
+  // listQuery.value.endTime = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index daca294..de18467 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -66,6 +66,17 @@
 const checkoutList = ref<IManageChecklist[]>([])
 // 文件上传input
 const fileRef = ref()
+// 时间变更
+watch(checkDate, (val) => {
+  if (val) {
+    listQuery.value.checkStartDate = `${val[0]}`
+    listQuery.value.checkEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.checkStartDate = ''
+    listQuery.value.checkEndDate = ''
+  }
+})
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
@@ -73,8 +84,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.checkStartDate = checkDate.value[0] || ''
-  listQuery.value.checkEndDate = checkDate.value[1] || ''
+  // listQuery.value.checkStartDate = checkDate.value[0] || ''
+  // listQuery.value.checkEndDate = checkDate.value[1] || ''
   getcheckInfoList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: any) => {
       return {
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 00d283c..50b014c 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -99,6 +99,17 @@
     approvalStatusReserveMap.value[item.name] = `${item.value}`
   })
 }
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -106,8 +117,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   listQuery.value.approvalStatus = active.value
   getReceiveApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IlistType) => {
diff --git a/src/views/device/receive/solve/solveList.vue b/src/views/device/receive/solve/solveList.vue
index 809c0c1..ec1e8bb 100644
--- a/src/views/device/receive/solve/solveList.vue
+++ b/src/views/device/receive/solve/solveList.vue
@@ -120,7 +120,17 @@
   timeRange.value = ['', ''] // 把时间选择框置空
   fetchData(true)
 }
-
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -128,8 +138,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.startTime = timeRange.value[0] as string || ''
-  listQuery.value.endTime = timeRange.value[1] as string || ''
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getReceiveApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IsolveListType) => {
       return {
diff --git a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
index 4744536..b4fe085 100644
--- a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
@@ -43,7 +43,12 @@
   select.value = -1
   listPageApi(listQuery.value).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows
+      list.value = res.data.rows.map((item: { effectiveStatusName: string }) => {
+        return {
+          ...item,
+          isDisabled: item.effectiveStatusName === '已废止',
+        }
+      })
       total.value = res.data.total
     }
   })
@@ -142,7 +147,7 @@
           </el-table-column>
           <el-table-column label="" width="55" align="center" fixed="left">
             <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
+              <el-radio v-model="select" :disabled="scope.row.isDisabled" :label="scope.$index" class="radio" />
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index a030dcf..0dd5547 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -94,12 +94,34 @@
 const preparation = ref<string>('')
 // 到期开始以及结束
 const validTime = ref<string>('')
+// 筹建日期变更
+watch(preparation, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
+// 有效日期变更
+watch(validTime, (val) => {
+  if (val) {
+    listQuery.value.validStartTime = `${val[0]}`
+    listQuery.value.validEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.validStartTime = ''
+    listQuery.value.validEndTime = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.preparationStartDate = preparation.value[0] || ''
-  listQuery.value.preparationEndDate = preparation.value[1] || ''
-  listQuery.value.validStartTime = validTime.value[0] || ''
-  listQuery.value.validEndTime = validTime.value[1] || ''
+  // listQuery.value.preparationStartDate = preparation.value[0] || ''
+  // listQuery.value.preparationEndDate = preparation.value[1] || ''
+  // listQuery.value.validStartTime = validTime.value[0] || ''
+  // listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index 39d8683..bb69fe9 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -99,6 +99,17 @@
 const standardManagerStateList = ref<IOptions[]>([])
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
+// 时间变更
+watch(preparationDate, (val) => {
+  if (val) {
+    listQuery.value.preparationStartDate = `${val[0]}`
+    listQuery.value.preparationEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.preparationStartDate = ''
+    listQuery.value.preparationEndDate = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
@@ -107,8 +118,8 @@
     listQuery.value.offset = 1
   }
   // 筹建日期
-  listQuery.value.preparationStartDate = preparationDate.value[0] || ''
-  listQuery.value.preparationEndDate = preparationDate.value[1] || ''
+  // listQuery.value.preparationStartDate = preparationDate.value[0] || ''
+  // listQuery.value.preparationEndDate = preparationDate.value[1] || ''
   getStandardList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: any) => {
       return {
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 37205fc..edf9dd7 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -793,7 +793,7 @@
             保存
           </el-button>
           <!-- 待审批 -->
-          <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'agree' })">
+          <!-- <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'agree' })">
             同意
           </el-button>
           <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'reject' })">
@@ -801,7 +801,7 @@
           </el-button>
           <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'refuse' })">
             拒绝
-          </el-button>
+          </el-button> -->
           <!-- </template> -->
         </template>
         <el-button v-if="(title === '详情' && $route.query?.approvalStatusName === '草稿箱' && isCancel)" type="primary" @click="editForm">
diff --git a/src/views/finance/businessSettlement/list.vue b/src/views/finance/businessSettlement/list.vue
index e942abb..9543947 100644
--- a/src/views/finance/businessSettlement/list.vue
+++ b/src/views/finance/businessSettlement/list.vue
@@ -43,6 +43,7 @@
 const list = ref<IList[]>([]) // 表格数据
 // 选中的内容
 const checkoutList = ref<string[]>([])
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
diff --git a/src/views/finance/contract/list.vue b/src/views/finance/contract/list.vue
index 7dcdca5..5f8eb4e 100644
--- a/src/views/finance/contract/list.vue
+++ b/src/views/finance/contract/list.vue
@@ -59,6 +59,17 @@
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 选中的内容
 const checkoutList = ref<string[]>([])
+// 时间变更
+watch(dateRange, (val) => {
+  if (val) {
+    listQuery.value.estimateSignStartDate = `${val[0]}`
+    listQuery.value.estimateSignEndDate = `${val[1]}`
+  }
+  else {
+    listQuery.value.estimateSignStartDate = ''
+    listQuery.value.estimateSignEndDate = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -66,8 +77,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.estimateSignStartDate = dateRange.value[0] as string || ''
-  listQuery.value.estimateSignEndDate = dateRange.value[1] as string || ''
+  // listQuery.value.estimateSignStartDate = dateRange.value[0] as string || ''
+  // listQuery.value.estimateSignEndDate = dateRange.value[1] as string || ''
   getContractList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: { estimateSignDate: string; agreementAmount: number }) => {
       return {
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 1bce5f9..07b2296 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,7 +1,7 @@
-<!-- 新增或详情弹窗 -->
+<!-- 新增或详情 -->
 <script lang="ts" setup name="addNotice">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
@@ -15,6 +15,7 @@
 import { SCHEDULE } from '@/utils/scheduleDict'
 const $route = useRoute()
 const $router = useRouter()
+const submitId = ref('') // 提交id-保存接口获取
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
 const fileTypeName = ref('')
@@ -40,12 +41,12 @@
   formId: SCHEDULE.FILE_APPROVAL,
 }) // 表单
 const rules = ref<FormRules>({
-  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
-  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
-  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
-  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
-  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+  fileName: [{ required: true, message: '名称必填', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建必填', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位必填', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间必填', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人必填', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号必填', trigger: 'blur' }],
 }) // 表单验证规则
 
 const userList = ref<userType[]>([]) // 可使用人列表
@@ -57,12 +58,14 @@
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
-const PubList = ref<deptType[]>([])
+const PubList = ref([]) as any// 发布单位列表
 const PubListTree = ref([])
 // 获取发布单位列表
 const getPubList = () => {
   getDeptTreeList().then((res) => {
     PubList.value = res.data
+    console.log('0000', 'ppp', PubList.value)
+
     PubListTree.value = toTreeList(res.data, '0', true)
   })
 }
@@ -113,43 +116,57 @@
   effectiveStatusName.value = ''
 }
 // 提交
-const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+const saveForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
-    `确认${flag}吗？`,
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then((res) => {
+        const publisherId = ruleForm.publisher
+        const index = PubList.value.findIndex((item: { id: string }) => item.id === publisherId)
+        if (index !== -1) {
+          ruleForm.publisher = PubList.value[index].name as string
+        }
+        // 保存（草稿箱）
+        confirmDrafts(ruleForm).then((res) => {
+          ruleForm.fileNo = res.data.fileNo
+          submitId.value = res.data.id
+          ElMessage.success('保存成功')
+          // formEl?.resetFields()
+          // $router.go(-1)
+          close()
+        })
+      })
+    }
+  })
+}
+const submitForm = () => {
+  if (!submitId.value) {
+    ElMessage.warning('请先保存')
+    return false
+  }
+  ElMessageBox.confirm(
+    '确认提交吗？',
     '提示',
     {
       confirmButtonText: '确认',
       cancelButtonText: '取消',
       type: 'warning',
     },
-      ).then((res) => {
-        if (flag === '提交') {
-          confirmDrafts(ruleForm).then((res) => {
-            if (res.code === 200) {
-              console.log(res.data, '保存成功')
-              submitFile({ id: res.data.id, formId: SCHEDULE.FILE_APPROVAL }).then((res) => {
-                formEl?.resetFields()
-                ElMessage.success('提交成功')
-                $router.go(-1)
-                close()
-              })
-            }
-          })
-        }
-        else {
-          // 保存（草稿箱）
-          confirmDrafts(ruleForm).then((res) => {
-            ElMessage.success('保存成功')
-            formEl?.resetFields()
-            $router.go(-1)
-            close()
-          })
-        }
-      })
-    }
+  ).then((res) => {
+    submitFile({ id: submitId.value, formId: SCHEDULE.FILE_APPROVAL }).then((res) => {
+    // formEl?.resetFields()
+      ElMessage.success('已提交')
+      $router.go(-1)
+      close()
+    })
   })
 }
 // 取消
@@ -163,9 +180,14 @@
 const onFileChange = (event: any) => {
   // 原生上传
   // console.log(event.target.files)
+
   if (event.target.files?.length !== 0) {
     // 创建formdata对象
     const fd = new FormData()
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
@@ -173,9 +195,11 @@
         // 重置当前验证
         ruleFormRef.value?.clearValidate('minioFileName')
         ElMessage.success('文件上传成功')
+        loading.close()
       }
       else {
         ElMessage.error(res.message)
+        loading.close()
       }
     })
   }
@@ -215,10 +239,10 @@
   <app-container style="overflow: hidden;">
     <detail-page :title="`${fileTypeName}-${title}`">
       <template #btns>
-        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm()">
           提交
         </el-button>
-        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
+        <el-button v-if="title !== '详情'" type="primary" @click="saveForm(ruleFormRef)">
           保存
         </el-button>
         <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -258,7 +282,7 @@
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
                 style="width: 100%;"
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 135d059..c2b46c0 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -1,6 +1,7 @@
 <!-- 文件审批公共模板 -->
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { DateModelType } from 'element-plus'
 import type { TableRow } from './approve-interface'
 import type { fileResType } from '@/views/measure/file/file-interface'
 import { printJSON } from '@/utils/printUtils'
@@ -32,12 +33,13 @@
 const approvalStatusReserveMap = ref({ ...props.approvalStatusReserveMap }) // 审批状态字典{草稿箱: 1}
 const activeTitle = ref('') // active对应的审批状态名字
 
-const searchQuery = reactive({
+const searchQuery = ref({
   fileNo: '', // 编号
   fileName: '', // 名称
   fileCode: '', // 文件号
   createUser: '', // 创建人
-  createTime: '', // 创建
+  createStartTime: '', // 创建开始时间
+  createEndTime: '', // 创建结束时间
   approvalStatus: approvalStatus.value, // 审批状态
   limit: 20,
   offset: 1,
@@ -49,18 +51,31 @@
 const total = ref<number>(0) // 数据总条数
 const columns = ref<TableColumn[]>([
   { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
+  { text: '编号', value: 'fileNo', align: 'center', width: '160' },
   { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
+  { text: '类别', value: 'fileTypeName', align: 'center' },
   { text: '创建人', value: 'createUser', align: 'center' },
-  { text: '创建时间', value: 'createTime', align: 'center' },
-  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110' },
 ]) // 表格
 const list = ref<TableRow[]>([]) // 表格数据
+// 筛选时间段数据
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    searchQuery.value.createStartTime = `${val[0]}`
+    searchQuery.value.createEndTime = `${val[1]}`
+  }
+  else {
+    searchQuery.value.createStartTime = ''
+    searchQuery.value.createEndTime = ''
+  }
+})
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
-  approvallistPageApi(searchQuery).then((res) => {
+  approvallistPageApi(searchQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows.map((item: TableRow) => {
         return {
@@ -85,10 +100,10 @@
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
-    searchQuery.limit = val.size
+    searchQuery.value.limit = val.size
   }
   if (val && val.page) {
-    searchQuery.offset = val.page
+    searchQuery.value.offset = val.page
   }
   getList()
 }
@@ -216,12 +231,21 @@
 }
 // 重置
 const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.fileType = ''
-  searchQuery.createTime = ''
-  searchQuery.createUser = ''
+  searchQuery.value = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    fileCode: '', // 文件号
+    createUser: '', // 创建人
+    createStartTime: '', // 创建开始时间
+    createEndTime: '', // 创建结束时间
+    approvalStatus: approvalStatus.value, // 审批状态
+    limit: 20,
+    offset: 1,
+    fileType: '', // 文件类别
+    formId: SCHEDULE.FILE_APPROVAL,
+    ids: [] as string[],
+  }
+  timeRange.value = ['', '']
   getList()
 }
 // 表格被选中的行
@@ -230,27 +254,6 @@
 const multiSelect = (row: TableRow[]) => {
   selectList.value = row
 }
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  searchQuery.ids = []
-  if (selectList.value.length) {
-    selectList.value.forEach((item) => {
-      searchQuery.ids?.push(item.id as string)
-    })
-  }
-  exportFileApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
-    exportFile(res.data, props.name)
-    loading.close()
-    searchQuery.ids = []
-  }).catch((_) => {
-    loading.close()
-  })
-}
 // 打印
 function printList() {
   const selectIds = selectList.value.map(item => item.id)
@@ -278,8 +281,8 @@
   sessionStorage.setItem('approveFileMenu', props.name)
   approvalStatus.value = approvalStatusReserveMap.value[props.name]
   // approvalStatus.value = approvalStatusReserveMap.value[props.name] // 失效
-  searchQuery.approvalStatus = approvalStatusReserveMap.value[props.name] || '0'
-  $router.currentRoute.value.query.cacheActive = searchQuery.approvalStatus
+  searchQuery.value.approvalStatus = approvalStatusReserveMap.value[props.name] || '0'
+  $router.currentRoute.value.query.cacheActive = searchQuery.value.approvalStatus
   getList()
   // 缓存名称
 }, { deep: true, immediate: true })
@@ -312,8 +315,14 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss" placeholder="创建时间"
+            v-model="timeRange"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="创建开始时间"
+            end-placeholder="创建结束时间"
+            clearable
+            style="width: 360px;"
           />
         </search-item>
         <search-item>
@@ -323,10 +332,6 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <icon-button
-            v-if="proxy.hasPerm('/file/approve/export')" icon="icon-export" title="导出"
-            @click="exportExcelBtn"
-          />
           <icon-button v-if="proxy.hasPerm('/file/approve/print')" icon="icon-print" title="打印" @click="printList" />
         </template>
         <!-- 表格区域 -->
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 9dd3633..de9e080 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -85,7 +85,7 @@
 const getStatus = () => {
   getDictByCode('effectiveStatus').then((res) => {
     if (res.code === 200) {
-      effectiveStatusSelect.value = [...res.data, { name: '全部', value: '', id: 'quanbu' }]
+      effectiveStatusSelect.value = res.data
     }
   })
 }
@@ -373,8 +373,8 @@
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/add`)" icon="icon-add" title="新建" @click="add" />
-          <icon-button v-if="proxy.hasPerm(`/file/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
-          <icon-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <!-- <icon-button v-if="proxy.hasPerm(`/file/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" /> -->
+          <!-- <icon-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" /> -->
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/print`)" icon="icon-print" title="打印" @click="printList" />
         </template>
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 3510056..ed3ab8c 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -282,8 +282,8 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/measure/price/import')" icon="icon-import" title="批量导入" type="primary" />
-        <icon-button v-if="proxy.hasPerm('/measure/price/mould')" icon="icon-template" title="模板下载" type="primary" />
+        <!-- <icon-button v-if="proxy.hasPerm('/measure/price/import')" icon="icon-import" title="批量导入" type="primary" /> -->
+        <!-- <icon-button v-if="proxy.hasPerm('/measure/price/mould')" icon="icon-template" title="模板下载" type="primary" /> -->
         <icon-button v-if="proxy.hasPerm('/measure/price/add')" icon="icon-add" title="新建" type="primary" @click="add" />
         <icon-button v-if="proxy.hasPerm('/measure/price/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/measure/price/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 60eeebb..7b6f4ec 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -61,7 +61,8 @@
   categoryName: [{ required: true, message: '类别不能为空', trigger: ['blur', 'change'] }],
   itemName: [{ required: true, message: '项目不能为空', trigger: ['blur', 'change'] }],
   priceStandardName: [{ required: true, message: '依据标准不能为空', trigger: ['blur', 'change'] }],
-  price: [{ required: true, message: '标准价格不能为空', trigger: ['blur', 'change'] }],
+  price: [{ required: true, message: '标准价格不能为空', trigger: ['blur', 'change'] },
+    { pattern: /^(?!0+(?:\.0+)?$)(?:[1-9]\d*|0)(?:\.\d{1,2})?$/, message: '要求不小于0，且最多保留两位小数', trigger: ['blur', 'change'] }],
   operatorDiscountPermission: [{ required: true, message: '业务员折扣权限不能为空', trigger: ['blur', 'change'] }],
   directorDiscountPermission: [{ required: true, message: '负责人折扣权限不能为空', trigger: ['blur', 'change'] }],
 })
@@ -255,7 +256,7 @@
                   v-model.trim="formInline.priceStandardName"
                   clearable
                   :placeholder="pageType === 'detail' ? '' : '依据标准'"
-                  :disabled="pageType === 'detail'"
+                  disabled
                 >
                   <template v-if="pageType !== 'detail'" #append>
                     <el-button
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 5e62137..22d1d8a 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -24,16 +24,16 @@
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    // { name: '删除', type: 'danger' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    // { name: '删除', type: 'danger' },
     { name: '取消', type: 'info' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    // { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
+    { name: '删除', type: 'danger' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
@@ -41,9 +41,10 @@
   ],
   已取消: [
     { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
     { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
-
 }
 // 当前tab
 const currentTab = ref('全部')
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index d2fad4c..004b856 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -28,10 +28,6 @@
 const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  // 审批中状态时候长度返回错误
-  if (props.status === '3' || props.status === '6') {
-    props.buttons.length = 4 // 传递长度 + 判断条件下显示按钮长度
-  }
   return props.buttons.length * 40 + 23
 })
 
@@ -63,13 +59,13 @@
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '溯源供方编号', value: 'supplierNo', width: '160', align: 'center' },
-  { text: '溯源供方名称', value: 'supplierName', width: '120', align: 'center' },
+  { text: '溯源供方名称', value: 'supplierName', align: 'center' },
   { text: '业务内容', value: 'businessContent', align: 'center' },
   { text: '业务范围', value: 'businessScope', align: 'center' },
   { text: '负责人', value: 'director', align: 'center' },
   { text: '联系方式', value: 'phone', align: 'center' },
   { text: '地址', value: 'address', align: 'center' },
-  { text: '创建时间', value: 'name', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
   { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110px' },
 ])
 // 初始化路由
@@ -86,15 +82,20 @@
     listQuery.value.offset = 1
   }
   getapprovalListPage(listQuery.value).then((response) => {
-    list.value = response.data.rows
-    if (!companyAddress.value) {
-      companyAddress.value = [response.data.rows[0].companyCountry, response.data.rows[0].companyProvince, response.data.rows[0].companyCity, response.data.rows[0].companyArea, response.data.rows[0].companyAddress]
-    }
-    else if (isReset) {
-      companyAddress.value = [response.data.rows[0].companyCountry, response.data.rows[0].companyProvince, response.data.rows[0].companyCity, response.data.rows[0].companyArea, response.data.rows[0].companyAddress]
+    list.value = response.data.rows.map((item: { companyProvinceName: string; companyCityName: string }) => {
+      return {
+        ...item,
+        address: item.companyProvinceName === item.companyCityName ? item.companyCityName : item.companyProvinceName + item.companyCityName,
+      }
+    })
+    // if (!companyAddress.value) {
+    //   companyAddress.value = [response.data.rows[0].companyCountry, response.data.rows[0].companyProvince, response.data.rows[0].companyCity, response.data.rows[0].companyArea, response.data.rows[0].companyAddress]
+    // }
+    if (isReset) {
+      companyAddress.value = ['', '', '', '', '']
+      // companyAddress.value = [response.data.rows[0].companyCountry, response.data.rows[0].companyProvince, response.data.rows[0].companyCity, response.data.rows[0].companyArea, response.data.rows[0].companyAddress]
     }
     total.value = parseInt(response.data.total)
-    console.log(companyAddress.value)
     loadingTable.value = false
   }).catch((_) => {
     loadingTable.value = false
@@ -107,6 +108,7 @@
 }
 // 公司地址变化后给对象赋值
 function companyAddressChange(addressObj: IAddress) {
+  console.log('公司地址变化后给对象赋值')
   listQuery.value.companyCountry = addressObj.country
   listQuery.value.companyProvince = addressObj.province
   listQuery.value.companyCity = addressObj.city
@@ -191,30 +193,6 @@
   }
   fetchData(true, true)
 }
-// 导出
-const exportExcelBtn = () => {
-  const params: supplierExportQuery = {
-    approvalStatus: listQuery.value.approvalStatus,
-    businessContent: listQuery.value.businessContent,
-    companyArea: listQuery.value.companyArea,
-    companyCity: listQuery.value.companyCity,
-    companyProvince: listQuery.value.companyProvince,
-    formId: listQuery.value.formId,
-    supplierName: listQuery.value.supplierName,
-    supplierNo: listQuery.value.supplierNo,
-  }
-  if (checkoutList.value.length > 0) {
-    params.ids = checkoutList.value
-  }
-  // TODO: 审批列表导出
-  console.log(params)
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  loading.close()
-}
 
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -237,10 +215,7 @@
 const add = () => {
   $router.push('/source/add')
 }
-// 批量导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 审批结束回调
 const approvalSuccess = () => {
   fetchData(true)
@@ -259,7 +234,7 @@
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    sourceSubmit({ id: row.id, formId: SCHEDULE.SUPPLIER_APPROVAL }).then((res) => {
+    sourceSubmit({ id: row.id, formId: SCHEDULE.SUPPLIER_APPROVAL, processId: row.processId }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
@@ -311,7 +286,7 @@
   (newVal: string) => {
     console.log('change status', newVal)
     listQuery.value.approvalStatus = newVal
-    fetchData(false)
+    clearList()
   },
   { immediate: true })
 
@@ -429,7 +404,7 @@
                   编辑
                 </el-button>
                 <el-button
-                  v-if="row.approvalStatusName === '草稿箱' "
+                  v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                   size="small"
                   link
                   type="primary"
@@ -448,20 +423,8 @@
                 >
                   取消
                 </el-button>
-                <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-                <!-- <el-button
-                  v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
-                  size="small"
-                  link
-                  type="danger"
-                  :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-                  @click="clickBtn(row, '删除')"
-                >
-                  删除
-                </el-button> -->
-                <!-- ------------------------------------审批中的删除暂时去掉-------------------------------- -->
                 <el-button
-                  v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+                  v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/measure/source/components/sourceApprovalDetail.vue b/src/views/measure/source/components/sourceApprovalDetail.vue
index c507032..35683e7 100644
--- a/src/views/measure/source/components/sourceApprovalDetail.vue
+++ b/src/views/measure/source/components/sourceApprovalDetail.vue
@@ -8,12 +8,15 @@
 import { getSoucreListDetail } from '@/api/measure/source'
 import { cancelApproval, fetchApproval } from '@/api/approval'
 import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
-
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import type { IAddress } from '@/components/AddressSelect/address-interface'
+const approvalDialog = ref() // 审批对话ref
 const approvalRecord = ref() // 审批流程组件ref
 const infoId = ref('') // id
+const taskId = ref('') // 任务id 用于审批
+const processId = ref('') // 流程实例id
 const approvalType = ref('')
 const approvalStatusName = ref('') // 审批状态、控制草稿箱没有审批流程
-
 // 从路由中获取页面类型参数
 const $route = useRoute()
 if ($route.params && $route.params.type) {
@@ -70,8 +73,9 @@
   approvalStatus: '', // 审批状态
   approvalStatusName: '', // 审批状态名称
 })
-
-const traceSupplierPersonList: Ref<traceSupplierPerson[]> = ref([])
+const companyAddress = ref<string[]>([]) // 公司地址
+const invoiceAddress = ref<string[]>([]) // 开票地址
+const traceSupplierPersonList: Ref<traceSupplierPerson[]> = ref([]) // 人员列表
 const columns = [
   { text: '人员编号', value: 'personNo' },
   { text: '姓名', value: 'name' },
@@ -83,9 +87,15 @@
 const getInfo = () => {
   getSoucreListDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data
+    traceSupplierPersonList.value = res.data.traceSupplierPersonList
+    // for (const key in dataForm.value) {
+    //   dataForm.value[key] = res.data[key]
+    // }
+    companyAddress.value = [dataForm.value.companyCountryName, dataForm.value.companyProvinceName, dataForm.value.companyCityName, dataForm.value.companyAreaName, dataForm.value.companyAddress]
+    invoiceAddress.value = [dataForm.value.invoiceCountryName, dataForm.value.invoiceProvinceName, dataForm.value.invoiceCityName, dataForm.value.invoiceAreaName, dataForm.value.invoiceAddress]
   })
 }
-getInfo()
+
 // 初始化router
 const $router = useRouter()
 // 关闭新增页面的回调
@@ -106,12 +116,12 @@
 }
 // 审批结束回调
 const approvalSuccess = () => {
-  getInfo()
+  close() // 返回上一页
 }
 // 取消
 const handleCancel = () => {
   const params = {
-    processInstanceId: dataForm.value.processId!,
+    processInstanceId: processId.value!,
     comments: '取消审批',
   }
   ElMessageBox.confirm(
@@ -125,21 +135,21 @@
   ).then(() => {
     cancelApproval(params).then(() => {
       ElMessage.success('取消成功')
+      close()
     })
   })
 }
-const approvalDialog = ref()
 // 点击数据后的操作按钮
 const clickBtn = (buttonType: string) => {
   switch (buttonType) {
     case '同意':
-      approvalDialog.value.initDialog('agree', dataForm.value.taskId)
+      approvalDialog.value.initDialog('agree', taskId.value)
       break
     case '驳回':
-      approvalDialog.value.initDialog('reject', dataForm.value.taskId)
+      approvalDialog.value.initDialog('reject', taskId.value)
       break
     case '拒绝':
-      approvalDialog.value.initDialog('refuse', dataForm.value.taskId)
+      approvalDialog.value.initDialog('refuse', taskId.value)
       break
     case '取消':
       handleCancel()
@@ -148,10 +158,14 @@
 }
 onMounted(() => {
   dataForm.value.processId = $route.query.processId as string// 流程实例id
+  processId.value = $route.query.processId as string// 流程实例id
   approvalStatusName.value = $route.query.approvalStatusName as string
+  taskId.value = $route.query.taskId as string
+
   if (approvalStatusName.value !== '草稿箱') {
-    getApprovalRecord(dataForm.value.processId) // 查询审批记录
+    getApprovalRecord(processId.value) // 查询审批记录
   }
+  getInfo() // 获取详情
 })
 </script>
 
@@ -162,13 +176,13 @@
         <el-button v-if="approvalType === '2'" type="primary" @click="clickBtn('同意')">
           同意
         </el-button>
-        <el-button v-if="approvalType === '2'" type="primary" @click="clickBtn('拒绝')">
-          拒绝
-        </el-button>
         <el-button v-if="approvalType === '2'" type="primary" @click="clickBtn('驳回')">
           驳回
         </el-button>
-        <el-button v-if="approvalType === '3'" type="primary" @click="handleCancel()">
+        <el-button v-if="approvalType === '2'" type="danger" @click="clickBtn('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="approvalType === '3'" type="info" @click="handleCancel()">
           取消
         </el-button>
         <el-button type="info" @click="close">
@@ -201,6 +215,7 @@
       <!-- 审批流程 -->
       <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
     </detail-block>
+    <!-- 审批弹窗 -->
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index e352e61..cda7d0c 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -89,7 +89,7 @@
   getSoucreList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: ISupplier) => {
       if (item.companyProvinceName && item.companyCityName) {
-        item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
+        item.briefName = `${item.companyProvinceName}${item.companyCityName}`
       }
       else {
         item.briefName = item.companyProvinceName || item.companyCityName
@@ -184,9 +184,10 @@
   })
   if (list.value.length > 0) {
     const params = {
-      supplierNo: '', // 业务内容
-      supplierName: '', // 溯源供方名称
-      businessContent: '', // 溯源供方编号
+      supplierNo: listQuery.value.supplierNo, // 业务内容
+      supplierName: listQuery.value.supplierName, // 溯源供方名称
+      businessContent: listQuery.value.businessContent, // 溯源供方编号
+      formId: SCHEDULE.SUPPLIER_APPROVAL,
       ids: checkoutList.value,
     }
     exportSourceList(params).then((res) => {
@@ -256,8 +257,8 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
-        <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" />
+        <!-- <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" /> -->
+        <!-- <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" /> -->
         <icon-button v-if="proxy.hasPerm('/measure/measureSource/add')" icon="icon-add" title="新建" type="primary" @click="add" />
         <icon-button v-if="proxy.hasPerm('/measure/measureSource/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/measure/measureSource/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index 939c80a..b107e3e 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -3,7 +3,7 @@
  * 添加/编辑/详情溯源供方
  */
 import type { Ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import baseInfoDetail from './components/baseInfoDetail.vue'
 import type { ISupplier, traceSupplierPerson } from './list_interface'
@@ -266,21 +266,12 @@
   })
 }
 
-// 提交表单
-const submitFunc = () => {
-// 再提交
-  const params = {
-    id: formInline.value.id,
-    formId: curFormId, // 表单id
-  }
-  sourceSubmit(params).then((res) => {
-    ElMessage.success('提交成功')
-    close()
-  })
-}
-
 // 点击提交
 const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formInline.value.id) {
+    ElMessage.warning('请先保存!')
+    return false
+  }
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
@@ -291,54 +282,14 @@
           type: 'warning',
         },
       ).then(() => {
-        if (!formInline.value.id) {
-          ElMessage.warning('请先保存!')
-          return false
+        const params = {
+          id: formInline.value.id,
+          formId: curFormId, // 表单id
         }
-        else {
-          const params = {
-            id: formInline.value.id,
-            formId: curFormId, // 表单id
-          }
-          sourceSubmit(params).then((res) => {
-            ElMessage.success('提交成功')
-            close()
-          })
-        }
-      //   if (from.value == 'reject') { // 驳回调用驳回编辑接口
-      //     failUpdateSourceApproval(formInline.value).then(() => {
-      //       ElMessage.success('提交成功!')
-      //     })
-      //   }
-      //   else {
-      //     // 如果id存在, 调用更新接口
-      //     if (formInline.value.id) {
-      //     // 如果表单变更过,先保存，再提交
-      //       if (isChanged.value) {
-      //         sourceDraftUpdate(formInline.value).then((res) => {
-      //           if (res.code === 200) {
-      //             submitFunc()
-      //           }
-      //           else {
-      //             ElMessage.error('保存失败，请重新保存后提交')
-      //           }
-      //         })
-      //       }
-      //       else { // 表单未变更过，直接提交
-      //         submitFunc()
-      //       }
-      //     }
-      //     else {
-      //     // id不存在，调用保存接口，再提交
-      //       sourceSave(formInline.value).then((res) => {
-      //         if (res.code === 200) {
-      //           formInline.value.id = res.data.id
-      //           formInline.value.supplierNo = res.data.supplierNo
-      //           submitFunc()
-      //         }
-      //       })
-      //     }
-      //   }
+        sourceSubmit(params).then((res) => {
+          ElMessage.success('提交成功')
+          close()
+        })
       })
     }
   })
@@ -352,13 +303,20 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
         formInline.value.minioFileName = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
+        loading.close()
       }
       else {
+        loading.close()
         ElMessage.error(res.message)
       }
     })
@@ -632,7 +590,6 @@
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
-        @row-dblclick="dblclickRow"
       >
         <el-table-column type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index 59ebc56..b7cffc7 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -80,13 +80,6 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  console.log(trainTimeRange.value)
-  console.log('----', createTimeRange.value)
-
-  listQuery.value.createEndTime = createTimeRange.value[1] as string || ''
-  listQuery.value.createStartTime = createTimeRange.value[0] as string || ''
-  listQuery.value.trainEndTime = trainTimeRange.value[1] as string || ''
-  listQuery.value.trainStartTime = trainTimeRange.value[0] as string || ''
   getapprovalList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -143,7 +136,30 @@
     }
   })
 }
-
+// 培训时间数组变更
+watch(trainTimeRange, (val) => {
+  if (val) {
+    listQuery.value.trainStartTime = `${val[0]}`
+    listQuery.value.trainEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.trainStartTime = ''
+    listQuery.value.trainEndTime = ''
+    trainTimeRange.value = ['', '']
+  }
+})
+// 创建时间变更
+watch(createTimeRange, (val) => {
+  if (val) {
+    listQuery.value.createStartTime = `${val[0]}`
+    listQuery.value.createEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.createStartTime = ''
+    listQuery.value.createEndTime = ''
+    createTimeRange.value = ['', '']
+  }
+})
 // 取消
 const handleCancel = (row: IPlanList) => {
   const params = {
diff --git a/src/views/measure/train/components/planApprovalDetail.vue b/src/views/measure/train/components/planApprovalDetail.vue
index 38fca62..f323b13 100644
--- a/src/views/measure/train/components/planApprovalDetail.vue
+++ b/src/views/measure/train/components/planApprovalDetail.vue
@@ -173,7 +173,7 @@
 
 <template>
   <app-container>
-    <detail-page title="培训管理审批">
+    <detail-page title="培训计划审批-详情">
       <template #btns>
         <el-button v-for="(item, index) in buttonArray" :key="index" :type="item.type" @click="clickBtn(item.name)">
           {{ item.name }}
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index 895e50e..a21a916 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -36,10 +36,6 @@
 
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.trainStartTime = trainTime.value[0] || ''
-  listQuery.value.trainEndTime = trainTime.value[1] || ''
-  listQuery.value.createStartTime = createTime.value[0] || ''
-  listQuery.value.createEndTime = createTime.value[0] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -72,7 +68,28 @@
 const searchList = () => {
   fetchData(true)
 }
-
+// 培训时间数组变更
+watch(trainTime, (val) => {
+  if (val) {
+    listQuery.value.trainStartTime = `${val[0]}`
+    listQuery.value.trainEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.trainStartTime = ''
+    listQuery.value.trainEndTime = ''
+  }
+})
+// 创建时间变更
+watch(createTime, (val) => {
+  if (val) {
+    listQuery.value.createStartTime = `${val[0]}`
+    listQuery.value.createEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.createStartTime = ''
+    listQuery.value.createEndTime = ''
+  }
+})
 // 重置
 const clearList = () => {
   listQuery.value = {
diff --git a/src/views/measure/train/planAdd.vue b/src/views/measure/train/planAdd.vue
index c407d35..20b2c4f 100644
--- a/src/views/measure/train/planAdd.vue
+++ b/src/views/measure/train/planAdd.vue
@@ -60,19 +60,19 @@
 const SelectionList = ref<IaddPersonListType[]>([])
 // 表单验证规则
 const rules = ref({
-  planNo: [{ required: true, message: '计划编号不能为空', trigger: ['blur', 'change'] }],
-  planName: [{ required: true, message: '培训名称不能为空', trigger: ['blur', 'change'] }],
-  trainPerson: [{ required: true, message: '培训对象不能为空', trigger: ['blur', 'change'] }],
-  trainNumber: [{ required: true, message: '培训人数不能为空', trigger: ['blur', 'change'] },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '培训人数只能为数字', trigger: ['blur', 'change'] },
+  planNo: [{ required: true, message: '计划编号必填', trigger: ['blur', 'change'] }],
+  planName: [{ required: true, message: '培训名称必填', trigger: ['blur', 'change'] }],
+  trainPerson: [{ required: true, message: '培训对象必填', trigger: ['blur', 'change'] }],
+  trainNumber: [{ required: true, message: '培训人数必填', trigger: ['blur', 'change'] },
+    { pattern: /(^[1-9]\d*$)/, message: '要求为正整数', trigger: ['blur', 'change'] },
   ],
-  trainHour: [{ required: true, message: '培训学时不能为空', trigger: ['blur', 'change'] }],
-  trainTime: [{ required: true, message: '培训时间不能为空', trigger: ['blur', 'change'] }],
-  trainAddress: [{ required: true, message: '培训地点不能为空', trigger: ['blur', 'change'] }],
-  deptId: [{ required: true, message: '主管部门不能为空', trigger: ['blur', 'change'] }],
-  effectiveCompany: [{ required: true, message: '实施单位不能为空', trigger: ['blur', 'change'] }],
-  director: [{ required: true, message: '负责人不能为空', trigger: ['blur', 'change'] }],
-  trainContent: [{ required: true, message: '培训内容不能为空', trigger: ['blur', 'change'] }],
+  trainHour: [{ required: true, message: '培训学时必填', trigger: ['blur', 'change'] }],
+  trainTime: [{ required: true, message: '培训时间必填', trigger: ['blur', 'change'] }],
+  trainAddress: [{ required: true, message: '培训地点必填', trigger: ['blur', 'change'] }],
+  deptId: [{ required: true, message: '主管部门必填', trigger: ['blur', 'change'] }],
+  effectiveCompany: [{ required: true, message: '实施单位必填', trigger: ['blur', 'change'] }],
+  director: [{ required: true, message: '负责人必填', trigger: ['blur', 'change'] }],
+  trainContent: [{ required: true, message: '培训内容必填', trigger: ['blur', 'change'] }],
 })
 
 // 从路由中获取页面类型参数
@@ -463,10 +463,10 @@
     </detail-page>
     <detail-block title="人员信息">
       <template #btns>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
+        <el-button v-if="pageType === 'detail'" type="primary" @click="addRow">
           增加行
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="info" @click="deleteList">
+        <el-button v-if="pageType === 'detail'" type="info" @click="deleteList">
           删除行
         </el-button>
       </template>
diff --git a/src/views/measure/train/trainLog.vue b/src/views/measure/train/trainLog.vue
index 13ebd99..7e4f40d 100644
--- a/src/views/measure/train/trainLog.vue
+++ b/src/views/measure/train/trainLog.vue
@@ -1,6 +1,7 @@
 <!-- 培训记录列表 -->
 <script lang="ts" setup name="TrainLog">
 import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage } from 'element-plus'
 import type { ItrainLoglistQuery } from './plan_interface'
@@ -35,10 +36,6 @@
 // 初始化路由
 const $router = useRouter()
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.trainStartTime = trainTime.value[0] || ''
-  listQuery.value.trainEndTime = trainTime.value[1] || ''
-  listQuery.value.createStartTime = createTime.value[0] || ''
-  listQuery.value.createEndTime = createTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -64,6 +61,28 @@
   { text: '创建时间', value: 'createTime', width: '180', align: 'center' },
   { text: '备注', value: 'remark', align: 'center' },
 ])
+// 培训时间数组变更
+watch(trainTime, (val) => {
+  if (val) {
+    listQuery.value.trainStartTime = `${val[0]}`
+    listQuery.value.trainEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.trainStartTime = ''
+    listQuery.value.trainEndTime = ''
+  }
+})
+// 创建时间变更
+watch(createTime, (val) => {
+  if (val) {
+    listQuery.value.createStartTime = `${val[0]}`
+    listQuery.value.createEndTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.createStartTime = ''
+    listQuery.value.createEndTime = ''
+  }
+})
 
 // 搜索
 const searchList = () => {
@@ -94,12 +113,12 @@
   })
   if (list.value.length > 0) {
     const params = {
-      createEndTime: '',
-      createStartTime: '',
-      logNo: '',
-      trainEndTime: '',
-      trainName: '',
-      trainStartTime: '',
+      createEndTime: listQuery.value.createEndTime,
+      createStartTime: listQuery.value.createStartTime,
+      logNo: listQuery.value.logNo,
+      trainEndTime: listQuery.value.trainEndTime,
+      trainName: listQuery.value.trainName,
+      trainStartTime: listQuery.value.trainStartTime,
       ids: checkoutList.value,
     }
     exportLogList(params).then((res) => {
@@ -219,8 +238,8 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/measure/train/tarnLog/import')" icon="icon-import" title="批量导入" type="primary" />
-        <icon-button v-if="proxy.hasPerm('/measure/train/tarnLog/mould')" icon="icon-template" title="模板下载" type="primary" />
+        <!-- <icon-button v-if="proxy.hasPerm('/measure/train/tarnLog/import')" icon="icon-import" title="批量导入" type="primary" /> -->
+        <!-- <icon-button v-if="proxy.hasPerm('/measure/train/tarnLog/mould')" icon="icon-template" title="模板下载" type="primary" /> -->
         <icon-button v-if="proxy.hasPerm('/measure/train/tarnLog/add')" icon="icon-add" title="新建" type="primary" @click="add" />
         <icon-button v-if="proxy.hasPerm('/measure/train/tarnLog/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/measure/train/tarnLog/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
diff --git a/src/views/measure/train/trainLogAdd.vue b/src/views/measure/train/trainLogAdd.vue
index 4280295..2c9e9d0 100644
--- a/src/views/measure/train/trainLogAdd.vue
+++ b/src/views/measure/train/trainLogAdd.vue
@@ -53,6 +53,7 @@
 const trainList = ref<IObject[]>([]) // 人员信息列表数据
 // 表头
 const columns = ref([
+  { text: '学员名称', value: 'name', required: true },
   { text: '单位名称', value: 'company', required: true },
   { text: '技术职称', value: 'technologyJob', required: true },
   { text: '签到时间', value: 'signTime', width: '180', required: true },
@@ -60,21 +61,21 @@
 ])
 // 校验规则
 const rules = ref({
-  logNo: [{ required: true, message: '编号不能为空', trigger: ['blur', 'change'] }],
-  preparer: [{ required: true, message: '填表人不能为空', trigger: ['blur', 'change'] }],
+  logNo: [{ required: true, message: '编号必填', trigger: ['blur', 'change'] }],
+  preparer: [{ required: true, message: '填表人必填', trigger: ['blur', 'change'] }],
   planNo: [{ required: true, message: '计划编号必选', trigger: ['blur', 'change'] }],
-  trainName: [{ required: true, message: '培训名称不能为空', trigger: ['blur', 'change'] }],
-  trainPerson: [{ required: true, message: '培训对象不能为空', trigger: ['blur', 'change'] }],
-  trainNumber: [{ required: true, message: '培训人数不能为空', trigger: ['blur', 'change'] },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '培训人数只能为数字', trigger: ['blur', 'change'] },
+  trainName: [{ required: true, message: '培训名称必填', trigger: ['blur', 'change'] }],
+  trainPerson: [{ required: true, message: '培训对象必填', trigger: ['blur', 'change'] }],
+  trainNumber: [{ required: true, message: '培训人数必填', trigger: ['blur', 'change'] },
+    { pattern: /(^[1-9]\d*$)/, message: '要求为正整数', trigger: ['blur', 'change'] },
   ],
-  trainHour: [{ required: true, message: '培训学时不能为空', trigger: ['blur', 'change'] }],
-  trainTime: [{ required: true, message: '培训时间不能为空', trigger: ['blur', 'change'] }],
-  trainAddress: [{ required: true, message: '培训地点不能为空', trigger: ['blur', 'change'] }],
-  trainEffect: [{ required: true, message: '培训效果不能为空', trigger: ['blur', 'change'] }],
-  problems: [{ required: true, message: '存在问题不能为空', trigger: ['blur', 'change'] }],
-  improveMethod: [{ required: true, message: '改进措施不能为空', trigger: ['blur', 'change'] }],
-  trainContent: [{ required: true, message: '培训内容不能为空', trigger: ['blur', 'change'] }],
+  trainHour: [{ required: true, message: '培训学时必填', trigger: ['blur', 'change'] }],
+  trainTime: [{ required: true, message: '培训时间必填', trigger: ['blur', 'change'] }],
+  trainAddress: [{ required: true, message: '培训地点必填', trigger: ['blur', 'change'] }],
+  trainEffect: [{ required: true, message: '培训效果必填', trigger: ['blur', 'change'] }],
+  problems: [{ required: true, message: '存在问题必填', trigger: ['blur', 'change'] }],
+  improveMethod: [{ required: true, message: '改进措施必填', trigger: ['blur', 'change'] }],
+  trainContent: [{ required: true, message: '培训内容必填', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 const userListRef = ref()
 const SelectionList = ref<IObject[]>([])
@@ -89,7 +90,7 @@
 // 新增行
 const addRow = () => {
   if (formInline.value.planId === '') {
-    return ElMessage.warning('还未选择计划编号')
+    return ElMessage.warning('请先选择培训名称')
   }
   const index = trainList.value.findIndex(item => !item.name)
   if (index !== -1) {
@@ -248,9 +249,9 @@
         <el-button v-if=" pageType === 'detail'" v-print="printObj" type="primary" @click="getAddList(ruleFormRef, '打印')">
           打印
         </el-button>
-        <el-button v-if=" pageType === 'detail'" type="primary" @click="pageType = 'edit'">
+        <!-- <el-button v-if=" pageType === 'detail'" type="primary" @click="pageType = 'edit'">
           编辑
-        </el-button>
+        </el-button> -->
         <el-button type="info" @click="close">
           关闭
         </el-button>
@@ -428,23 +429,23 @@
       </el-form>
     </detail-page>
     <detail-block title="人员信息">
-      <template #btns>
-        <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="addRow">
+      <!-- <template #btns>
+        <el-button v-if="pageType === 'add'" type="primary" :disabled="pageType === 'detail'" @click="addRow">
           增加行
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="info" :disabled="pageType === 'detail'" @click="deleteList">
+        <el-button v-if="pageType === 'add'" type="info" :disabled="pageType === 'detail'" @click="deleteList">
           删除行
         </el-button>
-      </template>
+      </template> -->
       <el-table
         :data="trainList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column type="selection" width="55" />
+        <!-- <el-table-column type="selection" width="55" /> -->
         <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column align="center" label="学员名称">
+        <!-- <el-table-column align="center" label="学员名称">
           <template #header>
             <span style="color: red;">*</span><span>学员名称</span>
           </template>
@@ -457,7 +458,7 @@
               </template>
             </el-input>
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column v-for="(item, index) in columns" :key="index" :width="item.width" align="center" :label="item.text" :prop="item.value">
           <template #header>
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
@@ -475,10 +476,9 @@
             <!-- <el-input v-if="item.text === '考核结果' && pageType !== 'detail'" v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" /> -->
 
             <el-select
-              v-if="item.text === '考核结果' && pageType !== 'detail'"
+              v-if="item.text === '考核结果' && pageType === 'edit'"
               v-model="scope.row.examResult"
-              :placeholder="pageType === 'detail' ? '' : '请选择考核结果'"
-              :disabled="pageType === 'detail'"
+              placeholder="请选择考核结果"
             >
               <el-option v-for="item of ['优秀', '良好', '及格', '不及格']" :key="item" :label="item" :value="item" />
             </el-select>
diff --git a/src/views/measure/train/trainPlanApprove.vue b/src/views/measure/train/trainPlanApprove.vue
index 958572a..9c3691c 100644
--- a/src/views/measure/train/trainPlanApprove.vue
+++ b/src/views/measure/train/trainPlanApprove.vue
@@ -32,6 +32,7 @@
   ],
   已通过: [
     { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },