diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue
index 19bd56a..5af6c7f 100644
--- a/src/views/tested/MeasurementBusiness/detection/index.vue
+++ b/src/views/tested/MeasurementBusiness/detection/index.vue
@@ -63,30 +63,6 @@
     total.value = parseInt(response.data.total)
     listLoading.value = false
   })
-  // list.value = [
-  //   {
-  //     createTime: '2023-09-05', // 创建时间
-  //     createUserId: '123', // 创建人id
-  //     createUserName: '张三', // 创建人名字
-  //     customerId: '123', // 委托方id
-  //     customerName: '李四', // 委托方名称
-  //     deviceModel: 'SQ001', // 送检设备型号
-  //     deviceName: '测试设备', // 送检设备名称
-  //     deviceNo: '112233', // 送检设备编号
-  //     id: '123', // id
-  //     labCode: '1', // 实验室代码
-  //     labCodeName: '海口实验室', // 实验室代码
-  //     noticeDate: '2023-09-05', // 通知日期
-  //     noticeName: '海口计量站', // 通知单名称
-  //     noticeNo: '12345', // 通知单编号
-  //     noticeUserId: '1', // 通知委托方用户id
-  //     noticeUserName: '王五', // 通知委托方用户名字
-  //     returnDate: '2023-09-05', // 寄回日期
-  //     submitDate: '2023-09-05', // 送检日期
-  //     updateTime: '2023-09-05', // 更新时间
-  //   },
-  // ]
-  // listLoading.value = false
 }
 fetchData()
 // 查询数据
@@ -157,6 +133,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>
@@ -166,7 +143,7 @@
       </template>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading" @change="changePage"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading" @change="changePage"
       >
         <template #columns>
           <el-table-column label="操作" width="160" align="center">

diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue
index 19bd56a..5af6c7f 100644
--- a/src/views/tested/MeasurementBusiness/detection/index.vue
+++ b/src/views/tested/MeasurementBusiness/detection/index.vue
@@ -63,30 +63,6 @@
     total.value = parseInt(response.data.total)
     listLoading.value = false
   })
-  // list.value = [
-  //   {
-  //     createTime: '2023-09-05', // 创建时间
-  //     createUserId: '123', // 创建人id
-  //     createUserName: '张三', // 创建人名字
-  //     customerId: '123', // 委托方id
-  //     customerName: '李四', // 委托方名称
-  //     deviceModel: 'SQ001', // 送检设备型号
-  //     deviceName: '测试设备', // 送检设备名称
-  //     deviceNo: '112233', // 送检设备编号
-  //     id: '123', // id
-  //     labCode: '1', // 实验室代码
-  //     labCodeName: '海口实验室', // 实验室代码
-  //     noticeDate: '2023-09-05', // 通知日期
-  //     noticeName: '海口计量站', // 通知单名称
-  //     noticeNo: '12345', // 通知单编号
-  //     noticeUserId: '1', // 通知委托方用户id
-  //     noticeUserName: '王五', // 通知委托方用户名字
-  //     returnDate: '2023-09-05', // 寄回日期
-  //     submitDate: '2023-09-05', // 送检日期
-  //     updateTime: '2023-09-05', // 更新时间
-  //   },
-  // ]
-  // listLoading.value = false
 }
 fetchData()
 // 查询数据
@@ -157,6 +133,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>
@@ -166,7 +143,7 @@
       </template>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading" @change="changePage"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading" @change="changePage"
       >
         <template #columns>
           <el-table-column label="操作" width="160" align="center">
diff --git a/src/views/tested/MeasurementBusiness/notice/index.vue b/src/views/tested/MeasurementBusiness/notice/index.vue
index c6e4143..2d74eac 100644
--- a/src/views/tested/MeasurementBusiness/notice/index.vue
+++ b/src/views/tested/MeasurementBusiness/notice/index.vue
@@ -76,34 +76,6 @@
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     listLoading.value = false
-    // list.value = [
-    //   {
-    //     approvalStatus: '',
-    //     approvalStatusName: '',
-    //     contacts: '张三',
-    //     createTime: '2023-09-08',
-    //     createUserId: 0,
-    //     createUserName: '创建人',
-    //     customerId: 0,
-    //     customerName: '受检单位',
-    //     decisionItem: 0,
-    //     deviceName: '测试设备',
-    //     groupCode: '',
-    //     groupCodeName: '分组1',
-    //     id: 0,
-    //     labCode: '',
-    //     labCodeName: '',
-    //     mobile: '110',
-    //     noticeDate: '',
-    //     noticeName: '通知书1',
-    //     noticeNo: '123',
-    //     noticeUserId: '',
-    //     noticeUserName: '受检单位',
-    //     outsourcerName: '分包方1',
-    //     processId: '',
-    //     taskId: '',
-    //   },
-    // ]
   })
 }
 fetchData()
@@ -169,13 +141,14 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="申请开始时间" end-placeholder="申请结束时间"
+          clearable
         />
       </search-item>
     </search-area>
     <table-container>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
         :is-showmulti-select="true" @change="changePage"
       >
         <template #columns>

diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue
index 19bd56a..5af6c7f 100644
--- a/src/views/tested/MeasurementBusiness/detection/index.vue
+++ b/src/views/tested/MeasurementBusiness/detection/index.vue
@@ -63,30 +63,6 @@
     total.value = parseInt(response.data.total)
     listLoading.value = false
   })
-  // list.value = [
-  //   {
-  //     createTime: '2023-09-05', // 创建时间
-  //     createUserId: '123', // 创建人id
-  //     createUserName: '张三', // 创建人名字
-  //     customerId: '123', // 委托方id
-  //     customerName: '李四', // 委托方名称
-  //     deviceModel: 'SQ001', // 送检设备型号
-  //     deviceName: '测试设备', // 送检设备名称
-  //     deviceNo: '112233', // 送检设备编号
-  //     id: '123', // id
-  //     labCode: '1', // 实验室代码
-  //     labCodeName: '海口实验室', // 实验室代码
-  //     noticeDate: '2023-09-05', // 通知日期
-  //     noticeName: '海口计量站', // 通知单名称
-  //     noticeNo: '12345', // 通知单编号
-  //     noticeUserId: '1', // 通知委托方用户id
-  //     noticeUserName: '王五', // 通知委托方用户名字
-  //     returnDate: '2023-09-05', // 寄回日期
-  //     submitDate: '2023-09-05', // 送检日期
-  //     updateTime: '2023-09-05', // 更新时间
-  //   },
-  // ]
-  // listLoading.value = false
 }
 fetchData()
 // 查询数据
@@ -157,6 +133,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>
@@ -166,7 +143,7 @@
       </template>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading" @change="changePage"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading" @change="changePage"
       >
         <template #columns>
           <el-table-column label="操作" width="160" align="center">
diff --git a/src/views/tested/MeasurementBusiness/notice/index.vue b/src/views/tested/MeasurementBusiness/notice/index.vue
index c6e4143..2d74eac 100644
--- a/src/views/tested/MeasurementBusiness/notice/index.vue
+++ b/src/views/tested/MeasurementBusiness/notice/index.vue
@@ -76,34 +76,6 @@
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     listLoading.value = false
-    // list.value = [
-    //   {
-    //     approvalStatus: '',
-    //     approvalStatusName: '',
-    //     contacts: '张三',
-    //     createTime: '2023-09-08',
-    //     createUserId: 0,
-    //     createUserName: '创建人',
-    //     customerId: 0,
-    //     customerName: '受检单位',
-    //     decisionItem: 0,
-    //     deviceName: '测试设备',
-    //     groupCode: '',
-    //     groupCodeName: '分组1',
-    //     id: 0,
-    //     labCode: '',
-    //     labCodeName: '',
-    //     mobile: '110',
-    //     noticeDate: '',
-    //     noticeName: '通知书1',
-    //     noticeNo: '123',
-    //     noticeUserId: '',
-    //     noticeUserName: '受检单位',
-    //     outsourcerName: '分包方1',
-    //     processId: '',
-    //     taskId: '',
-    //   },
-    // ]
   })
 }
 fetchData()
@@ -169,13 +141,14 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="申请开始时间" end-placeholder="申请结束时间"
+          clearable
         />
       </search-item>
     </search-area>
     <table-container>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
         :is-showmulti-select="true" @change="changePage"
       >
         <template #columns>
diff --git a/src/views/tested/MeasurementBusiness/opinion/index.vue b/src/views/tested/MeasurementBusiness/opinion/index.vue
index 96b0203..4054b67 100644
--- a/src/views/tested/MeasurementBusiness/opinion/index.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/index.vue
@@ -141,6 +141,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>

diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue
index 19bd56a..5af6c7f 100644
--- a/src/views/tested/MeasurementBusiness/detection/index.vue
+++ b/src/views/tested/MeasurementBusiness/detection/index.vue
@@ -63,30 +63,6 @@
     total.value = parseInt(response.data.total)
     listLoading.value = false
   })
-  // list.value = [
-  //   {
-  //     createTime: '2023-09-05', // 创建时间
-  //     createUserId: '123', // 创建人id
-  //     createUserName: '张三', // 创建人名字
-  //     customerId: '123', // 委托方id
-  //     customerName: '李四', // 委托方名称
-  //     deviceModel: 'SQ001', // 送检设备型号
-  //     deviceName: '测试设备', // 送检设备名称
-  //     deviceNo: '112233', // 送检设备编号
-  //     id: '123', // id
-  //     labCode: '1', // 实验室代码
-  //     labCodeName: '海口实验室', // 实验室代码
-  //     noticeDate: '2023-09-05', // 通知日期
-  //     noticeName: '海口计量站', // 通知单名称
-  //     noticeNo: '12345', // 通知单编号
-  //     noticeUserId: '1', // 通知委托方用户id
-  //     noticeUserName: '王五', // 通知委托方用户名字
-  //     returnDate: '2023-09-05', // 寄回日期
-  //     submitDate: '2023-09-05', // 送检日期
-  //     updateTime: '2023-09-05', // 更新时间
-  //   },
-  // ]
-  // listLoading.value = false
 }
 fetchData()
 // 查询数据
@@ -157,6 +133,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>
@@ -166,7 +143,7 @@
       </template>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading" @change="changePage"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading" @change="changePage"
       >
         <template #columns>
           <el-table-column label="操作" width="160" align="center">
diff --git a/src/views/tested/MeasurementBusiness/notice/index.vue b/src/views/tested/MeasurementBusiness/notice/index.vue
index c6e4143..2d74eac 100644
--- a/src/views/tested/MeasurementBusiness/notice/index.vue
+++ b/src/views/tested/MeasurementBusiness/notice/index.vue
@@ -76,34 +76,6 @@
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     listLoading.value = false
-    // list.value = [
-    //   {
-    //     approvalStatus: '',
-    //     approvalStatusName: '',
-    //     contacts: '张三',
-    //     createTime: '2023-09-08',
-    //     createUserId: 0,
-    //     createUserName: '创建人',
-    //     customerId: 0,
-    //     customerName: '受检单位',
-    //     decisionItem: 0,
-    //     deviceName: '测试设备',
-    //     groupCode: '',
-    //     groupCodeName: '分组1',
-    //     id: 0,
-    //     labCode: '',
-    //     labCodeName: '',
-    //     mobile: '110',
-    //     noticeDate: '',
-    //     noticeName: '通知书1',
-    //     noticeNo: '123',
-    //     noticeUserId: '',
-    //     noticeUserName: '受检单位',
-    //     outsourcerName: '分包方1',
-    //     processId: '',
-    //     taskId: '',
-    //   },
-    // ]
   })
 }
 fetchData()
@@ -169,13 +141,14 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="申请开始时间" end-placeholder="申请结束时间"
+          clearable
         />
       </search-item>
     </search-area>
     <table-container>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
         :is-showmulti-select="true" @change="changePage"
       >
         <template #columns>
diff --git a/src/views/tested/MeasurementBusiness/opinion/index.vue b/src/views/tested/MeasurementBusiness/opinion/index.vue
index 96b0203..4054b67 100644
--- a/src/views/tested/MeasurementBusiness/opinion/index.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/index.vue
@@ -141,6 +141,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementBusiness/review/index.vue b/src/views/tested/MeasurementBusiness/review/index.vue
index ded9054..1aad1c4 100644
--- a/src/views/tested/MeasurementBusiness/review/index.vue
+++ b/src/views/tested/MeasurementBusiness/review/index.vue
@@ -144,6 +144,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>

diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue
index 19bd56a..5af6c7f 100644
--- a/src/views/tested/MeasurementBusiness/detection/index.vue
+++ b/src/views/tested/MeasurementBusiness/detection/index.vue
@@ -63,30 +63,6 @@
     total.value = parseInt(response.data.total)
     listLoading.value = false
   })
-  // list.value = [
-  //   {
-  //     createTime: '2023-09-05', // 创建时间
-  //     createUserId: '123', // 创建人id
-  //     createUserName: '张三', // 创建人名字
-  //     customerId: '123', // 委托方id
-  //     customerName: '李四', // 委托方名称
-  //     deviceModel: 'SQ001', // 送检设备型号
-  //     deviceName: '测试设备', // 送检设备名称
-  //     deviceNo: '112233', // 送检设备编号
-  //     id: '123', // id
-  //     labCode: '1', // 实验室代码
-  //     labCodeName: '海口实验室', // 实验室代码
-  //     noticeDate: '2023-09-05', // 通知日期
-  //     noticeName: '海口计量站', // 通知单名称
-  //     noticeNo: '12345', // 通知单编号
-  //     noticeUserId: '1', // 通知委托方用户id
-  //     noticeUserName: '王五', // 通知委托方用户名字
-  //     returnDate: '2023-09-05', // 寄回日期
-  //     submitDate: '2023-09-05', // 送检日期
-  //     updateTime: '2023-09-05', // 更新时间
-  //   },
-  // ]
-  // listLoading.value = false
 }
 fetchData()
 // 查询数据
@@ -157,6 +133,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>
@@ -166,7 +143,7 @@
       </template>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading" @change="changePage"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading" @change="changePage"
       >
         <template #columns>
           <el-table-column label="操作" width="160" align="center">
diff --git a/src/views/tested/MeasurementBusiness/notice/index.vue b/src/views/tested/MeasurementBusiness/notice/index.vue
index c6e4143..2d74eac 100644
--- a/src/views/tested/MeasurementBusiness/notice/index.vue
+++ b/src/views/tested/MeasurementBusiness/notice/index.vue
@@ -76,34 +76,6 @@
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     listLoading.value = false
-    // list.value = [
-    //   {
-    //     approvalStatus: '',
-    //     approvalStatusName: '',
-    //     contacts: '张三',
-    //     createTime: '2023-09-08',
-    //     createUserId: 0,
-    //     createUserName: '创建人',
-    //     customerId: 0,
-    //     customerName: '受检单位',
-    //     decisionItem: 0,
-    //     deviceName: '测试设备',
-    //     groupCode: '',
-    //     groupCodeName: '分组1',
-    //     id: 0,
-    //     labCode: '',
-    //     labCodeName: '',
-    //     mobile: '110',
-    //     noticeDate: '',
-    //     noticeName: '通知书1',
-    //     noticeNo: '123',
-    //     noticeUserId: '',
-    //     noticeUserName: '受检单位',
-    //     outsourcerName: '分包方1',
-    //     processId: '',
-    //     taskId: '',
-    //   },
-    // ]
   })
 }
 fetchData()
@@ -169,13 +141,14 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="申请开始时间" end-placeholder="申请结束时间"
+          clearable
         />
       </search-item>
     </search-area>
     <table-container>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
         :is-showmulti-select="true" @change="changePage"
       >
         <template #columns>
diff --git a/src/views/tested/MeasurementBusiness/opinion/index.vue b/src/views/tested/MeasurementBusiness/opinion/index.vue
index 96b0203..4054b67 100644
--- a/src/views/tested/MeasurementBusiness/opinion/index.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/index.vue
@@ -141,6 +141,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementBusiness/review/index.vue b/src/views/tested/MeasurementBusiness/review/index.vue
index ded9054..1aad1c4 100644
--- a/src/views/tested/MeasurementBusiness/review/index.vue
+++ b/src/views/tested/MeasurementBusiness/review/index.vue
@@ -144,6 +144,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/index.vue b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
index 393d9d5..23e45b8 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/index.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
@@ -113,6 +113,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="发送开始时间" end-placeholder="发送结束时间"
+          clearable
         />
       </search-item>
       <search-item>

diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue
index 19bd56a..5af6c7f 100644
--- a/src/views/tested/MeasurementBusiness/detection/index.vue
+++ b/src/views/tested/MeasurementBusiness/detection/index.vue
@@ -63,30 +63,6 @@
     total.value = parseInt(response.data.total)
     listLoading.value = false
   })
-  // list.value = [
-  //   {
-  //     createTime: '2023-09-05', // 创建时间
-  //     createUserId: '123', // 创建人id
-  //     createUserName: '张三', // 创建人名字
-  //     customerId: '123', // 委托方id
-  //     customerName: '李四', // 委托方名称
-  //     deviceModel: 'SQ001', // 送检设备型号
-  //     deviceName: '测试设备', // 送检设备名称
-  //     deviceNo: '112233', // 送检设备编号
-  //     id: '123', // id
-  //     labCode: '1', // 实验室代码
-  //     labCodeName: '海口实验室', // 实验室代码
-  //     noticeDate: '2023-09-05', // 通知日期
-  //     noticeName: '海口计量站', // 通知单名称
-  //     noticeNo: '12345', // 通知单编号
-  //     noticeUserId: '1', // 通知委托方用户id
-  //     noticeUserName: '王五', // 通知委托方用户名字
-  //     returnDate: '2023-09-05', // 寄回日期
-  //     submitDate: '2023-09-05', // 送检日期
-  //     updateTime: '2023-09-05', // 更新时间
-  //   },
-  // ]
-  // listLoading.value = false
 }
 fetchData()
 // 查询数据
@@ -157,6 +133,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>
@@ -166,7 +143,7 @@
       </template>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading" @change="changePage"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading" @change="changePage"
       >
         <template #columns>
           <el-table-column label="操作" width="160" align="center">
diff --git a/src/views/tested/MeasurementBusiness/notice/index.vue b/src/views/tested/MeasurementBusiness/notice/index.vue
index c6e4143..2d74eac 100644
--- a/src/views/tested/MeasurementBusiness/notice/index.vue
+++ b/src/views/tested/MeasurementBusiness/notice/index.vue
@@ -76,34 +76,6 @@
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     listLoading.value = false
-    // list.value = [
-    //   {
-    //     approvalStatus: '',
-    //     approvalStatusName: '',
-    //     contacts: '张三',
-    //     createTime: '2023-09-08',
-    //     createUserId: 0,
-    //     createUserName: '创建人',
-    //     customerId: 0,
-    //     customerName: '受检单位',
-    //     decisionItem: 0,
-    //     deviceName: '测试设备',
-    //     groupCode: '',
-    //     groupCodeName: '分组1',
-    //     id: 0,
-    //     labCode: '',
-    //     labCodeName: '',
-    //     mobile: '110',
-    //     noticeDate: '',
-    //     noticeName: '通知书1',
-    //     noticeNo: '123',
-    //     noticeUserId: '',
-    //     noticeUserName: '受检单位',
-    //     outsourcerName: '分包方1',
-    //     processId: '',
-    //     taskId: '',
-    //   },
-    // ]
   })
 }
 fetchData()
@@ -169,13 +141,14 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="申请开始时间" end-placeholder="申请结束时间"
+          clearable
         />
       </search-item>
     </search-area>
     <table-container>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
         :is-showmulti-select="true" @change="changePage"
       >
         <template #columns>
diff --git a/src/views/tested/MeasurementBusiness/opinion/index.vue b/src/views/tested/MeasurementBusiness/opinion/index.vue
index 96b0203..4054b67 100644
--- a/src/views/tested/MeasurementBusiness/opinion/index.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/index.vue
@@ -141,6 +141,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementBusiness/review/index.vue b/src/views/tested/MeasurementBusiness/review/index.vue
index ded9054..1aad1c4 100644
--- a/src/views/tested/MeasurementBusiness/review/index.vue
+++ b/src/views/tested/MeasurementBusiness/review/index.vue
@@ -144,6 +144,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/index.vue b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
index 393d9d5..23e45b8 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/index.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
@@ -113,6 +113,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="发送开始时间" end-placeholder="发送结束时间"
+          clearable
         />
       </search-item>
       <search-item>
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index 0e62a9f..f7390f9 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -145,6 +145,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>
@@ -154,7 +155,7 @@
       </template>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
         :is-showmulti-select="true" @change="changePage"
       >
         <template #columns>

diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue
index 19bd56a..5af6c7f 100644
--- a/src/views/tested/MeasurementBusiness/detection/index.vue
+++ b/src/views/tested/MeasurementBusiness/detection/index.vue
@@ -63,30 +63,6 @@
     total.value = parseInt(response.data.total)
     listLoading.value = false
   })
-  // list.value = [
-  //   {
-  //     createTime: '2023-09-05', // 创建时间
-  //     createUserId: '123', // 创建人id
-  //     createUserName: '张三', // 创建人名字
-  //     customerId: '123', // 委托方id
-  //     customerName: '李四', // 委托方名称
-  //     deviceModel: 'SQ001', // 送检设备型号
-  //     deviceName: '测试设备', // 送检设备名称
-  //     deviceNo: '112233', // 送检设备编号
-  //     id: '123', // id
-  //     labCode: '1', // 实验室代码
-  //     labCodeName: '海口实验室', // 实验室代码
-  //     noticeDate: '2023-09-05', // 通知日期
-  //     noticeName: '海口计量站', // 通知单名称
-  //     noticeNo: '12345', // 通知单编号
-  //     noticeUserId: '1', // 通知委托方用户id
-  //     noticeUserName: '王五', // 通知委托方用户名字
-  //     returnDate: '2023-09-05', // 寄回日期
-  //     submitDate: '2023-09-05', // 送检日期
-  //     updateTime: '2023-09-05', // 更新时间
-  //   },
-  // ]
-  // listLoading.value = false
 }
 fetchData()
 // 查询数据
@@ -157,6 +133,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>
@@ -166,7 +143,7 @@
       </template>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading" @change="changePage"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading" @change="changePage"
       >
         <template #columns>
           <el-table-column label="操作" width="160" align="center">
diff --git a/src/views/tested/MeasurementBusiness/notice/index.vue b/src/views/tested/MeasurementBusiness/notice/index.vue
index c6e4143..2d74eac 100644
--- a/src/views/tested/MeasurementBusiness/notice/index.vue
+++ b/src/views/tested/MeasurementBusiness/notice/index.vue
@@ -76,34 +76,6 @@
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     listLoading.value = false
-    // list.value = [
-    //   {
-    //     approvalStatus: '',
-    //     approvalStatusName: '',
-    //     contacts: '张三',
-    //     createTime: '2023-09-08',
-    //     createUserId: 0,
-    //     createUserName: '创建人',
-    //     customerId: 0,
-    //     customerName: '受检单位',
-    //     decisionItem: 0,
-    //     deviceName: '测试设备',
-    //     groupCode: '',
-    //     groupCodeName: '分组1',
-    //     id: 0,
-    //     labCode: '',
-    //     labCodeName: '',
-    //     mobile: '110',
-    //     noticeDate: '',
-    //     noticeName: '通知书1',
-    //     noticeNo: '123',
-    //     noticeUserId: '',
-    //     noticeUserName: '受检单位',
-    //     outsourcerName: '分包方1',
-    //     processId: '',
-    //     taskId: '',
-    //   },
-    // ]
   })
 }
 fetchData()
@@ -169,13 +141,14 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="申请开始时间" end-placeholder="申请结束时间"
+          clearable
         />
       </search-item>
     </search-area>
     <table-container>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
         :is-showmulti-select="true" @change="changePage"
       >
         <template #columns>
diff --git a/src/views/tested/MeasurementBusiness/opinion/index.vue b/src/views/tested/MeasurementBusiness/opinion/index.vue
index 96b0203..4054b67 100644
--- a/src/views/tested/MeasurementBusiness/opinion/index.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/index.vue
@@ -141,6 +141,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementBusiness/review/index.vue b/src/views/tested/MeasurementBusiness/review/index.vue
index ded9054..1aad1c4 100644
--- a/src/views/tested/MeasurementBusiness/review/index.vue
+++ b/src/views/tested/MeasurementBusiness/review/index.vue
@@ -144,6 +144,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/index.vue b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
index 393d9d5..23e45b8 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/index.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
@@ -113,6 +113,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="发送开始时间" end-placeholder="发送结束时间"
+          clearable
         />
       </search-item>
       <search-item>
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index 0e62a9f..f7390f9 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -145,6 +145,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>
@@ -154,7 +155,7 @@
       </template>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
         :is-showmulti-select="true" @change="changePage"
       >
         <template #columns>
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index f1db70f..6c30852 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -326,6 +326,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>

diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue
index 19bd56a..5af6c7f 100644
--- a/src/views/tested/MeasurementBusiness/detection/index.vue
+++ b/src/views/tested/MeasurementBusiness/detection/index.vue
@@ -63,30 +63,6 @@
     total.value = parseInt(response.data.total)
     listLoading.value = false
   })
-  // list.value = [
-  //   {
-  //     createTime: '2023-09-05', // 创建时间
-  //     createUserId: '123', // 创建人id
-  //     createUserName: '张三', // 创建人名字
-  //     customerId: '123', // 委托方id
-  //     customerName: '李四', // 委托方名称
-  //     deviceModel: 'SQ001', // 送检设备型号
-  //     deviceName: '测试设备', // 送检设备名称
-  //     deviceNo: '112233', // 送检设备编号
-  //     id: '123', // id
-  //     labCode: '1', // 实验室代码
-  //     labCodeName: '海口实验室', // 实验室代码
-  //     noticeDate: '2023-09-05', // 通知日期
-  //     noticeName: '海口计量站', // 通知单名称
-  //     noticeNo: '12345', // 通知单编号
-  //     noticeUserId: '1', // 通知委托方用户id
-  //     noticeUserName: '王五', // 通知委托方用户名字
-  //     returnDate: '2023-09-05', // 寄回日期
-  //     submitDate: '2023-09-05', // 送检日期
-  //     updateTime: '2023-09-05', // 更新时间
-  //   },
-  // ]
-  // listLoading.value = false
 }
 fetchData()
 // 查询数据
@@ -157,6 +133,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>
@@ -166,7 +143,7 @@
       </template>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading" @change="changePage"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading" @change="changePage"
       >
         <template #columns>
           <el-table-column label="操作" width="160" align="center">
diff --git a/src/views/tested/MeasurementBusiness/notice/index.vue b/src/views/tested/MeasurementBusiness/notice/index.vue
index c6e4143..2d74eac 100644
--- a/src/views/tested/MeasurementBusiness/notice/index.vue
+++ b/src/views/tested/MeasurementBusiness/notice/index.vue
@@ -76,34 +76,6 @@
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     listLoading.value = false
-    // list.value = [
-    //   {
-    //     approvalStatus: '',
-    //     approvalStatusName: '',
-    //     contacts: '张三',
-    //     createTime: '2023-09-08',
-    //     createUserId: 0,
-    //     createUserName: '创建人',
-    //     customerId: 0,
-    //     customerName: '受检单位',
-    //     decisionItem: 0,
-    //     deviceName: '测试设备',
-    //     groupCode: '',
-    //     groupCodeName: '分组1',
-    //     id: 0,
-    //     labCode: '',
-    //     labCodeName: '',
-    //     mobile: '110',
-    //     noticeDate: '',
-    //     noticeName: '通知书1',
-    //     noticeNo: '123',
-    //     noticeUserId: '',
-    //     noticeUserName: '受检单位',
-    //     outsourcerName: '分包方1',
-    //     processId: '',
-    //     taskId: '',
-    //   },
-    // ]
   })
 }
 fetchData()
@@ -169,13 +141,14 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="申请开始时间" end-placeholder="申请结束时间"
+          clearable
         />
       </search-item>
     </search-area>
     <table-container>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
         :is-showmulti-select="true" @change="changePage"
       >
         <template #columns>
diff --git a/src/views/tested/MeasurementBusiness/opinion/index.vue b/src/views/tested/MeasurementBusiness/opinion/index.vue
index 96b0203..4054b67 100644
--- a/src/views/tested/MeasurementBusiness/opinion/index.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/index.vue
@@ -141,6 +141,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementBusiness/review/index.vue b/src/views/tested/MeasurementBusiness/review/index.vue
index ded9054..1aad1c4 100644
--- a/src/views/tested/MeasurementBusiness/review/index.vue
+++ b/src/views/tested/MeasurementBusiness/review/index.vue
@@ -144,6 +144,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/index.vue b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
index 393d9d5..23e45b8 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/index.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
@@ -113,6 +113,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="发送开始时间" end-placeholder="发送结束时间"
+          clearable
         />
       </search-item>
       <search-item>
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index 0e62a9f..f7390f9 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -145,6 +145,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>
@@ -154,7 +155,7 @@
       </template>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
         :is-showmulti-select="true" @change="changePage"
       >
         <template #columns>
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index f1db70f..6c30852 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -326,6 +326,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
index 0772b43..d109074 100644
--- a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
+++ b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
@@ -173,7 +173,7 @@
     <table-container>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery"
         :list-loading="listLoading" :is-showmulti-select="false" @change="changePage"
       >
         <template #preColumns>

diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue
index 19bd56a..5af6c7f 100644
--- a/src/views/tested/MeasurementBusiness/detection/index.vue
+++ b/src/views/tested/MeasurementBusiness/detection/index.vue
@@ -63,30 +63,6 @@
     total.value = parseInt(response.data.total)
     listLoading.value = false
   })
-  // list.value = [
-  //   {
-  //     createTime: '2023-09-05', // 创建时间
-  //     createUserId: '123', // 创建人id
-  //     createUserName: '张三', // 创建人名字
-  //     customerId: '123', // 委托方id
-  //     customerName: '李四', // 委托方名称
-  //     deviceModel: 'SQ001', // 送检设备型号
-  //     deviceName: '测试设备', // 送检设备名称
-  //     deviceNo: '112233', // 送检设备编号
-  //     id: '123', // id
-  //     labCode: '1', // 实验室代码
-  //     labCodeName: '海口实验室', // 实验室代码
-  //     noticeDate: '2023-09-05', // 通知日期
-  //     noticeName: '海口计量站', // 通知单名称
-  //     noticeNo: '12345', // 通知单编号
-  //     noticeUserId: '1', // 通知委托方用户id
-  //     noticeUserName: '王五', // 通知委托方用户名字
-  //     returnDate: '2023-09-05', // 寄回日期
-  //     submitDate: '2023-09-05', // 送检日期
-  //     updateTime: '2023-09-05', // 更新时间
-  //   },
-  // ]
-  // listLoading.value = false
 }
 fetchData()
 // 查询数据
@@ -157,6 +133,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>
@@ -166,7 +143,7 @@
       </template>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading" @change="changePage"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading" @change="changePage"
       >
         <template #columns>
           <el-table-column label="操作" width="160" align="center">
diff --git a/src/views/tested/MeasurementBusiness/notice/index.vue b/src/views/tested/MeasurementBusiness/notice/index.vue
index c6e4143..2d74eac 100644
--- a/src/views/tested/MeasurementBusiness/notice/index.vue
+++ b/src/views/tested/MeasurementBusiness/notice/index.vue
@@ -76,34 +76,6 @@
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     listLoading.value = false
-    // list.value = [
-    //   {
-    //     approvalStatus: '',
-    //     approvalStatusName: '',
-    //     contacts: '张三',
-    //     createTime: '2023-09-08',
-    //     createUserId: 0,
-    //     createUserName: '创建人',
-    //     customerId: 0,
-    //     customerName: '受检单位',
-    //     decisionItem: 0,
-    //     deviceName: '测试设备',
-    //     groupCode: '',
-    //     groupCodeName: '分组1',
-    //     id: 0,
-    //     labCode: '',
-    //     labCodeName: '',
-    //     mobile: '110',
-    //     noticeDate: '',
-    //     noticeName: '通知书1',
-    //     noticeNo: '123',
-    //     noticeUserId: '',
-    //     noticeUserName: '受检单位',
-    //     outsourcerName: '分包方1',
-    //     processId: '',
-    //     taskId: '',
-    //   },
-    // ]
   })
 }
 fetchData()
@@ -169,13 +141,14 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="申请开始时间" end-placeholder="申请结束时间"
+          clearable
         />
       </search-item>
     </search-area>
     <table-container>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
         :is-showmulti-select="true" @change="changePage"
       >
         <template #columns>
diff --git a/src/views/tested/MeasurementBusiness/opinion/index.vue b/src/views/tested/MeasurementBusiness/opinion/index.vue
index 96b0203..4054b67 100644
--- a/src/views/tested/MeasurementBusiness/opinion/index.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/index.vue
@@ -141,6 +141,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementBusiness/review/index.vue b/src/views/tested/MeasurementBusiness/review/index.vue
index ded9054..1aad1c4 100644
--- a/src/views/tested/MeasurementBusiness/review/index.vue
+++ b/src/views/tested/MeasurementBusiness/review/index.vue
@@ -144,6 +144,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/index.vue b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
index 393d9d5..23e45b8 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/index.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
@@ -113,6 +113,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="发送开始时间" end-placeholder="发送结束时间"
+          clearable
         />
       </search-item>
       <search-item>
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index 0e62a9f..f7390f9 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -145,6 +145,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>
@@ -154,7 +155,7 @@
       </template>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
         :is-showmulti-select="true" @change="changePage"
       >
         <template #columns>
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index f1db70f..6c30852 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -326,6 +326,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
index 0772b43..d109074 100644
--- a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
+++ b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
@@ -173,7 +173,7 @@
     <table-container>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery"
         :list-loading="listLoading" :is-showmulti-select="false" @change="changePage"
       >
         <template #preColumns>
diff --git a/src/views/tested/MeasurementPlan/plan/components/dataList.vue b/src/views/tested/MeasurementPlan/plan/components/dataList.vue
index ba725ef..f5db816 100644
--- a/src/views/tested/MeasurementPlan/plan/components/dataList.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/dataList.vue
@@ -66,6 +66,18 @@
     align: 'center',
   },
 ])
+const columnsAll = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '总计',
+    value: 'count',
+    align: 'center',
+  },
+])
 // 获取聚合表格数据
 const togetherLoading = ref(true)
 const togetherList = ref([])
@@ -115,7 +127,7 @@
   <detail-page class="base-info-device" title="计划列表">
     <!-- 展开行表格 -->
     <normal-table
-      class="nortable-header" :data=" [] " :total=" 0 " :columns=" columns " :options="
+      class="nortable-header" :data=" [] " :total=" 0 " :columns=" columnsAll as any " :options="
         {
           needIndex: false, // 是否需要序号列
           border: true, // 是否需要上方边框
@@ -126,15 +138,15 @@
       v-loading=" togetherLoading " :data=" togetherList " border style="width: 100%;"
       :row-key=" getRowKeys " :expand-row-keys=" expands " :show-header=" false " @expand-change=" expandChange "
     >
-      <el-table-column type="expand">
+      <el-table-column type="expand" width="38">
         <template #default="">
           <normal-table
-            :data=" expandList " :total=" 0 " :columns=" columns " :list-loading=" expandLoading " :options="
+            :data=" expandList " :total=" 0 " :columns=" columns as any " :list-loading=" expandLoading " :options="
               {
                 needIndex: false, // 是否需要序号列
                 border: true, // 是否需要上方边框
               }
-            " :pagination=" false " :is-showmulti-select=" true " :show-header=" false "
+            " :pagination=" false " :is-showmulti-select=" true "
           />
         </template>
       </el-table-column>

diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue
index 19bd56a..5af6c7f 100644
--- a/src/views/tested/MeasurementBusiness/detection/index.vue
+++ b/src/views/tested/MeasurementBusiness/detection/index.vue
@@ -63,30 +63,6 @@
     total.value = parseInt(response.data.total)
     listLoading.value = false
   })
-  // list.value = [
-  //   {
-  //     createTime: '2023-09-05', // 创建时间
-  //     createUserId: '123', // 创建人id
-  //     createUserName: '张三', // 创建人名字
-  //     customerId: '123', // 委托方id
-  //     customerName: '李四', // 委托方名称
-  //     deviceModel: 'SQ001', // 送检设备型号
-  //     deviceName: '测试设备', // 送检设备名称
-  //     deviceNo: '112233', // 送检设备编号
-  //     id: '123', // id
-  //     labCode: '1', // 实验室代码
-  //     labCodeName: '海口实验室', // 实验室代码
-  //     noticeDate: '2023-09-05', // 通知日期
-  //     noticeName: '海口计量站', // 通知单名称
-  //     noticeNo: '12345', // 通知单编号
-  //     noticeUserId: '1', // 通知委托方用户id
-  //     noticeUserName: '王五', // 通知委托方用户名字
-  //     returnDate: '2023-09-05', // 寄回日期
-  //     submitDate: '2023-09-05', // 送检日期
-  //     updateTime: '2023-09-05', // 更新时间
-  //   },
-  // ]
-  // listLoading.value = false
 }
 fetchData()
 // 查询数据
@@ -157,6 +133,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>
@@ -166,7 +143,7 @@
       </template>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading" @change="changePage"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading" @change="changePage"
       >
         <template #columns>
           <el-table-column label="操作" width="160" align="center">
diff --git a/src/views/tested/MeasurementBusiness/notice/index.vue b/src/views/tested/MeasurementBusiness/notice/index.vue
index c6e4143..2d74eac 100644
--- a/src/views/tested/MeasurementBusiness/notice/index.vue
+++ b/src/views/tested/MeasurementBusiness/notice/index.vue
@@ -76,34 +76,6 @@
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     listLoading.value = false
-    // list.value = [
-    //   {
-    //     approvalStatus: '',
-    //     approvalStatusName: '',
-    //     contacts: '张三',
-    //     createTime: '2023-09-08',
-    //     createUserId: 0,
-    //     createUserName: '创建人',
-    //     customerId: 0,
-    //     customerName: '受检单位',
-    //     decisionItem: 0,
-    //     deviceName: '测试设备',
-    //     groupCode: '',
-    //     groupCodeName: '分组1',
-    //     id: 0,
-    //     labCode: '',
-    //     labCodeName: '',
-    //     mobile: '110',
-    //     noticeDate: '',
-    //     noticeName: '通知书1',
-    //     noticeNo: '123',
-    //     noticeUserId: '',
-    //     noticeUserName: '受检单位',
-    //     outsourcerName: '分包方1',
-    //     processId: '',
-    //     taskId: '',
-    //   },
-    // ]
   })
 }
 fetchData()
@@ -169,13 +141,14 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="申请开始时间" end-placeholder="申请结束时间"
+          clearable
         />
       </search-item>
     </search-area>
     <table-container>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
         :is-showmulti-select="true" @change="changePage"
       >
         <template #columns>
diff --git a/src/views/tested/MeasurementBusiness/opinion/index.vue b/src/views/tested/MeasurementBusiness/opinion/index.vue
index 96b0203..4054b67 100644
--- a/src/views/tested/MeasurementBusiness/opinion/index.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/index.vue
@@ -141,6 +141,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementBusiness/review/index.vue b/src/views/tested/MeasurementBusiness/review/index.vue
index ded9054..1aad1c4 100644
--- a/src/views/tested/MeasurementBusiness/review/index.vue
+++ b/src/views/tested/MeasurementBusiness/review/index.vue
@@ -144,6 +144,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/index.vue b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
index 393d9d5..23e45b8 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/index.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
@@ -113,6 +113,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="发送开始时间" end-placeholder="发送结束时间"
+          clearable
         />
       </search-item>
       <search-item>
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index 0e62a9f..f7390f9 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -145,6 +145,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>
@@ -154,7 +155,7 @@
       </template>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
         :is-showmulti-select="true" @change="changePage"
       >
         <template #columns>
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index f1db70f..6c30852 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -326,6 +326,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
index 0772b43..d109074 100644
--- a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
+++ b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
@@ -173,7 +173,7 @@
     <table-container>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery"
         :list-loading="listLoading" :is-showmulti-select="false" @change="changePage"
       >
         <template #preColumns>
diff --git a/src/views/tested/MeasurementPlan/plan/components/dataList.vue b/src/views/tested/MeasurementPlan/plan/components/dataList.vue
index ba725ef..f5db816 100644
--- a/src/views/tested/MeasurementPlan/plan/components/dataList.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/dataList.vue
@@ -66,6 +66,18 @@
     align: 'center',
   },
 ])
+const columnsAll = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '总计',
+    value: 'count',
+    align: 'center',
+  },
+])
 // 获取聚合表格数据
 const togetherLoading = ref(true)
 const togetherList = ref([])
@@ -115,7 +127,7 @@
   <detail-page class="base-info-device" title="计划列表">
     <!-- 展开行表格 -->
     <normal-table
-      class="nortable-header" :data=" [] " :total=" 0 " :columns=" columns " :options="
+      class="nortable-header" :data=" [] " :total=" 0 " :columns=" columnsAll as any " :options="
         {
           needIndex: false, // 是否需要序号列
           border: true, // 是否需要上方边框
@@ -126,15 +138,15 @@
       v-loading=" togetherLoading " :data=" togetherList " border style="width: 100%;"
       :row-key=" getRowKeys " :expand-row-keys=" expands " :show-header=" false " @expand-change=" expandChange "
     >
-      <el-table-column type="expand">
+      <el-table-column type="expand" width="38">
         <template #default="">
           <normal-table
-            :data=" expandList " :total=" 0 " :columns=" columns " :list-loading=" expandLoading " :options="
+            :data=" expandList " :total=" 0 " :columns=" columns as any " :list-loading=" expandLoading " :options="
               {
                 needIndex: false, // 是否需要序号列
                 border: true, // 是否需要上方边框
               }
-            " :pagination=" false " :is-showmulti-select=" true " :show-header=" false "
+            " :pagination=" false " :is-showmulti-select=" true "
           />
         </template>
       </el-table-column>
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 67d6b02..6aaca0b 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -245,6 +245,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
+          clearable
         />
       </search-item>
       <search-item>

diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue
index 19bd56a..5af6c7f 100644
--- a/src/views/tested/MeasurementBusiness/detection/index.vue
+++ b/src/views/tested/MeasurementBusiness/detection/index.vue
@@ -63,30 +63,6 @@
     total.value = parseInt(response.data.total)
     listLoading.value = false
   })
-  // list.value = [
-  //   {
-  //     createTime: '2023-09-05', // 创建时间
-  //     createUserId: '123', // 创建人id
-  //     createUserName: '张三', // 创建人名字
-  //     customerId: '123', // 委托方id
-  //     customerName: '李四', // 委托方名称
-  //     deviceModel: 'SQ001', // 送检设备型号
-  //     deviceName: '测试设备', // 送检设备名称
-  //     deviceNo: '112233', // 送检设备编号
-  //     id: '123', // id
-  //     labCode: '1', // 实验室代码
-  //     labCodeName: '海口实验室', // 实验室代码
-  //     noticeDate: '2023-09-05', // 通知日期
-  //     noticeName: '海口计量站', // 通知单名称
-  //     noticeNo: '12345', // 通知单编号
-  //     noticeUserId: '1', // 通知委托方用户id
-  //     noticeUserName: '王五', // 通知委托方用户名字
-  //     returnDate: '2023-09-05', // 寄回日期
-  //     submitDate: '2023-09-05', // 送检日期
-  //     updateTime: '2023-09-05', // 更新时间
-  //   },
-  // ]
-  // listLoading.value = false
 }
 fetchData()
 // 查询数据
@@ -157,6 +133,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>
@@ -166,7 +143,7 @@
       </template>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading" @change="changePage"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading" @change="changePage"
       >
         <template #columns>
           <el-table-column label="操作" width="160" align="center">
diff --git a/src/views/tested/MeasurementBusiness/notice/index.vue b/src/views/tested/MeasurementBusiness/notice/index.vue
index c6e4143..2d74eac 100644
--- a/src/views/tested/MeasurementBusiness/notice/index.vue
+++ b/src/views/tested/MeasurementBusiness/notice/index.vue
@@ -76,34 +76,6 @@
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     listLoading.value = false
-    // list.value = [
-    //   {
-    //     approvalStatus: '',
-    //     approvalStatusName: '',
-    //     contacts: '张三',
-    //     createTime: '2023-09-08',
-    //     createUserId: 0,
-    //     createUserName: '创建人',
-    //     customerId: 0,
-    //     customerName: '受检单位',
-    //     decisionItem: 0,
-    //     deviceName: '测试设备',
-    //     groupCode: '',
-    //     groupCodeName: '分组1',
-    //     id: 0,
-    //     labCode: '',
-    //     labCodeName: '',
-    //     mobile: '110',
-    //     noticeDate: '',
-    //     noticeName: '通知书1',
-    //     noticeNo: '123',
-    //     noticeUserId: '',
-    //     noticeUserName: '受检单位',
-    //     outsourcerName: '分包方1',
-    //     processId: '',
-    //     taskId: '',
-    //   },
-    // ]
   })
 }
 fetchData()
@@ -169,13 +141,14 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="申请开始时间" end-placeholder="申请结束时间"
+          clearable
         />
       </search-item>
     </search-area>
     <table-container>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
         :is-showmulti-select="true" @change="changePage"
       >
         <template #columns>
diff --git a/src/views/tested/MeasurementBusiness/opinion/index.vue b/src/views/tested/MeasurementBusiness/opinion/index.vue
index 96b0203..4054b67 100644
--- a/src/views/tested/MeasurementBusiness/opinion/index.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/index.vue
@@ -141,6 +141,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementBusiness/review/index.vue b/src/views/tested/MeasurementBusiness/review/index.vue
index ded9054..1aad1c4 100644
--- a/src/views/tested/MeasurementBusiness/review/index.vue
+++ b/src/views/tested/MeasurementBusiness/review/index.vue
@@ -144,6 +144,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/index.vue b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
index 393d9d5..23e45b8 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/index.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
@@ -113,6 +113,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="发送开始时间" end-placeholder="发送结束时间"
+          clearable
         />
       </search-item>
       <search-item>
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index 0e62a9f..f7390f9 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -145,6 +145,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>
@@ -154,7 +155,7 @@
       </template>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
         :is-showmulti-select="true" @change="changePage"
       >
         <template #columns>
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index f1db70f..6c30852 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -326,6 +326,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
index 0772b43..d109074 100644
--- a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
+++ b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
@@ -173,7 +173,7 @@
     <table-container>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery"
         :list-loading="listLoading" :is-showmulti-select="false" @change="changePage"
       >
         <template #preColumns>
diff --git a/src/views/tested/MeasurementPlan/plan/components/dataList.vue b/src/views/tested/MeasurementPlan/plan/components/dataList.vue
index ba725ef..f5db816 100644
--- a/src/views/tested/MeasurementPlan/plan/components/dataList.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/dataList.vue
@@ -66,6 +66,18 @@
     align: 'center',
   },
 ])
+const columnsAll = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '总计',
+    value: 'count',
+    align: 'center',
+  },
+])
 // 获取聚合表格数据
 const togetherLoading = ref(true)
 const togetherList = ref([])
@@ -115,7 +127,7 @@
   <detail-page class="base-info-device" title="计划列表">
     <!-- 展开行表格 -->
     <normal-table
-      class="nortable-header" :data=" [] " :total=" 0 " :columns=" columns " :options="
+      class="nortable-header" :data=" [] " :total=" 0 " :columns=" columnsAll as any " :options="
         {
           needIndex: false, // 是否需要序号列
           border: true, // 是否需要上方边框
@@ -126,15 +138,15 @@
       v-loading=" togetherLoading " :data=" togetherList " border style="width: 100%;"
       :row-key=" getRowKeys " :expand-row-keys=" expands " :show-header=" false " @expand-change=" expandChange "
     >
-      <el-table-column type="expand">
+      <el-table-column type="expand" width="38">
         <template #default="">
           <normal-table
-            :data=" expandList " :total=" 0 " :columns=" columns " :list-loading=" expandLoading " :options="
+            :data=" expandList " :total=" 0 " :columns=" columns as any " :list-loading=" expandLoading " :options="
               {
                 needIndex: false, // 是否需要序号列
                 border: true, // 是否需要上方边框
               }
-            " :pagination=" false " :is-showmulti-select=" true " :show-header=" false "
+            " :pagination=" false " :is-showmulti-select=" true "
           />
         </template>
       </el-table-column>
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 67d6b02..6aaca0b 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -245,6 +245,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
+          clearable
         />
       </search-item>
       <search-item>
diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue
index 4f3e9a9..5a21904 100644
--- a/src/views/tested/device/certificate/index.vue
+++ b/src/views/tested/device/certificate/index.vue
@@ -256,13 +256,13 @@
         <el-input v-model.trim="listQuery.manufactureNo" placeholder="出厂编号" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.companyId" filterable placeholder="所在单位">
+        <el-select v-model="listQuery.companyId" filterable placeholder="所在单位" clearable>
           <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </search-item>
       <search-item>
         <!-- <dept-select v-model="listQuery.deptIds" placeholder="使用部门" /> -->
-        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门">
+        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门" clearable>
           <el-option v-for="item in deptList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </search-item>
@@ -291,6 +291,7 @@
         <el-date-picker
           v-model="range" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
+          clearable
         />
       </search-item>
       <!-- <search-item>

diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue
index 19bd56a..5af6c7f 100644
--- a/src/views/tested/MeasurementBusiness/detection/index.vue
+++ b/src/views/tested/MeasurementBusiness/detection/index.vue
@@ -63,30 +63,6 @@
     total.value = parseInt(response.data.total)
     listLoading.value = false
   })
-  // list.value = [
-  //   {
-  //     createTime: '2023-09-05', // 创建时间
-  //     createUserId: '123', // 创建人id
-  //     createUserName: '张三', // 创建人名字
-  //     customerId: '123', // 委托方id
-  //     customerName: '李四', // 委托方名称
-  //     deviceModel: 'SQ001', // 送检设备型号
-  //     deviceName: '测试设备', // 送检设备名称
-  //     deviceNo: '112233', // 送检设备编号
-  //     id: '123', // id
-  //     labCode: '1', // 实验室代码
-  //     labCodeName: '海口实验室', // 实验室代码
-  //     noticeDate: '2023-09-05', // 通知日期
-  //     noticeName: '海口计量站', // 通知单名称
-  //     noticeNo: '12345', // 通知单编号
-  //     noticeUserId: '1', // 通知委托方用户id
-  //     noticeUserName: '王五', // 通知委托方用户名字
-  //     returnDate: '2023-09-05', // 寄回日期
-  //     submitDate: '2023-09-05', // 送检日期
-  //     updateTime: '2023-09-05', // 更新时间
-  //   },
-  // ]
-  // listLoading.value = false
 }
 fetchData()
 // 查询数据
@@ -157,6 +133,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>
@@ -166,7 +143,7 @@
       </template>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading" @change="changePage"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading" @change="changePage"
       >
         <template #columns>
           <el-table-column label="操作" width="160" align="center">
diff --git a/src/views/tested/MeasurementBusiness/notice/index.vue b/src/views/tested/MeasurementBusiness/notice/index.vue
index c6e4143..2d74eac 100644
--- a/src/views/tested/MeasurementBusiness/notice/index.vue
+++ b/src/views/tested/MeasurementBusiness/notice/index.vue
@@ -76,34 +76,6 @@
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     listLoading.value = false
-    // list.value = [
-    //   {
-    //     approvalStatus: '',
-    //     approvalStatusName: '',
-    //     contacts: '张三',
-    //     createTime: '2023-09-08',
-    //     createUserId: 0,
-    //     createUserName: '创建人',
-    //     customerId: 0,
-    //     customerName: '受检单位',
-    //     decisionItem: 0,
-    //     deviceName: '测试设备',
-    //     groupCode: '',
-    //     groupCodeName: '分组1',
-    //     id: 0,
-    //     labCode: '',
-    //     labCodeName: '',
-    //     mobile: '110',
-    //     noticeDate: '',
-    //     noticeName: '通知书1',
-    //     noticeNo: '123',
-    //     noticeUserId: '',
-    //     noticeUserName: '受检单位',
-    //     outsourcerName: '分包方1',
-    //     processId: '',
-    //     taskId: '',
-    //   },
-    // ]
   })
 }
 fetchData()
@@ -169,13 +141,14 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="申请开始时间" end-placeholder="申请结束时间"
+          clearable
         />
       </search-item>
     </search-area>
     <table-container>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
         :is-showmulti-select="true" @change="changePage"
       >
         <template #columns>
diff --git a/src/views/tested/MeasurementBusiness/opinion/index.vue b/src/views/tested/MeasurementBusiness/opinion/index.vue
index 96b0203..4054b67 100644
--- a/src/views/tested/MeasurementBusiness/opinion/index.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/index.vue
@@ -141,6 +141,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementBusiness/review/index.vue b/src/views/tested/MeasurementBusiness/review/index.vue
index ded9054..1aad1c4 100644
--- a/src/views/tested/MeasurementBusiness/review/index.vue
+++ b/src/views/tested/MeasurementBusiness/review/index.vue
@@ -144,6 +144,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/index.vue b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
index 393d9d5..23e45b8 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/index.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
@@ -113,6 +113,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="发送开始时间" end-placeholder="发送结束时间"
+          clearable
         />
       </search-item>
       <search-item>
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index 0e62a9f..f7390f9 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -145,6 +145,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>
@@ -154,7 +155,7 @@
       </template>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
         :is-showmulti-select="true" @change="changePage"
       >
         <template #columns>
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index f1db70f..6c30852 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -326,6 +326,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
index 0772b43..d109074 100644
--- a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
+++ b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
@@ -173,7 +173,7 @@
     <table-container>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery"
         :list-loading="listLoading" :is-showmulti-select="false" @change="changePage"
       >
         <template #preColumns>
diff --git a/src/views/tested/MeasurementPlan/plan/components/dataList.vue b/src/views/tested/MeasurementPlan/plan/components/dataList.vue
index ba725ef..f5db816 100644
--- a/src/views/tested/MeasurementPlan/plan/components/dataList.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/dataList.vue
@@ -66,6 +66,18 @@
     align: 'center',
   },
 ])
+const columnsAll = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '总计',
+    value: 'count',
+    align: 'center',
+  },
+])
 // 获取聚合表格数据
 const togetherLoading = ref(true)
 const togetherList = ref([])
@@ -115,7 +127,7 @@
   <detail-page class="base-info-device" title="计划列表">
     <!-- 展开行表格 -->
     <normal-table
-      class="nortable-header" :data=" [] " :total=" 0 " :columns=" columns " :options="
+      class="nortable-header" :data=" [] " :total=" 0 " :columns=" columnsAll as any " :options="
         {
           needIndex: false, // 是否需要序号列
           border: true, // 是否需要上方边框
@@ -126,15 +138,15 @@
       v-loading=" togetherLoading " :data=" togetherList " border style="width: 100%;"
       :row-key=" getRowKeys " :expand-row-keys=" expands " :show-header=" false " @expand-change=" expandChange "
     >
-      <el-table-column type="expand">
+      <el-table-column type="expand" width="38">
         <template #default="">
           <normal-table
-            :data=" expandList " :total=" 0 " :columns=" columns " :list-loading=" expandLoading " :options="
+            :data=" expandList " :total=" 0 " :columns=" columns as any " :list-loading=" expandLoading " :options="
               {
                 needIndex: false, // 是否需要序号列
                 border: true, // 是否需要上方边框
               }
-            " :pagination=" false " :is-showmulti-select=" true " :show-header=" false "
+            " :pagination=" false " :is-showmulti-select=" true "
           />
         </template>
       </el-table-column>
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 67d6b02..6aaca0b 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -245,6 +245,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
+          clearable
         />
       </search-item>
       <search-item>
diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue
index 4f3e9a9..5a21904 100644
--- a/src/views/tested/device/certificate/index.vue
+++ b/src/views/tested/device/certificate/index.vue
@@ -256,13 +256,13 @@
         <el-input v-model.trim="listQuery.manufactureNo" placeholder="出厂编号" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.companyId" filterable placeholder="所在单位">
+        <el-select v-model="listQuery.companyId" filterable placeholder="所在单位" clearable>
           <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </search-item>
       <search-item>
         <!-- <dept-select v-model="listQuery.deptIds" placeholder="使用部门" /> -->
-        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门">
+        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门" clearable>
           <el-option v-for="item in deptList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </search-item>
@@ -291,6 +291,7 @@
         <el-date-picker
           v-model="range" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
+          clearable
         />
       </search-item>
       <!-- <search-item>
diff --git a/src/views/tested/device/group/components/list.vue b/src/views/tested/device/group/components/list.vue
index 2ea7d85..12b13a4 100644
--- a/src/views/tested/device/group/components/list.vue
+++ b/src/views/tested/device/group/components/list.vue
@@ -240,21 +240,21 @@
       <search-item>
         <!-- <el-input v-model.trim="listQuery.companyId" placeholder="所在单位" clearable /> -->
         <!-- <dept-select v-model="listQuery.companyId" :need-top="false" placeholder="所在单位" /> -->
-        <el-select v-model="listQuery.companyId" filterable placeholder="所在单位">
+        <el-select v-model="listQuery.companyId" filterable placeholder="所在单位" clearable>
           <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </search-item>
       <search-item>
         <!-- <el-input v-model.trim="listQuery.deptId" placeholder="使用部门" clearable /> -->
         <!-- <dept-select v-model="listQuery.deptId" :need-top="false" placeholder="使用部门" /> -->
-        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门">
+        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门" clearable>
           <el-option v-for="item in deptList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </search-item>
       <search-item>
         <!-- <el-input v-model.trim="listQuery.subSystemId" placeholder="分系统" clearable /> -->
         <!-- <dept-select v-model="listQuery.subSystemId" :need-top="false" placeholder="分系统" /> -->
-        <el-select v-model="listQuery.subSystemId" filterable placeholder="分系统">
+        <el-select v-model="listQuery.subSystemId" filterable placeholder="分系统" clearable>
           <el-option v-for="item in systemList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </search-item>

diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue
index 19bd56a..5af6c7f 100644
--- a/src/views/tested/MeasurementBusiness/detection/index.vue
+++ b/src/views/tested/MeasurementBusiness/detection/index.vue
@@ -63,30 +63,6 @@
     total.value = parseInt(response.data.total)
     listLoading.value = false
   })
-  // list.value = [
-  //   {
-  //     createTime: '2023-09-05', // 创建时间
-  //     createUserId: '123', // 创建人id
-  //     createUserName: '张三', // 创建人名字
-  //     customerId: '123', // 委托方id
-  //     customerName: '李四', // 委托方名称
-  //     deviceModel: 'SQ001', // 送检设备型号
-  //     deviceName: '测试设备', // 送检设备名称
-  //     deviceNo: '112233', // 送检设备编号
-  //     id: '123', // id
-  //     labCode: '1', // 实验室代码
-  //     labCodeName: '海口实验室', // 实验室代码
-  //     noticeDate: '2023-09-05', // 通知日期
-  //     noticeName: '海口计量站', // 通知单名称
-  //     noticeNo: '12345', // 通知单编号
-  //     noticeUserId: '1', // 通知委托方用户id
-  //     noticeUserName: '王五', // 通知委托方用户名字
-  //     returnDate: '2023-09-05', // 寄回日期
-  //     submitDate: '2023-09-05', // 送检日期
-  //     updateTime: '2023-09-05', // 更新时间
-  //   },
-  // ]
-  // listLoading.value = false
 }
 fetchData()
 // 查询数据
@@ -157,6 +133,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>
@@ -166,7 +143,7 @@
       </template>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading" @change="changePage"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading" @change="changePage"
       >
         <template #columns>
           <el-table-column label="操作" width="160" align="center">
diff --git a/src/views/tested/MeasurementBusiness/notice/index.vue b/src/views/tested/MeasurementBusiness/notice/index.vue
index c6e4143..2d74eac 100644
--- a/src/views/tested/MeasurementBusiness/notice/index.vue
+++ b/src/views/tested/MeasurementBusiness/notice/index.vue
@@ -76,34 +76,6 @@
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     listLoading.value = false
-    // list.value = [
-    //   {
-    //     approvalStatus: '',
-    //     approvalStatusName: '',
-    //     contacts: '张三',
-    //     createTime: '2023-09-08',
-    //     createUserId: 0,
-    //     createUserName: '创建人',
-    //     customerId: 0,
-    //     customerName: '受检单位',
-    //     decisionItem: 0,
-    //     deviceName: '测试设备',
-    //     groupCode: '',
-    //     groupCodeName: '分组1',
-    //     id: 0,
-    //     labCode: '',
-    //     labCodeName: '',
-    //     mobile: '110',
-    //     noticeDate: '',
-    //     noticeName: '通知书1',
-    //     noticeNo: '123',
-    //     noticeUserId: '',
-    //     noticeUserName: '受检单位',
-    //     outsourcerName: '分包方1',
-    //     processId: '',
-    //     taskId: '',
-    //   },
-    // ]
   })
 }
 fetchData()
@@ -169,13 +141,14 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="申请开始时间" end-placeholder="申请结束时间"
+          clearable
         />
       </search-item>
     </search-area>
     <table-container>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
         :is-showmulti-select="true" @change="changePage"
       >
         <template #columns>
diff --git a/src/views/tested/MeasurementBusiness/opinion/index.vue b/src/views/tested/MeasurementBusiness/opinion/index.vue
index 96b0203..4054b67 100644
--- a/src/views/tested/MeasurementBusiness/opinion/index.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/index.vue
@@ -141,6 +141,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementBusiness/review/index.vue b/src/views/tested/MeasurementBusiness/review/index.vue
index ded9054..1aad1c4 100644
--- a/src/views/tested/MeasurementBusiness/review/index.vue
+++ b/src/views/tested/MeasurementBusiness/review/index.vue
@@ -144,6 +144,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/index.vue b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
index 393d9d5..23e45b8 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/index.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
@@ -113,6 +113,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="发送开始时间" end-placeholder="发送结束时间"
+          clearable
         />
       </search-item>
       <search-item>
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index 0e62a9f..f7390f9 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -145,6 +145,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>
@@ -154,7 +155,7 @@
       </template>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
         :is-showmulti-select="true" @change="changePage"
       >
         <template #columns>
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index f1db70f..6c30852 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -326,6 +326,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
index 0772b43..d109074 100644
--- a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
+++ b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
@@ -173,7 +173,7 @@
     <table-container>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery"
         :list-loading="listLoading" :is-showmulti-select="false" @change="changePage"
       >
         <template #preColumns>
diff --git a/src/views/tested/MeasurementPlan/plan/components/dataList.vue b/src/views/tested/MeasurementPlan/plan/components/dataList.vue
index ba725ef..f5db816 100644
--- a/src/views/tested/MeasurementPlan/plan/components/dataList.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/dataList.vue
@@ -66,6 +66,18 @@
     align: 'center',
   },
 ])
+const columnsAll = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '总计',
+    value: 'count',
+    align: 'center',
+  },
+])
 // 获取聚合表格数据
 const togetherLoading = ref(true)
 const togetherList = ref([])
@@ -115,7 +127,7 @@
   <detail-page class="base-info-device" title="计划列表">
     <!-- 展开行表格 -->
     <normal-table
-      class="nortable-header" :data=" [] " :total=" 0 " :columns=" columns " :options="
+      class="nortable-header" :data=" [] " :total=" 0 " :columns=" columnsAll as any " :options="
         {
           needIndex: false, // 是否需要序号列
           border: true, // 是否需要上方边框
@@ -126,15 +138,15 @@
       v-loading=" togetherLoading " :data=" togetherList " border style="width: 100%;"
       :row-key=" getRowKeys " :expand-row-keys=" expands " :show-header=" false " @expand-change=" expandChange "
     >
-      <el-table-column type="expand">
+      <el-table-column type="expand" width="38">
         <template #default="">
           <normal-table
-            :data=" expandList " :total=" 0 " :columns=" columns " :list-loading=" expandLoading " :options="
+            :data=" expandList " :total=" 0 " :columns=" columns as any " :list-loading=" expandLoading " :options="
               {
                 needIndex: false, // 是否需要序号列
                 border: true, // 是否需要上方边框
               }
-            " :pagination=" false " :is-showmulti-select=" true " :show-header=" false "
+            " :pagination=" false " :is-showmulti-select=" true "
           />
         </template>
       </el-table-column>
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 67d6b02..6aaca0b 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -245,6 +245,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
+          clearable
         />
       </search-item>
       <search-item>
diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue
index 4f3e9a9..5a21904 100644
--- a/src/views/tested/device/certificate/index.vue
+++ b/src/views/tested/device/certificate/index.vue
@@ -256,13 +256,13 @@
         <el-input v-model.trim="listQuery.manufactureNo" placeholder="出厂编号" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.companyId" filterable placeholder="所在单位">
+        <el-select v-model="listQuery.companyId" filterable placeholder="所在单位" clearable>
           <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </search-item>
       <search-item>
         <!-- <dept-select v-model="listQuery.deptIds" placeholder="使用部门" /> -->
-        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门">
+        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门" clearable>
           <el-option v-for="item in deptList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </search-item>
@@ -291,6 +291,7 @@
         <el-date-picker
           v-model="range" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
+          clearable
         />
       </search-item>
       <!-- <search-item>
diff --git a/src/views/tested/device/group/components/list.vue b/src/views/tested/device/group/components/list.vue
index 2ea7d85..12b13a4 100644
--- a/src/views/tested/device/group/components/list.vue
+++ b/src/views/tested/device/group/components/list.vue
@@ -240,21 +240,21 @@
       <search-item>
         <!-- <el-input v-model.trim="listQuery.companyId" placeholder="所在单位" clearable /> -->
         <!-- <dept-select v-model="listQuery.companyId" :need-top="false" placeholder="所在单位" /> -->
-        <el-select v-model="listQuery.companyId" filterable placeholder="所在单位">
+        <el-select v-model="listQuery.companyId" filterable placeholder="所在单位" clearable>
           <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </search-item>
       <search-item>
         <!-- <el-input v-model.trim="listQuery.deptId" placeholder="使用部门" clearable /> -->
         <!-- <dept-select v-model="listQuery.deptId" :need-top="false" placeholder="使用部门" /> -->
-        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门">
+        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门" clearable>
           <el-option v-for="item in deptList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </search-item>
       <search-item>
         <!-- <el-input v-model.trim="listQuery.subSystemId" placeholder="分系统" clearable /> -->
         <!-- <dept-select v-model="listQuery.subSystemId" :need-top="false" placeholder="分系统" /> -->
-        <el-select v-model="listQuery.subSystemId" filterable placeholder="分系统">
+        <el-select v-model="listQuery.subSystemId" filterable placeholder="分系统" clearable>
           <el-option v-for="item in systemList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </search-item>
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index e3124ad..e49461e 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -140,6 +140,47 @@
   deep: true,
 })
 const radio = ref('基本信息')
+// 生产日期和购进日期的验证
+const validateProductDate = (rule: any, value: any, callback: any) => {
+  if (value === '') {
+    callback()
+  }
+  else {
+    if (ruleForm.value.purchaseDate) {
+      const data = dayjs(ruleForm.value.purchaseDate).diff(dayjs(value))
+      if (data >= 0) {
+        callback()
+        ruleFormRef.value?.clearValidate('purchaseDate')
+      }
+      else {
+        callback(new Error('生产日期需在购进日期之前'))
+      }
+    }
+    else {
+      callback()
+    }
+  }
+}
+const validatePurchaseDate = (rule: any, value: any, callback: any) => {
+  if (value === '') {
+    callback()
+  }
+  else {
+    if (ruleForm.value.productDate) {
+      const data = dayjs(ruleForm.value.productDate).diff(dayjs(value))
+      if (data >= 0) {
+        callback(new Error('购进日期需在生产日期之后'))
+      }
+      else {
+        callback()
+        ruleFormRef.value?.clearValidate('productDate')
+      }
+    }
+    else {
+      callback()
+    }
+  }
+}
 // 表单1验证规则
 const rules = ref<FormRules>({
   equipmentName: [{ required: true, message: '设备名称必填', trigger: ['blur', 'change'] }],
@@ -149,9 +190,9 @@
   productCountry: [{ required: true, message: '生产国家必填', trigger: ['blur', 'change'] }],
   manufacturer: [{ required: true, message: '生产厂家必填', trigger: ['blur', 'change'] }],
   manufactureNo: [{ required: true, message: '生产编号必填', trigger: ['blur', 'change'] }],
-  // productDate: [{ required: true, message: '生产日期必选', trigger: ['blur', 'change'] }],
+  productDate: [{ trigger: ['blur', 'change'], validator: validateProductDate }],
   // unitPrice: [{ required: true, message: '设备单价必填', trigger: ['blur', 'change'] }],
-  // purchaseDate: [{ required: true, message: '购进日期必选', trigger: ['blur', 'change'] }],
+  purchaseDate: [{ trigger: ['blur', 'change'], validator: validatePurchaseDate }],
   model: [{ required: true, message: '规格型号必填', trigger: ['blur', 'change'] }],
   // helpInstruction: [{ required: true, message: '辅助字段必选', trigger: ['blur', 'change'] }],
   qualityCondition: [{ required: true, message: '质量状况必填', trigger: ['blur', 'change'] }],

diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue
index 19bd56a..5af6c7f 100644
--- a/src/views/tested/MeasurementBusiness/detection/index.vue
+++ b/src/views/tested/MeasurementBusiness/detection/index.vue
@@ -63,30 +63,6 @@
     total.value = parseInt(response.data.total)
     listLoading.value = false
   })
-  // list.value = [
-  //   {
-  //     createTime: '2023-09-05', // 创建时间
-  //     createUserId: '123', // 创建人id
-  //     createUserName: '张三', // 创建人名字
-  //     customerId: '123', // 委托方id
-  //     customerName: '李四', // 委托方名称
-  //     deviceModel: 'SQ001', // 送检设备型号
-  //     deviceName: '测试设备', // 送检设备名称
-  //     deviceNo: '112233', // 送检设备编号
-  //     id: '123', // id
-  //     labCode: '1', // 实验室代码
-  //     labCodeName: '海口实验室', // 实验室代码
-  //     noticeDate: '2023-09-05', // 通知日期
-  //     noticeName: '海口计量站', // 通知单名称
-  //     noticeNo: '12345', // 通知单编号
-  //     noticeUserId: '1', // 通知委托方用户id
-  //     noticeUserName: '王五', // 通知委托方用户名字
-  //     returnDate: '2023-09-05', // 寄回日期
-  //     submitDate: '2023-09-05', // 送检日期
-  //     updateTime: '2023-09-05', // 更新时间
-  //   },
-  // ]
-  // listLoading.value = false
 }
 fetchData()
 // 查询数据
@@ -157,6 +133,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>
@@ -166,7 +143,7 @@
       </template>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading" @change="changePage"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading" @change="changePage"
       >
         <template #columns>
           <el-table-column label="操作" width="160" align="center">
diff --git a/src/views/tested/MeasurementBusiness/notice/index.vue b/src/views/tested/MeasurementBusiness/notice/index.vue
index c6e4143..2d74eac 100644
--- a/src/views/tested/MeasurementBusiness/notice/index.vue
+++ b/src/views/tested/MeasurementBusiness/notice/index.vue
@@ -76,34 +76,6 @@
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     listLoading.value = false
-    // list.value = [
-    //   {
-    //     approvalStatus: '',
-    //     approvalStatusName: '',
-    //     contacts: '张三',
-    //     createTime: '2023-09-08',
-    //     createUserId: 0,
-    //     createUserName: '创建人',
-    //     customerId: 0,
-    //     customerName: '受检单位',
-    //     decisionItem: 0,
-    //     deviceName: '测试设备',
-    //     groupCode: '',
-    //     groupCodeName: '分组1',
-    //     id: 0,
-    //     labCode: '',
-    //     labCodeName: '',
-    //     mobile: '110',
-    //     noticeDate: '',
-    //     noticeName: '通知书1',
-    //     noticeNo: '123',
-    //     noticeUserId: '',
-    //     noticeUserName: '受检单位',
-    //     outsourcerName: '分包方1',
-    //     processId: '',
-    //     taskId: '',
-    //   },
-    // ]
   })
 }
 fetchData()
@@ -169,13 +141,14 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="申请开始时间" end-placeholder="申请结束时间"
+          clearable
         />
       </search-item>
     </search-area>
     <table-container>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
         :is-showmulti-select="true" @change="changePage"
       >
         <template #columns>
diff --git a/src/views/tested/MeasurementBusiness/opinion/index.vue b/src/views/tested/MeasurementBusiness/opinion/index.vue
index 96b0203..4054b67 100644
--- a/src/views/tested/MeasurementBusiness/opinion/index.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/index.vue
@@ -141,6 +141,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementBusiness/review/index.vue b/src/views/tested/MeasurementBusiness/review/index.vue
index ded9054..1aad1c4 100644
--- a/src/views/tested/MeasurementBusiness/review/index.vue
+++ b/src/views/tested/MeasurementBusiness/review/index.vue
@@ -144,6 +144,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/index.vue b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
index 393d9d5..23e45b8 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/index.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
@@ -113,6 +113,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="发送开始时间" end-placeholder="发送结束时间"
+          clearable
         />
       </search-item>
       <search-item>
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index 0e62a9f..f7390f9 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -145,6 +145,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>
@@ -154,7 +155,7 @@
       </template>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
         :is-showmulti-select="true" @change="changePage"
       >
         <template #columns>
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index f1db70f..6c30852 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -326,6 +326,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
index 0772b43..d109074 100644
--- a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
+++ b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
@@ -173,7 +173,7 @@
     <table-container>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery"
         :list-loading="listLoading" :is-showmulti-select="false" @change="changePage"
       >
         <template #preColumns>
diff --git a/src/views/tested/MeasurementPlan/plan/components/dataList.vue b/src/views/tested/MeasurementPlan/plan/components/dataList.vue
index ba725ef..f5db816 100644
--- a/src/views/tested/MeasurementPlan/plan/components/dataList.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/dataList.vue
@@ -66,6 +66,18 @@
     align: 'center',
   },
 ])
+const columnsAll = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '总计',
+    value: 'count',
+    align: 'center',
+  },
+])
 // 获取聚合表格数据
 const togetherLoading = ref(true)
 const togetherList = ref([])
@@ -115,7 +127,7 @@
   <detail-page class="base-info-device" title="计划列表">
     <!-- 展开行表格 -->
     <normal-table
-      class="nortable-header" :data=" [] " :total=" 0 " :columns=" columns " :options="
+      class="nortable-header" :data=" [] " :total=" 0 " :columns=" columnsAll as any " :options="
         {
           needIndex: false, // 是否需要序号列
           border: true, // 是否需要上方边框
@@ -126,15 +138,15 @@
       v-loading=" togetherLoading " :data=" togetherList " border style="width: 100%;"
       :row-key=" getRowKeys " :expand-row-keys=" expands " :show-header=" false " @expand-change=" expandChange "
     >
-      <el-table-column type="expand">
+      <el-table-column type="expand" width="38">
         <template #default="">
           <normal-table
-            :data=" expandList " :total=" 0 " :columns=" columns " :list-loading=" expandLoading " :options="
+            :data=" expandList " :total=" 0 " :columns=" columns as any " :list-loading=" expandLoading " :options="
               {
                 needIndex: false, // 是否需要序号列
                 border: true, // 是否需要上方边框
               }
-            " :pagination=" false " :is-showmulti-select=" true " :show-header=" false "
+            " :pagination=" false " :is-showmulti-select=" true "
           />
         </template>
       </el-table-column>
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 67d6b02..6aaca0b 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -245,6 +245,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
+          clearable
         />
       </search-item>
       <search-item>
diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue
index 4f3e9a9..5a21904 100644
--- a/src/views/tested/device/certificate/index.vue
+++ b/src/views/tested/device/certificate/index.vue
@@ -256,13 +256,13 @@
         <el-input v-model.trim="listQuery.manufactureNo" placeholder="出厂编号" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.companyId" filterable placeholder="所在单位">
+        <el-select v-model="listQuery.companyId" filterable placeholder="所在单位" clearable>
           <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </search-item>
       <search-item>
         <!-- <dept-select v-model="listQuery.deptIds" placeholder="使用部门" /> -->
-        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门">
+        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门" clearable>
           <el-option v-for="item in deptList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </search-item>
@@ -291,6 +291,7 @@
         <el-date-picker
           v-model="range" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
+          clearable
         />
       </search-item>
       <!-- <search-item>
diff --git a/src/views/tested/device/group/components/list.vue b/src/views/tested/device/group/components/list.vue
index 2ea7d85..12b13a4 100644
--- a/src/views/tested/device/group/components/list.vue
+++ b/src/views/tested/device/group/components/list.vue
@@ -240,21 +240,21 @@
       <search-item>
         <!-- <el-input v-model.trim="listQuery.companyId" placeholder="所在单位" clearable /> -->
         <!-- <dept-select v-model="listQuery.companyId" :need-top="false" placeholder="所在单位" /> -->
-        <el-select v-model="listQuery.companyId" filterable placeholder="所在单位">
+        <el-select v-model="listQuery.companyId" filterable placeholder="所在单位" clearable>
           <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </search-item>
       <search-item>
         <!-- <el-input v-model.trim="listQuery.deptId" placeholder="使用部门" clearable /> -->
         <!-- <dept-select v-model="listQuery.deptId" :need-top="false" placeholder="使用部门" /> -->
-        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门">
+        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门" clearable>
           <el-option v-for="item in deptList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </search-item>
       <search-item>
         <!-- <el-input v-model.trim="listQuery.subSystemId" placeholder="分系统" clearable /> -->
         <!-- <dept-select v-model="listQuery.subSystemId" :need-top="false" placeholder="分系统" /> -->
-        <el-select v-model="listQuery.subSystemId" filterable placeholder="分系统">
+        <el-select v-model="listQuery.subSystemId" filterable placeholder="分系统" clearable>
           <el-option v-for="item in systemList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </search-item>
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index e3124ad..e49461e 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -140,6 +140,47 @@
   deep: true,
 })
 const radio = ref('基本信息')
+// 生产日期和购进日期的验证
+const validateProductDate = (rule: any, value: any, callback: any) => {
+  if (value === '') {
+    callback()
+  }
+  else {
+    if (ruleForm.value.purchaseDate) {
+      const data = dayjs(ruleForm.value.purchaseDate).diff(dayjs(value))
+      if (data >= 0) {
+        callback()
+        ruleFormRef.value?.clearValidate('purchaseDate')
+      }
+      else {
+        callback(new Error('生产日期需在购进日期之前'))
+      }
+    }
+    else {
+      callback()
+    }
+  }
+}
+const validatePurchaseDate = (rule: any, value: any, callback: any) => {
+  if (value === '') {
+    callback()
+  }
+  else {
+    if (ruleForm.value.productDate) {
+      const data = dayjs(ruleForm.value.productDate).diff(dayjs(value))
+      if (data >= 0) {
+        callback(new Error('购进日期需在生产日期之后'))
+      }
+      else {
+        callback()
+        ruleFormRef.value?.clearValidate('productDate')
+      }
+    }
+    else {
+      callback()
+    }
+  }
+}
 // 表单1验证规则
 const rules = ref<FormRules>({
   equipmentName: [{ required: true, message: '设备名称必填', trigger: ['blur', 'change'] }],
@@ -149,9 +190,9 @@
   productCountry: [{ required: true, message: '生产国家必填', trigger: ['blur', 'change'] }],
   manufacturer: [{ required: true, message: '生产厂家必填', trigger: ['blur', 'change'] }],
   manufactureNo: [{ required: true, message: '生产编号必填', trigger: ['blur', 'change'] }],
-  // productDate: [{ required: true, message: '生产日期必选', trigger: ['blur', 'change'] }],
+  productDate: [{ trigger: ['blur', 'change'], validator: validateProductDate }],
   // unitPrice: [{ required: true, message: '设备单价必填', trigger: ['blur', 'change'] }],
-  // purchaseDate: [{ required: true, message: '购进日期必选', trigger: ['blur', 'change'] }],
+  purchaseDate: [{ trigger: ['blur', 'change'], validator: validatePurchaseDate }],
   model: [{ required: true, message: '规格型号必填', trigger: ['blur', 'change'] }],
   // helpInstruction: [{ required: true, message: '辅助字段必选', trigger: ['blur', 'change'] }],
   qualityCondition: [{ required: true, message: '质量状况必填', trigger: ['blur', 'change'] }],
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index a485c9d..01bc5ec 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -974,12 +974,12 @@
         <el-input v-model.trim="listQuery.equipmentNo" placeholder="统一编号" clearable />
       </search-item> -->
       <search-item>
-        <el-select v-model.trim="listQuery.equipmentName" filterable placeholder="设备名称">
+        <el-select v-model.trim="listQuery.equipmentName" clearable filterable placeholder="设备名称">
           <el-option v-for="(item, index) in deviceNameList" :key="index" :label="item" :value="item" />
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model.trim="listQuery.model" filterable placeholder="规格型号">
+        <el-select v-model.trim="listQuery.model" clearable filterable placeholder="规格型号">
           <el-option v-for="item in modelList" :key="item" :label="item" :value="item" />
         </el-select>
       </search-item>
@@ -991,13 +991,13 @@
       </search-item>
       <search-item>
         <!-- <dept-select v-model="listQuery.companyId" :need-top="false" placeholder="所在单位" /> -->
-        <el-select v-model="listQuery.companyId" filterable placeholder="所在单位">
+        <el-select v-model="listQuery.companyId" clearable filterable placeholder="所在单位">
           <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </search-item>
       <search-item>
         <!-- <dept-select v-model="listQuery.deptIds" :need-top="false" placeholder="使用部门" /> -->
-        <el-select v-model="listQuery.deptIds" filterable placeholder="使用部门">
+        <el-select v-model="listQuery.deptIds" clearable filterable placeholder="使用部门">
           <el-option v-for="item in deptList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </search-item>
@@ -1013,7 +1013,7 @@
       </template>
       <span v-show="!searchMore">
         <search-item>
-          <el-select v-model="listQuery.meterIdentify" placeholder="计量标识">
+          <el-select v-model="listQuery.meterIdentify" clearable placeholder="计量标识">
             <el-option v-for="item in meterIdentifyList" :key="item.value" :label="item.name" :value="item.value" />
           </el-select>
         </search-item>
@@ -1022,7 +1022,7 @@
         </search-item>
         <search-item>
           <!-- <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable /> -->
-          <el-select v-model="listQuery.directorName" filterable placeholder="负责人" style="width: 100%;">
+          <el-select v-model="listQuery.directorName" clearable filterable placeholder="负责人" style="width: 100%;">
             <el-option v-for="(item) in userList" :key="item.id" :label="item.name" :value="item.name">
               <span style="float: left;">{{ item.name }}</span>
               <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.deptName }}</span>
@@ -1042,34 +1042,34 @@
           />
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.usageStatus" placeholder="使用状态">
+          <el-select v-model="listQuery.usageStatus" clearable placeholder="使用状态">
             <el-option v-for="item in useStatusList" :key="item.value" :label="item.name" :value="item.value" />
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.useSign" placeholder="在用信息">
+          <el-select v-model="listQuery.useSign" clearable placeholder="在用信息">
             <el-option v-for="item in inUseList" :key="item.value" :label="item.name" :value="item.value" />
           </el-select>
         </search-item>
         <search-item>
           <!-- <el-input v-model.trim="listQuery.usePosition" placeholder="使用岗位" clearable /> -->
-          <el-select v-model="listQuery.usePositionId" placeholder="使用岗位">
+          <el-select v-model="listQuery.usePositionId" clearable placeholder="使用岗位">
             <el-option v-for="item in usePositionList" :key="item.id" :label="item.positionName" :value="item.id" />
           </el-select>
         </search-item>
         <search-item>
           <!-- <el-input v-model.trim="listQuery.installLocation" placeholder="安装位置" clearable /> -->
-          <el-select v-model="listQuery.installLocation" placeholder="安装位置">
+          <el-select v-model="listQuery.installLocation" clearable placeholder="安装位置">
             <el-option v-for="item in installLocationList" :key="item.id" :label="item.installLocation" :value="item.id" />
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.taskId" placeholder="参试任务">
+          <el-select v-model="listQuery.taskId" clearable placeholder="参试任务">
             <el-option v-for="item in taskList" :key="item.value" :label="item.name" :value="item.value" />
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.groupId" placeholder="分组">
+          <el-select v-model="listQuery.groupId" clearable placeholder="分组">
             <el-option v-for="item in groupList" :key="item.value" :label="item.name" :value="item.value" />
           </el-select>
           <!-- <el-input v-model.trim="listQuery.groupId" placeholder="分组" clearable /> -->

diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue
index 19bd56a..5af6c7f 100644
--- a/src/views/tested/MeasurementBusiness/detection/index.vue
+++ b/src/views/tested/MeasurementBusiness/detection/index.vue
@@ -63,30 +63,6 @@
     total.value = parseInt(response.data.total)
     listLoading.value = false
   })
-  // list.value = [
-  //   {
-  //     createTime: '2023-09-05', // 创建时间
-  //     createUserId: '123', // 创建人id
-  //     createUserName: '张三', // 创建人名字
-  //     customerId: '123', // 委托方id
-  //     customerName: '李四', // 委托方名称
-  //     deviceModel: 'SQ001', // 送检设备型号
-  //     deviceName: '测试设备', // 送检设备名称
-  //     deviceNo: '112233', // 送检设备编号
-  //     id: '123', // id
-  //     labCode: '1', // 实验室代码
-  //     labCodeName: '海口实验室', // 实验室代码
-  //     noticeDate: '2023-09-05', // 通知日期
-  //     noticeName: '海口计量站', // 通知单名称
-  //     noticeNo: '12345', // 通知单编号
-  //     noticeUserId: '1', // 通知委托方用户id
-  //     noticeUserName: '王五', // 通知委托方用户名字
-  //     returnDate: '2023-09-05', // 寄回日期
-  //     submitDate: '2023-09-05', // 送检日期
-  //     updateTime: '2023-09-05', // 更新时间
-  //   },
-  // ]
-  // listLoading.value = false
 }
 fetchData()
 // 查询数据
@@ -157,6 +133,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>
@@ -166,7 +143,7 @@
       </template>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading" @change="changePage"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading" @change="changePage"
       >
         <template #columns>
           <el-table-column label="操作" width="160" align="center">
diff --git a/src/views/tested/MeasurementBusiness/notice/index.vue b/src/views/tested/MeasurementBusiness/notice/index.vue
index c6e4143..2d74eac 100644
--- a/src/views/tested/MeasurementBusiness/notice/index.vue
+++ b/src/views/tested/MeasurementBusiness/notice/index.vue
@@ -76,34 +76,6 @@
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     listLoading.value = false
-    // list.value = [
-    //   {
-    //     approvalStatus: '',
-    //     approvalStatusName: '',
-    //     contacts: '张三',
-    //     createTime: '2023-09-08',
-    //     createUserId: 0,
-    //     createUserName: '创建人',
-    //     customerId: 0,
-    //     customerName: '受检单位',
-    //     decisionItem: 0,
-    //     deviceName: '测试设备',
-    //     groupCode: '',
-    //     groupCodeName: '分组1',
-    //     id: 0,
-    //     labCode: '',
-    //     labCodeName: '',
-    //     mobile: '110',
-    //     noticeDate: '',
-    //     noticeName: '通知书1',
-    //     noticeNo: '123',
-    //     noticeUserId: '',
-    //     noticeUserName: '受检单位',
-    //     outsourcerName: '分包方1',
-    //     processId: '',
-    //     taskId: '',
-    //   },
-    // ]
   })
 }
 fetchData()
@@ -169,13 +141,14 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="申请开始时间" end-placeholder="申请结束时间"
+          clearable
         />
       </search-item>
     </search-area>
     <table-container>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
         :is-showmulti-select="true" @change="changePage"
       >
         <template #columns>
diff --git a/src/views/tested/MeasurementBusiness/opinion/index.vue b/src/views/tested/MeasurementBusiness/opinion/index.vue
index 96b0203..4054b67 100644
--- a/src/views/tested/MeasurementBusiness/opinion/index.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/index.vue
@@ -141,6 +141,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementBusiness/review/index.vue b/src/views/tested/MeasurementBusiness/review/index.vue
index ded9054..1aad1c4 100644
--- a/src/views/tested/MeasurementBusiness/review/index.vue
+++ b/src/views/tested/MeasurementBusiness/review/index.vue
@@ -144,6 +144,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/index.vue b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
index 393d9d5..23e45b8 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/index.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
@@ -113,6 +113,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="发送开始时间" end-placeholder="发送结束时间"
+          clearable
         />
       </search-item>
       <search-item>
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index 0e62a9f..f7390f9 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -145,6 +145,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>
@@ -154,7 +155,7 @@
       </template>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
         :is-showmulti-select="true" @change="changePage"
       >
         <template #columns>
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index f1db70f..6c30852 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -326,6 +326,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
index 0772b43..d109074 100644
--- a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
+++ b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
@@ -173,7 +173,7 @@
     <table-container>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery"
         :list-loading="listLoading" :is-showmulti-select="false" @change="changePage"
       >
         <template #preColumns>
diff --git a/src/views/tested/MeasurementPlan/plan/components/dataList.vue b/src/views/tested/MeasurementPlan/plan/components/dataList.vue
index ba725ef..f5db816 100644
--- a/src/views/tested/MeasurementPlan/plan/components/dataList.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/dataList.vue
@@ -66,6 +66,18 @@
     align: 'center',
   },
 ])
+const columnsAll = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '总计',
+    value: 'count',
+    align: 'center',
+  },
+])
 // 获取聚合表格数据
 const togetherLoading = ref(true)
 const togetherList = ref([])
@@ -115,7 +127,7 @@
   <detail-page class="base-info-device" title="计划列表">
     <!-- 展开行表格 -->
     <normal-table
-      class="nortable-header" :data=" [] " :total=" 0 " :columns=" columns " :options="
+      class="nortable-header" :data=" [] " :total=" 0 " :columns=" columnsAll as any " :options="
         {
           needIndex: false, // 是否需要序号列
           border: true, // 是否需要上方边框
@@ -126,15 +138,15 @@
       v-loading=" togetherLoading " :data=" togetherList " border style="width: 100%;"
       :row-key=" getRowKeys " :expand-row-keys=" expands " :show-header=" false " @expand-change=" expandChange "
     >
-      <el-table-column type="expand">
+      <el-table-column type="expand" width="38">
         <template #default="">
           <normal-table
-            :data=" expandList " :total=" 0 " :columns=" columns " :list-loading=" expandLoading " :options="
+            :data=" expandList " :total=" 0 " :columns=" columns as any " :list-loading=" expandLoading " :options="
               {
                 needIndex: false, // 是否需要序号列
                 border: true, // 是否需要上方边框
               }
-            " :pagination=" false " :is-showmulti-select=" true " :show-header=" false "
+            " :pagination=" false " :is-showmulti-select=" true "
           />
         </template>
       </el-table-column>
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 67d6b02..6aaca0b 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -245,6 +245,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
+          clearable
         />
       </search-item>
       <search-item>
diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue
index 4f3e9a9..5a21904 100644
--- a/src/views/tested/device/certificate/index.vue
+++ b/src/views/tested/device/certificate/index.vue
@@ -256,13 +256,13 @@
         <el-input v-model.trim="listQuery.manufactureNo" placeholder="出厂编号" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.companyId" filterable placeholder="所在单位">
+        <el-select v-model="listQuery.companyId" filterable placeholder="所在单位" clearable>
           <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </search-item>
       <search-item>
         <!-- <dept-select v-model="listQuery.deptIds" placeholder="使用部门" /> -->
-        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门">
+        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门" clearable>
           <el-option v-for="item in deptList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </search-item>
@@ -291,6 +291,7 @@
         <el-date-picker
           v-model="range" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
+          clearable
         />
       </search-item>
       <!-- <search-item>
diff --git a/src/views/tested/device/group/components/list.vue b/src/views/tested/device/group/components/list.vue
index 2ea7d85..12b13a4 100644
--- a/src/views/tested/device/group/components/list.vue
+++ b/src/views/tested/device/group/components/list.vue
@@ -240,21 +240,21 @@
       <search-item>
         <!-- <el-input v-model.trim="listQuery.companyId" placeholder="所在单位" clearable /> -->
         <!-- <dept-select v-model="listQuery.companyId" :need-top="false" placeholder="所在单位" /> -->
-        <el-select v-model="listQuery.companyId" filterable placeholder="所在单位">
+        <el-select v-model="listQuery.companyId" filterable placeholder="所在单位" clearable>
           <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </search-item>
       <search-item>
         <!-- <el-input v-model.trim="listQuery.deptId" placeholder="使用部门" clearable /> -->
         <!-- <dept-select v-model="listQuery.deptId" :need-top="false" placeholder="使用部门" /> -->
-        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门">
+        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门" clearable>
           <el-option v-for="item in deptList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </search-item>
       <search-item>
         <!-- <el-input v-model.trim="listQuery.subSystemId" placeholder="分系统" clearable /> -->
         <!-- <dept-select v-model="listQuery.subSystemId" :need-top="false" placeholder="分系统" /> -->
-        <el-select v-model="listQuery.subSystemId" filterable placeholder="分系统">
+        <el-select v-model="listQuery.subSystemId" filterable placeholder="分系统" clearable>
           <el-option v-for="item in systemList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </search-item>
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index e3124ad..e49461e 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -140,6 +140,47 @@
   deep: true,
 })
 const radio = ref('基本信息')
+// 生产日期和购进日期的验证
+const validateProductDate = (rule: any, value: any, callback: any) => {
+  if (value === '') {
+    callback()
+  }
+  else {
+    if (ruleForm.value.purchaseDate) {
+      const data = dayjs(ruleForm.value.purchaseDate).diff(dayjs(value))
+      if (data >= 0) {
+        callback()
+        ruleFormRef.value?.clearValidate('purchaseDate')
+      }
+      else {
+        callback(new Error('生产日期需在购进日期之前'))
+      }
+    }
+    else {
+      callback()
+    }
+  }
+}
+const validatePurchaseDate = (rule: any, value: any, callback: any) => {
+  if (value === '') {
+    callback()
+  }
+  else {
+    if (ruleForm.value.productDate) {
+      const data = dayjs(ruleForm.value.productDate).diff(dayjs(value))
+      if (data >= 0) {
+        callback(new Error('购进日期需在生产日期之后'))
+      }
+      else {
+        callback()
+        ruleFormRef.value?.clearValidate('productDate')
+      }
+    }
+    else {
+      callback()
+    }
+  }
+}
 // 表单1验证规则
 const rules = ref<FormRules>({
   equipmentName: [{ required: true, message: '设备名称必填', trigger: ['blur', 'change'] }],
@@ -149,9 +190,9 @@
   productCountry: [{ required: true, message: '生产国家必填', trigger: ['blur', 'change'] }],
   manufacturer: [{ required: true, message: '生产厂家必填', trigger: ['blur', 'change'] }],
   manufactureNo: [{ required: true, message: '生产编号必填', trigger: ['blur', 'change'] }],
-  // productDate: [{ required: true, message: '生产日期必选', trigger: ['blur', 'change'] }],
+  productDate: [{ trigger: ['blur', 'change'], validator: validateProductDate }],
   // unitPrice: [{ required: true, message: '设备单价必填', trigger: ['blur', 'change'] }],
-  // purchaseDate: [{ required: true, message: '购进日期必选', trigger: ['blur', 'change'] }],
+  purchaseDate: [{ trigger: ['blur', 'change'], validator: validatePurchaseDate }],
   model: [{ required: true, message: '规格型号必填', trigger: ['blur', 'change'] }],
   // helpInstruction: [{ required: true, message: '辅助字段必选', trigger: ['blur', 'change'] }],
   qualityCondition: [{ required: true, message: '质量状况必填', trigger: ['blur', 'change'] }],
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index a485c9d..01bc5ec 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -974,12 +974,12 @@
         <el-input v-model.trim="listQuery.equipmentNo" placeholder="统一编号" clearable />
       </search-item> -->
       <search-item>
-        <el-select v-model.trim="listQuery.equipmentName" filterable placeholder="设备名称">
+        <el-select v-model.trim="listQuery.equipmentName" clearable filterable placeholder="设备名称">
           <el-option v-for="(item, index) in deviceNameList" :key="index" :label="item" :value="item" />
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model.trim="listQuery.model" filterable placeholder="规格型号">
+        <el-select v-model.trim="listQuery.model" clearable filterable placeholder="规格型号">
           <el-option v-for="item in modelList" :key="item" :label="item" :value="item" />
         </el-select>
       </search-item>
@@ -991,13 +991,13 @@
       </search-item>
       <search-item>
         <!-- <dept-select v-model="listQuery.companyId" :need-top="false" placeholder="所在单位" /> -->
-        <el-select v-model="listQuery.companyId" filterable placeholder="所在单位">
+        <el-select v-model="listQuery.companyId" clearable filterable placeholder="所在单位">
           <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </search-item>
       <search-item>
         <!-- <dept-select v-model="listQuery.deptIds" :need-top="false" placeholder="使用部门" /> -->
-        <el-select v-model="listQuery.deptIds" filterable placeholder="使用部门">
+        <el-select v-model="listQuery.deptIds" clearable filterable placeholder="使用部门">
           <el-option v-for="item in deptList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </search-item>
@@ -1013,7 +1013,7 @@
       </template>
       <span v-show="!searchMore">
         <search-item>
-          <el-select v-model="listQuery.meterIdentify" placeholder="计量标识">
+          <el-select v-model="listQuery.meterIdentify" clearable placeholder="计量标识">
             <el-option v-for="item in meterIdentifyList" :key="item.value" :label="item.name" :value="item.value" />
           </el-select>
         </search-item>
@@ -1022,7 +1022,7 @@
         </search-item>
         <search-item>
           <!-- <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable /> -->
-          <el-select v-model="listQuery.directorName" filterable placeholder="负责人" style="width: 100%;">
+          <el-select v-model="listQuery.directorName" clearable filterable placeholder="负责人" style="width: 100%;">
             <el-option v-for="(item) in userList" :key="item.id" :label="item.name" :value="item.name">
               <span style="float: left;">{{ item.name }}</span>
               <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.deptName }}</span>
@@ -1042,34 +1042,34 @@
           />
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.usageStatus" placeholder="使用状态">
+          <el-select v-model="listQuery.usageStatus" clearable placeholder="使用状态">
             <el-option v-for="item in useStatusList" :key="item.value" :label="item.name" :value="item.value" />
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.useSign" placeholder="在用信息">
+          <el-select v-model="listQuery.useSign" clearable placeholder="在用信息">
             <el-option v-for="item in inUseList" :key="item.value" :label="item.name" :value="item.value" />
           </el-select>
         </search-item>
         <search-item>
           <!-- <el-input v-model.trim="listQuery.usePosition" placeholder="使用岗位" clearable /> -->
-          <el-select v-model="listQuery.usePositionId" placeholder="使用岗位">
+          <el-select v-model="listQuery.usePositionId" clearable placeholder="使用岗位">
             <el-option v-for="item in usePositionList" :key="item.id" :label="item.positionName" :value="item.id" />
           </el-select>
         </search-item>
         <search-item>
           <!-- <el-input v-model.trim="listQuery.installLocation" placeholder="安装位置" clearable /> -->
-          <el-select v-model="listQuery.installLocation" placeholder="安装位置">
+          <el-select v-model="listQuery.installLocation" clearable placeholder="安装位置">
             <el-option v-for="item in installLocationList" :key="item.id" :label="item.installLocation" :value="item.id" />
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.taskId" placeholder="参试任务">
+          <el-select v-model="listQuery.taskId" clearable placeholder="参试任务">
             <el-option v-for="item in taskList" :key="item.value" :label="item.name" :value="item.value" />
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.groupId" placeholder="分组">
+          <el-select v-model="listQuery.groupId" clearable placeholder="分组">
             <el-option v-for="item in groupList" :key="item.value" :label="item.name" :value="item.value" />
           </el-select>
           <!-- <el-input v-model.trim="listQuery.groupId" placeholder="分组" clearable /> -->
diff --git a/src/views/tested/device/remind/index.vue b/src/views/tested/device/remind/index.vue
index 69f8764..b981cee 100644
--- a/src/views/tested/device/remind/index.vue
+++ b/src/views/tested/device/remind/index.vue
@@ -354,7 +354,7 @@
       </search-item> -->
       <search-item>
         <!-- <dept-select v-model="listQuery.deptIds" placeholder="使用部门" /> -->
-        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门" style="width: 100%;">
+        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门" style="width: 100%;" clearable>
           <el-option v-for="item in deptList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </search-item>
@@ -377,6 +377,7 @@
           placeholder="证书有效期开始时间"
           value-format="YYYY-MM-DD 00:00:00"
           format="YYYY-MM-DD"
+          clearable
         />
       </search-item>
       <search-item>
@@ -386,6 +387,7 @@
           placeholder="证书有效期结束时间"
           value-format="YYYY-MM-DD 23:59:59"
           format="YYYY-MM-DD"
+          clearable
         />
       </search-item>
       <search-item>
@@ -417,6 +419,7 @@
         <el-date-picker
           v-model="datetimerange1" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="参试任务开始时间" end-placeholder="参试任务结束时间"
+          clearable
         />
       </search-item>
     </search-area>

diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue
index 19bd56a..5af6c7f 100644
--- a/src/views/tested/MeasurementBusiness/detection/index.vue
+++ b/src/views/tested/MeasurementBusiness/detection/index.vue
@@ -63,30 +63,6 @@
     total.value = parseInt(response.data.total)
     listLoading.value = false
   })
-  // list.value = [
-  //   {
-  //     createTime: '2023-09-05', // 创建时间
-  //     createUserId: '123', // 创建人id
-  //     createUserName: '张三', // 创建人名字
-  //     customerId: '123', // 委托方id
-  //     customerName: '李四', // 委托方名称
-  //     deviceModel: 'SQ001', // 送检设备型号
-  //     deviceName: '测试设备', // 送检设备名称
-  //     deviceNo: '112233', // 送检设备编号
-  //     id: '123', // id
-  //     labCode: '1', // 实验室代码
-  //     labCodeName: '海口实验室', // 实验室代码
-  //     noticeDate: '2023-09-05', // 通知日期
-  //     noticeName: '海口计量站', // 通知单名称
-  //     noticeNo: '12345', // 通知单编号
-  //     noticeUserId: '1', // 通知委托方用户id
-  //     noticeUserName: '王五', // 通知委托方用户名字
-  //     returnDate: '2023-09-05', // 寄回日期
-  //     submitDate: '2023-09-05', // 送检日期
-  //     updateTime: '2023-09-05', // 更新时间
-  //   },
-  // ]
-  // listLoading.value = false
 }
 fetchData()
 // 查询数据
@@ -157,6 +133,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>
@@ -166,7 +143,7 @@
       </template>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading" @change="changePage"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading" @change="changePage"
       >
         <template #columns>
           <el-table-column label="操作" width="160" align="center">
diff --git a/src/views/tested/MeasurementBusiness/notice/index.vue b/src/views/tested/MeasurementBusiness/notice/index.vue
index c6e4143..2d74eac 100644
--- a/src/views/tested/MeasurementBusiness/notice/index.vue
+++ b/src/views/tested/MeasurementBusiness/notice/index.vue
@@ -76,34 +76,6 @@
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     listLoading.value = false
-    // list.value = [
-    //   {
-    //     approvalStatus: '',
-    //     approvalStatusName: '',
-    //     contacts: '张三',
-    //     createTime: '2023-09-08',
-    //     createUserId: 0,
-    //     createUserName: '创建人',
-    //     customerId: 0,
-    //     customerName: '受检单位',
-    //     decisionItem: 0,
-    //     deviceName: '测试设备',
-    //     groupCode: '',
-    //     groupCodeName: '分组1',
-    //     id: 0,
-    //     labCode: '',
-    //     labCodeName: '',
-    //     mobile: '110',
-    //     noticeDate: '',
-    //     noticeName: '通知书1',
-    //     noticeNo: '123',
-    //     noticeUserId: '',
-    //     noticeUserName: '受检单位',
-    //     outsourcerName: '分包方1',
-    //     processId: '',
-    //     taskId: '',
-    //   },
-    // ]
   })
 }
 fetchData()
@@ -169,13 +141,14 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="申请开始时间" end-placeholder="申请结束时间"
+          clearable
         />
       </search-item>
     </search-area>
     <table-container>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
         :is-showmulti-select="true" @change="changePage"
       >
         <template #columns>
diff --git a/src/views/tested/MeasurementBusiness/opinion/index.vue b/src/views/tested/MeasurementBusiness/opinion/index.vue
index 96b0203..4054b67 100644
--- a/src/views/tested/MeasurementBusiness/opinion/index.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/index.vue
@@ -141,6 +141,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementBusiness/review/index.vue b/src/views/tested/MeasurementBusiness/review/index.vue
index ded9054..1aad1c4 100644
--- a/src/views/tested/MeasurementBusiness/review/index.vue
+++ b/src/views/tested/MeasurementBusiness/review/index.vue
@@ -144,6 +144,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/index.vue b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
index 393d9d5..23e45b8 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/index.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
@@ -113,6 +113,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="发送开始时间" end-placeholder="发送结束时间"
+          clearable
         />
       </search-item>
       <search-item>
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index 0e62a9f..f7390f9 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -145,6 +145,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>
@@ -154,7 +155,7 @@
       </template>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
         :is-showmulti-select="true" @change="changePage"
       >
         <template #columns>
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index f1db70f..6c30852 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -326,6 +326,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
index 0772b43..d109074 100644
--- a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
+++ b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
@@ -173,7 +173,7 @@
     <table-container>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery"
         :list-loading="listLoading" :is-showmulti-select="false" @change="changePage"
       >
         <template #preColumns>
diff --git a/src/views/tested/MeasurementPlan/plan/components/dataList.vue b/src/views/tested/MeasurementPlan/plan/components/dataList.vue
index ba725ef..f5db816 100644
--- a/src/views/tested/MeasurementPlan/plan/components/dataList.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/dataList.vue
@@ -66,6 +66,18 @@
     align: 'center',
   },
 ])
+const columnsAll = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '总计',
+    value: 'count',
+    align: 'center',
+  },
+])
 // 获取聚合表格数据
 const togetherLoading = ref(true)
 const togetherList = ref([])
@@ -115,7 +127,7 @@
   <detail-page class="base-info-device" title="计划列表">
     <!-- 展开行表格 -->
     <normal-table
-      class="nortable-header" :data=" [] " :total=" 0 " :columns=" columns " :options="
+      class="nortable-header" :data=" [] " :total=" 0 " :columns=" columnsAll as any " :options="
         {
           needIndex: false, // 是否需要序号列
           border: true, // 是否需要上方边框
@@ -126,15 +138,15 @@
       v-loading=" togetherLoading " :data=" togetherList " border style="width: 100%;"
       :row-key=" getRowKeys " :expand-row-keys=" expands " :show-header=" false " @expand-change=" expandChange "
     >
-      <el-table-column type="expand">
+      <el-table-column type="expand" width="38">
         <template #default="">
           <normal-table
-            :data=" expandList " :total=" 0 " :columns=" columns " :list-loading=" expandLoading " :options="
+            :data=" expandList " :total=" 0 " :columns=" columns as any " :list-loading=" expandLoading " :options="
               {
                 needIndex: false, // 是否需要序号列
                 border: true, // 是否需要上方边框
               }
-            " :pagination=" false " :is-showmulti-select=" true " :show-header=" false "
+            " :pagination=" false " :is-showmulti-select=" true "
           />
         </template>
       </el-table-column>
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 67d6b02..6aaca0b 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -245,6 +245,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
+          clearable
         />
       </search-item>
       <search-item>
diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue
index 4f3e9a9..5a21904 100644
--- a/src/views/tested/device/certificate/index.vue
+++ b/src/views/tested/device/certificate/index.vue
@@ -256,13 +256,13 @@
         <el-input v-model.trim="listQuery.manufactureNo" placeholder="出厂编号" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.companyId" filterable placeholder="所在单位">
+        <el-select v-model="listQuery.companyId" filterable placeholder="所在单位" clearable>
           <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </search-item>
       <search-item>
         <!-- <dept-select v-model="listQuery.deptIds" placeholder="使用部门" /> -->
-        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门">
+        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门" clearable>
           <el-option v-for="item in deptList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </search-item>
@@ -291,6 +291,7 @@
         <el-date-picker
           v-model="range" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
+          clearable
         />
       </search-item>
       <!-- <search-item>
diff --git a/src/views/tested/device/group/components/list.vue b/src/views/tested/device/group/components/list.vue
index 2ea7d85..12b13a4 100644
--- a/src/views/tested/device/group/components/list.vue
+++ b/src/views/tested/device/group/components/list.vue
@@ -240,21 +240,21 @@
       <search-item>
         <!-- <el-input v-model.trim="listQuery.companyId" placeholder="所在单位" clearable /> -->
         <!-- <dept-select v-model="listQuery.companyId" :need-top="false" placeholder="所在单位" /> -->
-        <el-select v-model="listQuery.companyId" filterable placeholder="所在单位">
+        <el-select v-model="listQuery.companyId" filterable placeholder="所在单位" clearable>
           <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </search-item>
       <search-item>
         <!-- <el-input v-model.trim="listQuery.deptId" placeholder="使用部门" clearable /> -->
         <!-- <dept-select v-model="listQuery.deptId" :need-top="false" placeholder="使用部门" /> -->
-        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门">
+        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门" clearable>
           <el-option v-for="item in deptList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </search-item>
       <search-item>
         <!-- <el-input v-model.trim="listQuery.subSystemId" placeholder="分系统" clearable /> -->
         <!-- <dept-select v-model="listQuery.subSystemId" :need-top="false" placeholder="分系统" /> -->
-        <el-select v-model="listQuery.subSystemId" filterable placeholder="分系统">
+        <el-select v-model="listQuery.subSystemId" filterable placeholder="分系统" clearable>
           <el-option v-for="item in systemList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </search-item>
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index e3124ad..e49461e 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -140,6 +140,47 @@
   deep: true,
 })
 const radio = ref('基本信息')
+// 生产日期和购进日期的验证
+const validateProductDate = (rule: any, value: any, callback: any) => {
+  if (value === '') {
+    callback()
+  }
+  else {
+    if (ruleForm.value.purchaseDate) {
+      const data = dayjs(ruleForm.value.purchaseDate).diff(dayjs(value))
+      if (data >= 0) {
+        callback()
+        ruleFormRef.value?.clearValidate('purchaseDate')
+      }
+      else {
+        callback(new Error('生产日期需在购进日期之前'))
+      }
+    }
+    else {
+      callback()
+    }
+  }
+}
+const validatePurchaseDate = (rule: any, value: any, callback: any) => {
+  if (value === '') {
+    callback()
+  }
+  else {
+    if (ruleForm.value.productDate) {
+      const data = dayjs(ruleForm.value.productDate).diff(dayjs(value))
+      if (data >= 0) {
+        callback(new Error('购进日期需在生产日期之后'))
+      }
+      else {
+        callback()
+        ruleFormRef.value?.clearValidate('productDate')
+      }
+    }
+    else {
+      callback()
+    }
+  }
+}
 // 表单1验证规则
 const rules = ref<FormRules>({
   equipmentName: [{ required: true, message: '设备名称必填', trigger: ['blur', 'change'] }],
@@ -149,9 +190,9 @@
   productCountry: [{ required: true, message: '生产国家必填', trigger: ['blur', 'change'] }],
   manufacturer: [{ required: true, message: '生产厂家必填', trigger: ['blur', 'change'] }],
   manufactureNo: [{ required: true, message: '生产编号必填', trigger: ['blur', 'change'] }],
-  // productDate: [{ required: true, message: '生产日期必选', trigger: ['blur', 'change'] }],
+  productDate: [{ trigger: ['blur', 'change'], validator: validateProductDate }],
   // unitPrice: [{ required: true, message: '设备单价必填', trigger: ['blur', 'change'] }],
-  // purchaseDate: [{ required: true, message: '购进日期必选', trigger: ['blur', 'change'] }],
+  purchaseDate: [{ trigger: ['blur', 'change'], validator: validatePurchaseDate }],
   model: [{ required: true, message: '规格型号必填', trigger: ['blur', 'change'] }],
   // helpInstruction: [{ required: true, message: '辅助字段必选', trigger: ['blur', 'change'] }],
   qualityCondition: [{ required: true, message: '质量状况必填', trigger: ['blur', 'change'] }],
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index a485c9d..01bc5ec 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -974,12 +974,12 @@
         <el-input v-model.trim="listQuery.equipmentNo" placeholder="统一编号" clearable />
       </search-item> -->
       <search-item>
-        <el-select v-model.trim="listQuery.equipmentName" filterable placeholder="设备名称">
+        <el-select v-model.trim="listQuery.equipmentName" clearable filterable placeholder="设备名称">
           <el-option v-for="(item, index) in deviceNameList" :key="index" :label="item" :value="item" />
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model.trim="listQuery.model" filterable placeholder="规格型号">
+        <el-select v-model.trim="listQuery.model" clearable filterable placeholder="规格型号">
           <el-option v-for="item in modelList" :key="item" :label="item" :value="item" />
         </el-select>
       </search-item>
@@ -991,13 +991,13 @@
       </search-item>
       <search-item>
         <!-- <dept-select v-model="listQuery.companyId" :need-top="false" placeholder="所在单位" /> -->
-        <el-select v-model="listQuery.companyId" filterable placeholder="所在单位">
+        <el-select v-model="listQuery.companyId" clearable filterable placeholder="所在单位">
           <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </search-item>
       <search-item>
         <!-- <dept-select v-model="listQuery.deptIds" :need-top="false" placeholder="使用部门" /> -->
-        <el-select v-model="listQuery.deptIds" filterable placeholder="使用部门">
+        <el-select v-model="listQuery.deptIds" clearable filterable placeholder="使用部门">
           <el-option v-for="item in deptList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </search-item>
@@ -1013,7 +1013,7 @@
       </template>
       <span v-show="!searchMore">
         <search-item>
-          <el-select v-model="listQuery.meterIdentify" placeholder="计量标识">
+          <el-select v-model="listQuery.meterIdentify" clearable placeholder="计量标识">
             <el-option v-for="item in meterIdentifyList" :key="item.value" :label="item.name" :value="item.value" />
           </el-select>
         </search-item>
@@ -1022,7 +1022,7 @@
         </search-item>
         <search-item>
           <!-- <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable /> -->
-          <el-select v-model="listQuery.directorName" filterable placeholder="负责人" style="width: 100%;">
+          <el-select v-model="listQuery.directorName" clearable filterable placeholder="负责人" style="width: 100%;">
             <el-option v-for="(item) in userList" :key="item.id" :label="item.name" :value="item.name">
               <span style="float: left;">{{ item.name }}</span>
               <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.deptName }}</span>
@@ -1042,34 +1042,34 @@
           />
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.usageStatus" placeholder="使用状态">
+          <el-select v-model="listQuery.usageStatus" clearable placeholder="使用状态">
             <el-option v-for="item in useStatusList" :key="item.value" :label="item.name" :value="item.value" />
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.useSign" placeholder="在用信息">
+          <el-select v-model="listQuery.useSign" clearable placeholder="在用信息">
             <el-option v-for="item in inUseList" :key="item.value" :label="item.name" :value="item.value" />
           </el-select>
         </search-item>
         <search-item>
           <!-- <el-input v-model.trim="listQuery.usePosition" placeholder="使用岗位" clearable /> -->
-          <el-select v-model="listQuery.usePositionId" placeholder="使用岗位">
+          <el-select v-model="listQuery.usePositionId" clearable placeholder="使用岗位">
             <el-option v-for="item in usePositionList" :key="item.id" :label="item.positionName" :value="item.id" />
           </el-select>
         </search-item>
         <search-item>
           <!-- <el-input v-model.trim="listQuery.installLocation" placeholder="安装位置" clearable /> -->
-          <el-select v-model="listQuery.installLocation" placeholder="安装位置">
+          <el-select v-model="listQuery.installLocation" clearable placeholder="安装位置">
             <el-option v-for="item in installLocationList" :key="item.id" :label="item.installLocation" :value="item.id" />
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.taskId" placeholder="参试任务">
+          <el-select v-model="listQuery.taskId" clearable placeholder="参试任务">
             <el-option v-for="item in taskList" :key="item.value" :label="item.name" :value="item.value" />
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.groupId" placeholder="分组">
+          <el-select v-model="listQuery.groupId" clearable placeholder="分组">
             <el-option v-for="item in groupList" :key="item.value" :label="item.name" :value="item.value" />
           </el-select>
           <!-- <el-input v-model.trim="listQuery.groupId" placeholder="分组" clearable /> -->
diff --git a/src/views/tested/device/remind/index.vue b/src/views/tested/device/remind/index.vue
index 69f8764..b981cee 100644
--- a/src/views/tested/device/remind/index.vue
+++ b/src/views/tested/device/remind/index.vue
@@ -354,7 +354,7 @@
       </search-item> -->
       <search-item>
         <!-- <dept-select v-model="listQuery.deptIds" placeholder="使用部门" /> -->
-        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门" style="width: 100%;">
+        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门" style="width: 100%;" clearable>
           <el-option v-for="item in deptList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </search-item>
@@ -377,6 +377,7 @@
           placeholder="证书有效期开始时间"
           value-format="YYYY-MM-DD 00:00:00"
           format="YYYY-MM-DD"
+          clearable
         />
       </search-item>
       <search-item>
@@ -386,6 +387,7 @@
           placeholder="证书有效期结束时间"
           value-format="YYYY-MM-DD 23:59:59"
           format="YYYY-MM-DD"
+          clearable
         />
       </search-item>
       <search-item>
@@ -417,6 +419,7 @@
         <el-date-picker
           v-model="datetimerange1" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="参试任务开始时间" end-placeholder="参试任务结束时间"
+          clearable
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/device/task/index.vue b/src/views/tested/device/task/index.vue
index 79e4de7..9c66f67 100644
--- a/src/views/tested/device/task/index.vue
+++ b/src/views/tested/device/task/index.vue
@@ -160,6 +160,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="参试开始时间" end-placeholder="参试结束时间"
+          clearable
         />
       </search-item>
     </search-area>
@@ -170,7 +171,7 @@
       </template>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
         :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
       >
         <template #columns>

diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue
index 19bd56a..5af6c7f 100644
--- a/src/views/tested/MeasurementBusiness/detection/index.vue
+++ b/src/views/tested/MeasurementBusiness/detection/index.vue
@@ -63,30 +63,6 @@
     total.value = parseInt(response.data.total)
     listLoading.value = false
   })
-  // list.value = [
-  //   {
-  //     createTime: '2023-09-05', // 创建时间
-  //     createUserId: '123', // 创建人id
-  //     createUserName: '张三', // 创建人名字
-  //     customerId: '123', // 委托方id
-  //     customerName: '李四', // 委托方名称
-  //     deviceModel: 'SQ001', // 送检设备型号
-  //     deviceName: '测试设备', // 送检设备名称
-  //     deviceNo: '112233', // 送检设备编号
-  //     id: '123', // id
-  //     labCode: '1', // 实验室代码
-  //     labCodeName: '海口实验室', // 实验室代码
-  //     noticeDate: '2023-09-05', // 通知日期
-  //     noticeName: '海口计量站', // 通知单名称
-  //     noticeNo: '12345', // 通知单编号
-  //     noticeUserId: '1', // 通知委托方用户id
-  //     noticeUserName: '王五', // 通知委托方用户名字
-  //     returnDate: '2023-09-05', // 寄回日期
-  //     submitDate: '2023-09-05', // 送检日期
-  //     updateTime: '2023-09-05', // 更新时间
-  //   },
-  // ]
-  // listLoading.value = false
 }
 fetchData()
 // 查询数据
@@ -157,6 +133,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>
@@ -166,7 +143,7 @@
       </template>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading" @change="changePage"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading" @change="changePage"
       >
         <template #columns>
           <el-table-column label="操作" width="160" align="center">
diff --git a/src/views/tested/MeasurementBusiness/notice/index.vue b/src/views/tested/MeasurementBusiness/notice/index.vue
index c6e4143..2d74eac 100644
--- a/src/views/tested/MeasurementBusiness/notice/index.vue
+++ b/src/views/tested/MeasurementBusiness/notice/index.vue
@@ -76,34 +76,6 @@
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     listLoading.value = false
-    // list.value = [
-    //   {
-    //     approvalStatus: '',
-    //     approvalStatusName: '',
-    //     contacts: '张三',
-    //     createTime: '2023-09-08',
-    //     createUserId: 0,
-    //     createUserName: '创建人',
-    //     customerId: 0,
-    //     customerName: '受检单位',
-    //     decisionItem: 0,
-    //     deviceName: '测试设备',
-    //     groupCode: '',
-    //     groupCodeName: '分组1',
-    //     id: 0,
-    //     labCode: '',
-    //     labCodeName: '',
-    //     mobile: '110',
-    //     noticeDate: '',
-    //     noticeName: '通知书1',
-    //     noticeNo: '123',
-    //     noticeUserId: '',
-    //     noticeUserName: '受检单位',
-    //     outsourcerName: '分包方1',
-    //     processId: '',
-    //     taskId: '',
-    //   },
-    // ]
   })
 }
 fetchData()
@@ -169,13 +141,14 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="申请开始时间" end-placeholder="申请结束时间"
+          clearable
         />
       </search-item>
     </search-area>
     <table-container>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
         :is-showmulti-select="true" @change="changePage"
       >
         <template #columns>
diff --git a/src/views/tested/MeasurementBusiness/opinion/index.vue b/src/views/tested/MeasurementBusiness/opinion/index.vue
index 96b0203..4054b67 100644
--- a/src/views/tested/MeasurementBusiness/opinion/index.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/index.vue
@@ -141,6 +141,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementBusiness/review/index.vue b/src/views/tested/MeasurementBusiness/review/index.vue
index ded9054..1aad1c4 100644
--- a/src/views/tested/MeasurementBusiness/review/index.vue
+++ b/src/views/tested/MeasurementBusiness/review/index.vue
@@ -144,6 +144,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/index.vue b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
index 393d9d5..23e45b8 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/index.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
@@ -113,6 +113,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="发送开始时间" end-placeholder="发送结束时间"
+          clearable
         />
       </search-item>
       <search-item>
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index 0e62a9f..f7390f9 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -145,6 +145,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>
@@ -154,7 +155,7 @@
       </template>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
         :is-showmulti-select="true" @change="changePage"
       >
         <template #columns>
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index f1db70f..6c30852 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -326,6 +326,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
index 0772b43..d109074 100644
--- a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
+++ b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
@@ -173,7 +173,7 @@
     <table-container>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery"
         :list-loading="listLoading" :is-showmulti-select="false" @change="changePage"
       >
         <template #preColumns>
diff --git a/src/views/tested/MeasurementPlan/plan/components/dataList.vue b/src/views/tested/MeasurementPlan/plan/components/dataList.vue
index ba725ef..f5db816 100644
--- a/src/views/tested/MeasurementPlan/plan/components/dataList.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/dataList.vue
@@ -66,6 +66,18 @@
     align: 'center',
   },
 ])
+const columnsAll = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '总计',
+    value: 'count',
+    align: 'center',
+  },
+])
 // 获取聚合表格数据
 const togetherLoading = ref(true)
 const togetherList = ref([])
@@ -115,7 +127,7 @@
   <detail-page class="base-info-device" title="计划列表">
     <!-- 展开行表格 -->
     <normal-table
-      class="nortable-header" :data=" [] " :total=" 0 " :columns=" columns " :options="
+      class="nortable-header" :data=" [] " :total=" 0 " :columns=" columnsAll as any " :options="
         {
           needIndex: false, // 是否需要序号列
           border: true, // 是否需要上方边框
@@ -126,15 +138,15 @@
       v-loading=" togetherLoading " :data=" togetherList " border style="width: 100%;"
       :row-key=" getRowKeys " :expand-row-keys=" expands " :show-header=" false " @expand-change=" expandChange "
     >
-      <el-table-column type="expand">
+      <el-table-column type="expand" width="38">
         <template #default="">
           <normal-table
-            :data=" expandList " :total=" 0 " :columns=" columns " :list-loading=" expandLoading " :options="
+            :data=" expandList " :total=" 0 " :columns=" columns as any " :list-loading=" expandLoading " :options="
               {
                 needIndex: false, // 是否需要序号列
                 border: true, // 是否需要上方边框
               }
-            " :pagination=" false " :is-showmulti-select=" true " :show-header=" false "
+            " :pagination=" false " :is-showmulti-select=" true "
           />
         </template>
       </el-table-column>
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 67d6b02..6aaca0b 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -245,6 +245,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
+          clearable
         />
       </search-item>
       <search-item>
diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue
index 4f3e9a9..5a21904 100644
--- a/src/views/tested/device/certificate/index.vue
+++ b/src/views/tested/device/certificate/index.vue
@@ -256,13 +256,13 @@
         <el-input v-model.trim="listQuery.manufactureNo" placeholder="出厂编号" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.companyId" filterable placeholder="所在单位">
+        <el-select v-model="listQuery.companyId" filterable placeholder="所在单位" clearable>
           <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </search-item>
       <search-item>
         <!-- <dept-select v-model="listQuery.deptIds" placeholder="使用部门" /> -->
-        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门">
+        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门" clearable>
           <el-option v-for="item in deptList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </search-item>
@@ -291,6 +291,7 @@
         <el-date-picker
           v-model="range" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
+          clearable
         />
       </search-item>
       <!-- <search-item>
diff --git a/src/views/tested/device/group/components/list.vue b/src/views/tested/device/group/components/list.vue
index 2ea7d85..12b13a4 100644
--- a/src/views/tested/device/group/components/list.vue
+++ b/src/views/tested/device/group/components/list.vue
@@ -240,21 +240,21 @@
       <search-item>
         <!-- <el-input v-model.trim="listQuery.companyId" placeholder="所在单位" clearable /> -->
         <!-- <dept-select v-model="listQuery.companyId" :need-top="false" placeholder="所在单位" /> -->
-        <el-select v-model="listQuery.companyId" filterable placeholder="所在单位">
+        <el-select v-model="listQuery.companyId" filterable placeholder="所在单位" clearable>
           <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </search-item>
       <search-item>
         <!-- <el-input v-model.trim="listQuery.deptId" placeholder="使用部门" clearable /> -->
         <!-- <dept-select v-model="listQuery.deptId" :need-top="false" placeholder="使用部门" /> -->
-        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门">
+        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门" clearable>
           <el-option v-for="item in deptList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </search-item>
       <search-item>
         <!-- <el-input v-model.trim="listQuery.subSystemId" placeholder="分系统" clearable /> -->
         <!-- <dept-select v-model="listQuery.subSystemId" :need-top="false" placeholder="分系统" /> -->
-        <el-select v-model="listQuery.subSystemId" filterable placeholder="分系统">
+        <el-select v-model="listQuery.subSystemId" filterable placeholder="分系统" clearable>
           <el-option v-for="item in systemList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </search-item>
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index e3124ad..e49461e 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -140,6 +140,47 @@
   deep: true,
 })
 const radio = ref('基本信息')
+// 生产日期和购进日期的验证
+const validateProductDate = (rule: any, value: any, callback: any) => {
+  if (value === '') {
+    callback()
+  }
+  else {
+    if (ruleForm.value.purchaseDate) {
+      const data = dayjs(ruleForm.value.purchaseDate).diff(dayjs(value))
+      if (data >= 0) {
+        callback()
+        ruleFormRef.value?.clearValidate('purchaseDate')
+      }
+      else {
+        callback(new Error('生产日期需在购进日期之前'))
+      }
+    }
+    else {
+      callback()
+    }
+  }
+}
+const validatePurchaseDate = (rule: any, value: any, callback: any) => {
+  if (value === '') {
+    callback()
+  }
+  else {
+    if (ruleForm.value.productDate) {
+      const data = dayjs(ruleForm.value.productDate).diff(dayjs(value))
+      if (data >= 0) {
+        callback(new Error('购进日期需在生产日期之后'))
+      }
+      else {
+        callback()
+        ruleFormRef.value?.clearValidate('productDate')
+      }
+    }
+    else {
+      callback()
+    }
+  }
+}
 // 表单1验证规则
 const rules = ref<FormRules>({
   equipmentName: [{ required: true, message: '设备名称必填', trigger: ['blur', 'change'] }],
@@ -149,9 +190,9 @@
   productCountry: [{ required: true, message: '生产国家必填', trigger: ['blur', 'change'] }],
   manufacturer: [{ required: true, message: '生产厂家必填', trigger: ['blur', 'change'] }],
   manufactureNo: [{ required: true, message: '生产编号必填', trigger: ['blur', 'change'] }],
-  // productDate: [{ required: true, message: '生产日期必选', trigger: ['blur', 'change'] }],
+  productDate: [{ trigger: ['blur', 'change'], validator: validateProductDate }],
   // unitPrice: [{ required: true, message: '设备单价必填', trigger: ['blur', 'change'] }],
-  // purchaseDate: [{ required: true, message: '购进日期必选', trigger: ['blur', 'change'] }],
+  purchaseDate: [{ trigger: ['blur', 'change'], validator: validatePurchaseDate }],
   model: [{ required: true, message: '规格型号必填', trigger: ['blur', 'change'] }],
   // helpInstruction: [{ required: true, message: '辅助字段必选', trigger: ['blur', 'change'] }],
   qualityCondition: [{ required: true, message: '质量状况必填', trigger: ['blur', 'change'] }],
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index a485c9d..01bc5ec 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -974,12 +974,12 @@
         <el-input v-model.trim="listQuery.equipmentNo" placeholder="统一编号" clearable />
       </search-item> -->
       <search-item>
-        <el-select v-model.trim="listQuery.equipmentName" filterable placeholder="设备名称">
+        <el-select v-model.trim="listQuery.equipmentName" clearable filterable placeholder="设备名称">
           <el-option v-for="(item, index) in deviceNameList" :key="index" :label="item" :value="item" />
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model.trim="listQuery.model" filterable placeholder="规格型号">
+        <el-select v-model.trim="listQuery.model" clearable filterable placeholder="规格型号">
           <el-option v-for="item in modelList" :key="item" :label="item" :value="item" />
         </el-select>
       </search-item>
@@ -991,13 +991,13 @@
       </search-item>
       <search-item>
         <!-- <dept-select v-model="listQuery.companyId" :need-top="false" placeholder="所在单位" /> -->
-        <el-select v-model="listQuery.companyId" filterable placeholder="所在单位">
+        <el-select v-model="listQuery.companyId" clearable filterable placeholder="所在单位">
           <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </search-item>
       <search-item>
         <!-- <dept-select v-model="listQuery.deptIds" :need-top="false" placeholder="使用部门" /> -->
-        <el-select v-model="listQuery.deptIds" filterable placeholder="使用部门">
+        <el-select v-model="listQuery.deptIds" clearable filterable placeholder="使用部门">
           <el-option v-for="item in deptList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </search-item>
@@ -1013,7 +1013,7 @@
       </template>
       <span v-show="!searchMore">
         <search-item>
-          <el-select v-model="listQuery.meterIdentify" placeholder="计量标识">
+          <el-select v-model="listQuery.meterIdentify" clearable placeholder="计量标识">
             <el-option v-for="item in meterIdentifyList" :key="item.value" :label="item.name" :value="item.value" />
           </el-select>
         </search-item>
@@ -1022,7 +1022,7 @@
         </search-item>
         <search-item>
           <!-- <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable /> -->
-          <el-select v-model="listQuery.directorName" filterable placeholder="负责人" style="width: 100%;">
+          <el-select v-model="listQuery.directorName" clearable filterable placeholder="负责人" style="width: 100%;">
             <el-option v-for="(item) in userList" :key="item.id" :label="item.name" :value="item.name">
               <span style="float: left;">{{ item.name }}</span>
               <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.deptName }}</span>
@@ -1042,34 +1042,34 @@
           />
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.usageStatus" placeholder="使用状态">
+          <el-select v-model="listQuery.usageStatus" clearable placeholder="使用状态">
             <el-option v-for="item in useStatusList" :key="item.value" :label="item.name" :value="item.value" />
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.useSign" placeholder="在用信息">
+          <el-select v-model="listQuery.useSign" clearable placeholder="在用信息">
             <el-option v-for="item in inUseList" :key="item.value" :label="item.name" :value="item.value" />
           </el-select>
         </search-item>
         <search-item>
           <!-- <el-input v-model.trim="listQuery.usePosition" placeholder="使用岗位" clearable /> -->
-          <el-select v-model="listQuery.usePositionId" placeholder="使用岗位">
+          <el-select v-model="listQuery.usePositionId" clearable placeholder="使用岗位">
             <el-option v-for="item in usePositionList" :key="item.id" :label="item.positionName" :value="item.id" />
           </el-select>
         </search-item>
         <search-item>
           <!-- <el-input v-model.trim="listQuery.installLocation" placeholder="安装位置" clearable /> -->
-          <el-select v-model="listQuery.installLocation" placeholder="安装位置">
+          <el-select v-model="listQuery.installLocation" clearable placeholder="安装位置">
             <el-option v-for="item in installLocationList" :key="item.id" :label="item.installLocation" :value="item.id" />
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.taskId" placeholder="参试任务">
+          <el-select v-model="listQuery.taskId" clearable placeholder="参试任务">
             <el-option v-for="item in taskList" :key="item.value" :label="item.name" :value="item.value" />
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.groupId" placeholder="分组">
+          <el-select v-model="listQuery.groupId" clearable placeholder="分组">
             <el-option v-for="item in groupList" :key="item.value" :label="item.name" :value="item.value" />
           </el-select>
           <!-- <el-input v-model.trim="listQuery.groupId" placeholder="分组" clearable /> -->
diff --git a/src/views/tested/device/remind/index.vue b/src/views/tested/device/remind/index.vue
index 69f8764..b981cee 100644
--- a/src/views/tested/device/remind/index.vue
+++ b/src/views/tested/device/remind/index.vue
@@ -354,7 +354,7 @@
       </search-item> -->
       <search-item>
         <!-- <dept-select v-model="listQuery.deptIds" placeholder="使用部门" /> -->
-        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门" style="width: 100%;">
+        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门" style="width: 100%;" clearable>
           <el-option v-for="item in deptList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </search-item>
@@ -377,6 +377,7 @@
           placeholder="证书有效期开始时间"
           value-format="YYYY-MM-DD 00:00:00"
           format="YYYY-MM-DD"
+          clearable
         />
       </search-item>
       <search-item>
@@ -386,6 +387,7 @@
           placeholder="证书有效期结束时间"
           value-format="YYYY-MM-DD 23:59:59"
           format="YYYY-MM-DD"
+          clearable
         />
       </search-item>
       <search-item>
@@ -417,6 +419,7 @@
         <el-date-picker
           v-model="datetimerange1" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="参试任务开始时间" end-placeholder="参试任务结束时间"
+          clearable
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/device/task/index.vue b/src/views/tested/device/task/index.vue
index 79e4de7..9c66f67 100644
--- a/src/views/tested/device/task/index.vue
+++ b/src/views/tested/device/task/index.vue
@@ -160,6 +160,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="参试开始时间" end-placeholder="参试结束时间"
+          clearable
         />
       </search-item>
     </search-area>
@@ -170,7 +171,7 @@
       </template>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
         :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
       >
         <template #columns>
diff --git a/src/views/tested/subpackage/certificate/index.vue b/src/views/tested/subpackage/certificate/index.vue
index 4ffb25b..915558a 100644
--- a/src/views/tested/subpackage/certificate/index.vue
+++ b/src/views/tested/subpackage/certificate/index.vue
@@ -352,12 +352,14 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="检定开始时间" end-placeholder="检定结束时间"
+          clearable
         />
       </search-item>
       <search-item>
         <el-date-picker
           v-model="datetimerange1" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
+          clearable
         />
       </search-item>
     </search-area>

diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue
index 19bd56a..5af6c7f 100644
--- a/src/views/tested/MeasurementBusiness/detection/index.vue
+++ b/src/views/tested/MeasurementBusiness/detection/index.vue
@@ -63,30 +63,6 @@
     total.value = parseInt(response.data.total)
     listLoading.value = false
   })
-  // list.value = [
-  //   {
-  //     createTime: '2023-09-05', // 创建时间
-  //     createUserId: '123', // 创建人id
-  //     createUserName: '张三', // 创建人名字
-  //     customerId: '123', // 委托方id
-  //     customerName: '李四', // 委托方名称
-  //     deviceModel: 'SQ001', // 送检设备型号
-  //     deviceName: '测试设备', // 送检设备名称
-  //     deviceNo: '112233', // 送检设备编号
-  //     id: '123', // id
-  //     labCode: '1', // 实验室代码
-  //     labCodeName: '海口实验室', // 实验室代码
-  //     noticeDate: '2023-09-05', // 通知日期
-  //     noticeName: '海口计量站', // 通知单名称
-  //     noticeNo: '12345', // 通知单编号
-  //     noticeUserId: '1', // 通知委托方用户id
-  //     noticeUserName: '王五', // 通知委托方用户名字
-  //     returnDate: '2023-09-05', // 寄回日期
-  //     submitDate: '2023-09-05', // 送检日期
-  //     updateTime: '2023-09-05', // 更新时间
-  //   },
-  // ]
-  // listLoading.value = false
 }
 fetchData()
 // 查询数据
@@ -157,6 +133,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>
@@ -166,7 +143,7 @@
       </template>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading" @change="changePage"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading" @change="changePage"
       >
         <template #columns>
           <el-table-column label="操作" width="160" align="center">
diff --git a/src/views/tested/MeasurementBusiness/notice/index.vue b/src/views/tested/MeasurementBusiness/notice/index.vue
index c6e4143..2d74eac 100644
--- a/src/views/tested/MeasurementBusiness/notice/index.vue
+++ b/src/views/tested/MeasurementBusiness/notice/index.vue
@@ -76,34 +76,6 @@
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     listLoading.value = false
-    // list.value = [
-    //   {
-    //     approvalStatus: '',
-    //     approvalStatusName: '',
-    //     contacts: '张三',
-    //     createTime: '2023-09-08',
-    //     createUserId: 0,
-    //     createUserName: '创建人',
-    //     customerId: 0,
-    //     customerName: '受检单位',
-    //     decisionItem: 0,
-    //     deviceName: '测试设备',
-    //     groupCode: '',
-    //     groupCodeName: '分组1',
-    //     id: 0,
-    //     labCode: '',
-    //     labCodeName: '',
-    //     mobile: '110',
-    //     noticeDate: '',
-    //     noticeName: '通知书1',
-    //     noticeNo: '123',
-    //     noticeUserId: '',
-    //     noticeUserName: '受检单位',
-    //     outsourcerName: '分包方1',
-    //     processId: '',
-    //     taskId: '',
-    //   },
-    // ]
   })
 }
 fetchData()
@@ -169,13 +141,14 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="申请开始时间" end-placeholder="申请结束时间"
+          clearable
         />
       </search-item>
     </search-area>
     <table-container>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
         :is-showmulti-select="true" @change="changePage"
       >
         <template #columns>
diff --git a/src/views/tested/MeasurementBusiness/opinion/index.vue b/src/views/tested/MeasurementBusiness/opinion/index.vue
index 96b0203..4054b67 100644
--- a/src/views/tested/MeasurementBusiness/opinion/index.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/index.vue
@@ -141,6 +141,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementBusiness/review/index.vue b/src/views/tested/MeasurementBusiness/review/index.vue
index ded9054..1aad1c4 100644
--- a/src/views/tested/MeasurementBusiness/review/index.vue
+++ b/src/views/tested/MeasurementBusiness/review/index.vue
@@ -144,6 +144,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/index.vue b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
index 393d9d5..23e45b8 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/index.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
@@ -113,6 +113,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="发送开始时间" end-placeholder="发送结束时间"
+          clearable
         />
       </search-item>
       <search-item>
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index 0e62a9f..f7390f9 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -145,6 +145,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>
@@ -154,7 +155,7 @@
       </template>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
         :is-showmulti-select="true" @change="changePage"
       >
         <template #columns>
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index f1db70f..6c30852 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -326,6 +326,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
index 0772b43..d109074 100644
--- a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
+++ b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
@@ -173,7 +173,7 @@
     <table-container>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery"
         :list-loading="listLoading" :is-showmulti-select="false" @change="changePage"
       >
         <template #preColumns>
diff --git a/src/views/tested/MeasurementPlan/plan/components/dataList.vue b/src/views/tested/MeasurementPlan/plan/components/dataList.vue
index ba725ef..f5db816 100644
--- a/src/views/tested/MeasurementPlan/plan/components/dataList.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/dataList.vue
@@ -66,6 +66,18 @@
     align: 'center',
   },
 ])
+const columnsAll = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '总计',
+    value: 'count',
+    align: 'center',
+  },
+])
 // 获取聚合表格数据
 const togetherLoading = ref(true)
 const togetherList = ref([])
@@ -115,7 +127,7 @@
   <detail-page class="base-info-device" title="计划列表">
     <!-- 展开行表格 -->
     <normal-table
-      class="nortable-header" :data=" [] " :total=" 0 " :columns=" columns " :options="
+      class="nortable-header" :data=" [] " :total=" 0 " :columns=" columnsAll as any " :options="
         {
           needIndex: false, // 是否需要序号列
           border: true, // 是否需要上方边框
@@ -126,15 +138,15 @@
       v-loading=" togetherLoading " :data=" togetherList " border style="width: 100%;"
       :row-key=" getRowKeys " :expand-row-keys=" expands " :show-header=" false " @expand-change=" expandChange "
     >
-      <el-table-column type="expand">
+      <el-table-column type="expand" width="38">
         <template #default="">
           <normal-table
-            :data=" expandList " :total=" 0 " :columns=" columns " :list-loading=" expandLoading " :options="
+            :data=" expandList " :total=" 0 " :columns=" columns as any " :list-loading=" expandLoading " :options="
               {
                 needIndex: false, // 是否需要序号列
                 border: true, // 是否需要上方边框
               }
-            " :pagination=" false " :is-showmulti-select=" true " :show-header=" false "
+            " :pagination=" false " :is-showmulti-select=" true "
           />
         </template>
       </el-table-column>
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 67d6b02..6aaca0b 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -245,6 +245,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
+          clearable
         />
       </search-item>
       <search-item>
diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue
index 4f3e9a9..5a21904 100644
--- a/src/views/tested/device/certificate/index.vue
+++ b/src/views/tested/device/certificate/index.vue
@@ -256,13 +256,13 @@
         <el-input v-model.trim="listQuery.manufactureNo" placeholder="出厂编号" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.companyId" filterable placeholder="所在单位">
+        <el-select v-model="listQuery.companyId" filterable placeholder="所在单位" clearable>
           <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </search-item>
       <search-item>
         <!-- <dept-select v-model="listQuery.deptIds" placeholder="使用部门" /> -->
-        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门">
+        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门" clearable>
           <el-option v-for="item in deptList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </search-item>
@@ -291,6 +291,7 @@
         <el-date-picker
           v-model="range" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
+          clearable
         />
       </search-item>
       <!-- <search-item>
diff --git a/src/views/tested/device/group/components/list.vue b/src/views/tested/device/group/components/list.vue
index 2ea7d85..12b13a4 100644
--- a/src/views/tested/device/group/components/list.vue
+++ b/src/views/tested/device/group/components/list.vue
@@ -240,21 +240,21 @@
       <search-item>
         <!-- <el-input v-model.trim="listQuery.companyId" placeholder="所在单位" clearable /> -->
         <!-- <dept-select v-model="listQuery.companyId" :need-top="false" placeholder="所在单位" /> -->
-        <el-select v-model="listQuery.companyId" filterable placeholder="所在单位">
+        <el-select v-model="listQuery.companyId" filterable placeholder="所在单位" clearable>
           <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </search-item>
       <search-item>
         <!-- <el-input v-model.trim="listQuery.deptId" placeholder="使用部门" clearable /> -->
         <!-- <dept-select v-model="listQuery.deptId" :need-top="false" placeholder="使用部门" /> -->
-        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门">
+        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门" clearable>
           <el-option v-for="item in deptList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </search-item>
       <search-item>
         <!-- <el-input v-model.trim="listQuery.subSystemId" placeholder="分系统" clearable /> -->
         <!-- <dept-select v-model="listQuery.subSystemId" :need-top="false" placeholder="分系统" /> -->
-        <el-select v-model="listQuery.subSystemId" filterable placeholder="分系统">
+        <el-select v-model="listQuery.subSystemId" filterable placeholder="分系统" clearable>
           <el-option v-for="item in systemList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </search-item>
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index e3124ad..e49461e 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -140,6 +140,47 @@
   deep: true,
 })
 const radio = ref('基本信息')
+// 生产日期和购进日期的验证
+const validateProductDate = (rule: any, value: any, callback: any) => {
+  if (value === '') {
+    callback()
+  }
+  else {
+    if (ruleForm.value.purchaseDate) {
+      const data = dayjs(ruleForm.value.purchaseDate).diff(dayjs(value))
+      if (data >= 0) {
+        callback()
+        ruleFormRef.value?.clearValidate('purchaseDate')
+      }
+      else {
+        callback(new Error('生产日期需在购进日期之前'))
+      }
+    }
+    else {
+      callback()
+    }
+  }
+}
+const validatePurchaseDate = (rule: any, value: any, callback: any) => {
+  if (value === '') {
+    callback()
+  }
+  else {
+    if (ruleForm.value.productDate) {
+      const data = dayjs(ruleForm.value.productDate).diff(dayjs(value))
+      if (data >= 0) {
+        callback(new Error('购进日期需在生产日期之后'))
+      }
+      else {
+        callback()
+        ruleFormRef.value?.clearValidate('productDate')
+      }
+    }
+    else {
+      callback()
+    }
+  }
+}
 // 表单1验证规则
 const rules = ref<FormRules>({
   equipmentName: [{ required: true, message: '设备名称必填', trigger: ['blur', 'change'] }],
@@ -149,9 +190,9 @@
   productCountry: [{ required: true, message: '生产国家必填', trigger: ['blur', 'change'] }],
   manufacturer: [{ required: true, message: '生产厂家必填', trigger: ['blur', 'change'] }],
   manufactureNo: [{ required: true, message: '生产编号必填', trigger: ['blur', 'change'] }],
-  // productDate: [{ required: true, message: '生产日期必选', trigger: ['blur', 'change'] }],
+  productDate: [{ trigger: ['blur', 'change'], validator: validateProductDate }],
   // unitPrice: [{ required: true, message: '设备单价必填', trigger: ['blur', 'change'] }],
-  // purchaseDate: [{ required: true, message: '购进日期必选', trigger: ['blur', 'change'] }],
+  purchaseDate: [{ trigger: ['blur', 'change'], validator: validatePurchaseDate }],
   model: [{ required: true, message: '规格型号必填', trigger: ['blur', 'change'] }],
   // helpInstruction: [{ required: true, message: '辅助字段必选', trigger: ['blur', 'change'] }],
   qualityCondition: [{ required: true, message: '质量状况必填', trigger: ['blur', 'change'] }],
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index a485c9d..01bc5ec 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -974,12 +974,12 @@
         <el-input v-model.trim="listQuery.equipmentNo" placeholder="统一编号" clearable />
       </search-item> -->
       <search-item>
-        <el-select v-model.trim="listQuery.equipmentName" filterable placeholder="设备名称">
+        <el-select v-model.trim="listQuery.equipmentName" clearable filterable placeholder="设备名称">
           <el-option v-for="(item, index) in deviceNameList" :key="index" :label="item" :value="item" />
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model.trim="listQuery.model" filterable placeholder="规格型号">
+        <el-select v-model.trim="listQuery.model" clearable filterable placeholder="规格型号">
           <el-option v-for="item in modelList" :key="item" :label="item" :value="item" />
         </el-select>
       </search-item>
@@ -991,13 +991,13 @@
       </search-item>
       <search-item>
         <!-- <dept-select v-model="listQuery.companyId" :need-top="false" placeholder="所在单位" /> -->
-        <el-select v-model="listQuery.companyId" filterable placeholder="所在单位">
+        <el-select v-model="listQuery.companyId" clearable filterable placeholder="所在单位">
           <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </search-item>
       <search-item>
         <!-- <dept-select v-model="listQuery.deptIds" :need-top="false" placeholder="使用部门" /> -->
-        <el-select v-model="listQuery.deptIds" filterable placeholder="使用部门">
+        <el-select v-model="listQuery.deptIds" clearable filterable placeholder="使用部门">
           <el-option v-for="item in deptList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </search-item>
@@ -1013,7 +1013,7 @@
       </template>
       <span v-show="!searchMore">
         <search-item>
-          <el-select v-model="listQuery.meterIdentify" placeholder="计量标识">
+          <el-select v-model="listQuery.meterIdentify" clearable placeholder="计量标识">
             <el-option v-for="item in meterIdentifyList" :key="item.value" :label="item.name" :value="item.value" />
           </el-select>
         </search-item>
@@ -1022,7 +1022,7 @@
         </search-item>
         <search-item>
           <!-- <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable /> -->
-          <el-select v-model="listQuery.directorName" filterable placeholder="负责人" style="width: 100%;">
+          <el-select v-model="listQuery.directorName" clearable filterable placeholder="负责人" style="width: 100%;">
             <el-option v-for="(item) in userList" :key="item.id" :label="item.name" :value="item.name">
               <span style="float: left;">{{ item.name }}</span>
               <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.deptName }}</span>
@@ -1042,34 +1042,34 @@
           />
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.usageStatus" placeholder="使用状态">
+          <el-select v-model="listQuery.usageStatus" clearable placeholder="使用状态">
             <el-option v-for="item in useStatusList" :key="item.value" :label="item.name" :value="item.value" />
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.useSign" placeholder="在用信息">
+          <el-select v-model="listQuery.useSign" clearable placeholder="在用信息">
             <el-option v-for="item in inUseList" :key="item.value" :label="item.name" :value="item.value" />
           </el-select>
         </search-item>
         <search-item>
           <!-- <el-input v-model.trim="listQuery.usePosition" placeholder="使用岗位" clearable /> -->
-          <el-select v-model="listQuery.usePositionId" placeholder="使用岗位">
+          <el-select v-model="listQuery.usePositionId" clearable placeholder="使用岗位">
             <el-option v-for="item in usePositionList" :key="item.id" :label="item.positionName" :value="item.id" />
           </el-select>
         </search-item>
         <search-item>
           <!-- <el-input v-model.trim="listQuery.installLocation" placeholder="安装位置" clearable /> -->
-          <el-select v-model="listQuery.installLocation" placeholder="安装位置">
+          <el-select v-model="listQuery.installLocation" clearable placeholder="安装位置">
             <el-option v-for="item in installLocationList" :key="item.id" :label="item.installLocation" :value="item.id" />
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.taskId" placeholder="参试任务">
+          <el-select v-model="listQuery.taskId" clearable placeholder="参试任务">
             <el-option v-for="item in taskList" :key="item.value" :label="item.name" :value="item.value" />
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.groupId" placeholder="分组">
+          <el-select v-model="listQuery.groupId" clearable placeholder="分组">
             <el-option v-for="item in groupList" :key="item.value" :label="item.name" :value="item.value" />
           </el-select>
           <!-- <el-input v-model.trim="listQuery.groupId" placeholder="分组" clearable /> -->
diff --git a/src/views/tested/device/remind/index.vue b/src/views/tested/device/remind/index.vue
index 69f8764..b981cee 100644
--- a/src/views/tested/device/remind/index.vue
+++ b/src/views/tested/device/remind/index.vue
@@ -354,7 +354,7 @@
       </search-item> -->
       <search-item>
         <!-- <dept-select v-model="listQuery.deptIds" placeholder="使用部门" /> -->
-        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门" style="width: 100%;">
+        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门" style="width: 100%;" clearable>
           <el-option v-for="item in deptList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </search-item>
@@ -377,6 +377,7 @@
           placeholder="证书有效期开始时间"
           value-format="YYYY-MM-DD 00:00:00"
           format="YYYY-MM-DD"
+          clearable
         />
       </search-item>
       <search-item>
@@ -386,6 +387,7 @@
           placeholder="证书有效期结束时间"
           value-format="YYYY-MM-DD 23:59:59"
           format="YYYY-MM-DD"
+          clearable
         />
       </search-item>
       <search-item>
@@ -417,6 +419,7 @@
         <el-date-picker
           v-model="datetimerange1" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="参试任务开始时间" end-placeholder="参试任务结束时间"
+          clearable
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/device/task/index.vue b/src/views/tested/device/task/index.vue
index 79e4de7..9c66f67 100644
--- a/src/views/tested/device/task/index.vue
+++ b/src/views/tested/device/task/index.vue
@@ -160,6 +160,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="参试开始时间" end-placeholder="参试结束时间"
+          clearable
         />
       </search-item>
     </search-area>
@@ -170,7 +171,7 @@
       </template>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
         :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
       >
         <template #columns>
diff --git a/src/views/tested/subpackage/certificate/index.vue b/src/views/tested/subpackage/certificate/index.vue
index 4ffb25b..915558a 100644
--- a/src/views/tested/subpackage/certificate/index.vue
+++ b/src/views/tested/subpackage/certificate/index.vue
@@ -352,12 +352,14 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="检定开始时间" end-placeholder="检定结束时间"
+          clearable
         />
       </search-item>
       <search-item>
         <el-date-picker
           v-model="datetimerange1" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
+          clearable
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/subpackage/directory/components/list.vue b/src/views/tested/subpackage/directory/components/list.vue
index 3373bf8..1d3c333 100644
--- a/src/views/tested/subpackage/directory/components/list.vue
+++ b/src/views/tested/subpackage/directory/components/list.vue
@@ -287,6 +287,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>

diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue
index 19bd56a..5af6c7f 100644
--- a/src/views/tested/MeasurementBusiness/detection/index.vue
+++ b/src/views/tested/MeasurementBusiness/detection/index.vue
@@ -63,30 +63,6 @@
     total.value = parseInt(response.data.total)
     listLoading.value = false
   })
-  // list.value = [
-  //   {
-  //     createTime: '2023-09-05', // 创建时间
-  //     createUserId: '123', // 创建人id
-  //     createUserName: '张三', // 创建人名字
-  //     customerId: '123', // 委托方id
-  //     customerName: '李四', // 委托方名称
-  //     deviceModel: 'SQ001', // 送检设备型号
-  //     deviceName: '测试设备', // 送检设备名称
-  //     deviceNo: '112233', // 送检设备编号
-  //     id: '123', // id
-  //     labCode: '1', // 实验室代码
-  //     labCodeName: '海口实验室', // 实验室代码
-  //     noticeDate: '2023-09-05', // 通知日期
-  //     noticeName: '海口计量站', // 通知单名称
-  //     noticeNo: '12345', // 通知单编号
-  //     noticeUserId: '1', // 通知委托方用户id
-  //     noticeUserName: '王五', // 通知委托方用户名字
-  //     returnDate: '2023-09-05', // 寄回日期
-  //     submitDate: '2023-09-05', // 送检日期
-  //     updateTime: '2023-09-05', // 更新时间
-  //   },
-  // ]
-  // listLoading.value = false
 }
 fetchData()
 // 查询数据
@@ -157,6 +133,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>
@@ -166,7 +143,7 @@
       </template>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading" @change="changePage"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading" @change="changePage"
       >
         <template #columns>
           <el-table-column label="操作" width="160" align="center">
diff --git a/src/views/tested/MeasurementBusiness/notice/index.vue b/src/views/tested/MeasurementBusiness/notice/index.vue
index c6e4143..2d74eac 100644
--- a/src/views/tested/MeasurementBusiness/notice/index.vue
+++ b/src/views/tested/MeasurementBusiness/notice/index.vue
@@ -76,34 +76,6 @@
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     listLoading.value = false
-    // list.value = [
-    //   {
-    //     approvalStatus: '',
-    //     approvalStatusName: '',
-    //     contacts: '张三',
-    //     createTime: '2023-09-08',
-    //     createUserId: 0,
-    //     createUserName: '创建人',
-    //     customerId: 0,
-    //     customerName: '受检单位',
-    //     decisionItem: 0,
-    //     deviceName: '测试设备',
-    //     groupCode: '',
-    //     groupCodeName: '分组1',
-    //     id: 0,
-    //     labCode: '',
-    //     labCodeName: '',
-    //     mobile: '110',
-    //     noticeDate: '',
-    //     noticeName: '通知书1',
-    //     noticeNo: '123',
-    //     noticeUserId: '',
-    //     noticeUserName: '受检单位',
-    //     outsourcerName: '分包方1',
-    //     processId: '',
-    //     taskId: '',
-    //   },
-    // ]
   })
 }
 fetchData()
@@ -169,13 +141,14 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="申请开始时间" end-placeholder="申请结束时间"
+          clearable
         />
       </search-item>
     </search-area>
     <table-container>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
         :is-showmulti-select="true" @change="changePage"
       >
         <template #columns>
diff --git a/src/views/tested/MeasurementBusiness/opinion/index.vue b/src/views/tested/MeasurementBusiness/opinion/index.vue
index 96b0203..4054b67 100644
--- a/src/views/tested/MeasurementBusiness/opinion/index.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/index.vue
@@ -141,6 +141,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementBusiness/review/index.vue b/src/views/tested/MeasurementBusiness/review/index.vue
index ded9054..1aad1c4 100644
--- a/src/views/tested/MeasurementBusiness/review/index.vue
+++ b/src/views/tested/MeasurementBusiness/review/index.vue
@@ -144,6 +144,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/index.vue b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
index 393d9d5..23e45b8 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/index.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
@@ -113,6 +113,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="发送开始时间" end-placeholder="发送结束时间"
+          clearable
         />
       </search-item>
       <search-item>
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index 0e62a9f..f7390f9 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -145,6 +145,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>
@@ -154,7 +155,7 @@
       </template>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
         :is-showmulti-select="true" @change="changePage"
       >
         <template #columns>
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index f1db70f..6c30852 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -326,6 +326,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
index 0772b43..d109074 100644
--- a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
+++ b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
@@ -173,7 +173,7 @@
     <table-container>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery"
         :list-loading="listLoading" :is-showmulti-select="false" @change="changePage"
       >
         <template #preColumns>
diff --git a/src/views/tested/MeasurementPlan/plan/components/dataList.vue b/src/views/tested/MeasurementPlan/plan/components/dataList.vue
index ba725ef..f5db816 100644
--- a/src/views/tested/MeasurementPlan/plan/components/dataList.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/dataList.vue
@@ -66,6 +66,18 @@
     align: 'center',
   },
 ])
+const columnsAll = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '总计',
+    value: 'count',
+    align: 'center',
+  },
+])
 // 获取聚合表格数据
 const togetherLoading = ref(true)
 const togetherList = ref([])
@@ -115,7 +127,7 @@
   <detail-page class="base-info-device" title="计划列表">
     <!-- 展开行表格 -->
     <normal-table
-      class="nortable-header" :data=" [] " :total=" 0 " :columns=" columns " :options="
+      class="nortable-header" :data=" [] " :total=" 0 " :columns=" columnsAll as any " :options="
         {
           needIndex: false, // 是否需要序号列
           border: true, // 是否需要上方边框
@@ -126,15 +138,15 @@
       v-loading=" togetherLoading " :data=" togetherList " border style="width: 100%;"
       :row-key=" getRowKeys " :expand-row-keys=" expands " :show-header=" false " @expand-change=" expandChange "
     >
-      <el-table-column type="expand">
+      <el-table-column type="expand" width="38">
         <template #default="">
           <normal-table
-            :data=" expandList " :total=" 0 " :columns=" columns " :list-loading=" expandLoading " :options="
+            :data=" expandList " :total=" 0 " :columns=" columns as any " :list-loading=" expandLoading " :options="
               {
                 needIndex: false, // 是否需要序号列
                 border: true, // 是否需要上方边框
               }
-            " :pagination=" false " :is-showmulti-select=" true " :show-header=" false "
+            " :pagination=" false " :is-showmulti-select=" true "
           />
         </template>
       </el-table-column>
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 67d6b02..6aaca0b 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -245,6 +245,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
+          clearable
         />
       </search-item>
       <search-item>
diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue
index 4f3e9a9..5a21904 100644
--- a/src/views/tested/device/certificate/index.vue
+++ b/src/views/tested/device/certificate/index.vue
@@ -256,13 +256,13 @@
         <el-input v-model.trim="listQuery.manufactureNo" placeholder="出厂编号" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.companyId" filterable placeholder="所在单位">
+        <el-select v-model="listQuery.companyId" filterable placeholder="所在单位" clearable>
           <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </search-item>
       <search-item>
         <!-- <dept-select v-model="listQuery.deptIds" placeholder="使用部门" /> -->
-        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门">
+        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门" clearable>
           <el-option v-for="item in deptList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </search-item>
@@ -291,6 +291,7 @@
         <el-date-picker
           v-model="range" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
+          clearable
         />
       </search-item>
       <!-- <search-item>
diff --git a/src/views/tested/device/group/components/list.vue b/src/views/tested/device/group/components/list.vue
index 2ea7d85..12b13a4 100644
--- a/src/views/tested/device/group/components/list.vue
+++ b/src/views/tested/device/group/components/list.vue
@@ -240,21 +240,21 @@
       <search-item>
         <!-- <el-input v-model.trim="listQuery.companyId" placeholder="所在单位" clearable /> -->
         <!-- <dept-select v-model="listQuery.companyId" :need-top="false" placeholder="所在单位" /> -->
-        <el-select v-model="listQuery.companyId" filterable placeholder="所在单位">
+        <el-select v-model="listQuery.companyId" filterable placeholder="所在单位" clearable>
           <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </search-item>
       <search-item>
         <!-- <el-input v-model.trim="listQuery.deptId" placeholder="使用部门" clearable /> -->
         <!-- <dept-select v-model="listQuery.deptId" :need-top="false" placeholder="使用部门" /> -->
-        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门">
+        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门" clearable>
           <el-option v-for="item in deptList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </search-item>
       <search-item>
         <!-- <el-input v-model.trim="listQuery.subSystemId" placeholder="分系统" clearable /> -->
         <!-- <dept-select v-model="listQuery.subSystemId" :need-top="false" placeholder="分系统" /> -->
-        <el-select v-model="listQuery.subSystemId" filterable placeholder="分系统">
+        <el-select v-model="listQuery.subSystemId" filterable placeholder="分系统" clearable>
           <el-option v-for="item in systemList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </search-item>
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index e3124ad..e49461e 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -140,6 +140,47 @@
   deep: true,
 })
 const radio = ref('基本信息')
+// 生产日期和购进日期的验证
+const validateProductDate = (rule: any, value: any, callback: any) => {
+  if (value === '') {
+    callback()
+  }
+  else {
+    if (ruleForm.value.purchaseDate) {
+      const data = dayjs(ruleForm.value.purchaseDate).diff(dayjs(value))
+      if (data >= 0) {
+        callback()
+        ruleFormRef.value?.clearValidate('purchaseDate')
+      }
+      else {
+        callback(new Error('生产日期需在购进日期之前'))
+      }
+    }
+    else {
+      callback()
+    }
+  }
+}
+const validatePurchaseDate = (rule: any, value: any, callback: any) => {
+  if (value === '') {
+    callback()
+  }
+  else {
+    if (ruleForm.value.productDate) {
+      const data = dayjs(ruleForm.value.productDate).diff(dayjs(value))
+      if (data >= 0) {
+        callback(new Error('购进日期需在生产日期之后'))
+      }
+      else {
+        callback()
+        ruleFormRef.value?.clearValidate('productDate')
+      }
+    }
+    else {
+      callback()
+    }
+  }
+}
 // 表单1验证规则
 const rules = ref<FormRules>({
   equipmentName: [{ required: true, message: '设备名称必填', trigger: ['blur', 'change'] }],
@@ -149,9 +190,9 @@
   productCountry: [{ required: true, message: '生产国家必填', trigger: ['blur', 'change'] }],
   manufacturer: [{ required: true, message: '生产厂家必填', trigger: ['blur', 'change'] }],
   manufactureNo: [{ required: true, message: '生产编号必填', trigger: ['blur', 'change'] }],
-  // productDate: [{ required: true, message: '生产日期必选', trigger: ['blur', 'change'] }],
+  productDate: [{ trigger: ['blur', 'change'], validator: validateProductDate }],
   // unitPrice: [{ required: true, message: '设备单价必填', trigger: ['blur', 'change'] }],
-  // purchaseDate: [{ required: true, message: '购进日期必选', trigger: ['blur', 'change'] }],
+  purchaseDate: [{ trigger: ['blur', 'change'], validator: validatePurchaseDate }],
   model: [{ required: true, message: '规格型号必填', trigger: ['blur', 'change'] }],
   // helpInstruction: [{ required: true, message: '辅助字段必选', trigger: ['blur', 'change'] }],
   qualityCondition: [{ required: true, message: '质量状况必填', trigger: ['blur', 'change'] }],
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index a485c9d..01bc5ec 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -974,12 +974,12 @@
         <el-input v-model.trim="listQuery.equipmentNo" placeholder="统一编号" clearable />
       </search-item> -->
       <search-item>
-        <el-select v-model.trim="listQuery.equipmentName" filterable placeholder="设备名称">
+        <el-select v-model.trim="listQuery.equipmentName" clearable filterable placeholder="设备名称">
           <el-option v-for="(item, index) in deviceNameList" :key="index" :label="item" :value="item" />
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model.trim="listQuery.model" filterable placeholder="规格型号">
+        <el-select v-model.trim="listQuery.model" clearable filterable placeholder="规格型号">
           <el-option v-for="item in modelList" :key="item" :label="item" :value="item" />
         </el-select>
       </search-item>
@@ -991,13 +991,13 @@
       </search-item>
       <search-item>
         <!-- <dept-select v-model="listQuery.companyId" :need-top="false" placeholder="所在单位" /> -->
-        <el-select v-model="listQuery.companyId" filterable placeholder="所在单位">
+        <el-select v-model="listQuery.companyId" clearable filterable placeholder="所在单位">
           <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </search-item>
       <search-item>
         <!-- <dept-select v-model="listQuery.deptIds" :need-top="false" placeholder="使用部门" /> -->
-        <el-select v-model="listQuery.deptIds" filterable placeholder="使用部门">
+        <el-select v-model="listQuery.deptIds" clearable filterable placeholder="使用部门">
           <el-option v-for="item in deptList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </search-item>
@@ -1013,7 +1013,7 @@
       </template>
       <span v-show="!searchMore">
         <search-item>
-          <el-select v-model="listQuery.meterIdentify" placeholder="计量标识">
+          <el-select v-model="listQuery.meterIdentify" clearable placeholder="计量标识">
             <el-option v-for="item in meterIdentifyList" :key="item.value" :label="item.name" :value="item.value" />
           </el-select>
         </search-item>
@@ -1022,7 +1022,7 @@
         </search-item>
         <search-item>
           <!-- <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable /> -->
-          <el-select v-model="listQuery.directorName" filterable placeholder="负责人" style="width: 100%;">
+          <el-select v-model="listQuery.directorName" clearable filterable placeholder="负责人" style="width: 100%;">
             <el-option v-for="(item) in userList" :key="item.id" :label="item.name" :value="item.name">
               <span style="float: left;">{{ item.name }}</span>
               <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.deptName }}</span>
@@ -1042,34 +1042,34 @@
           />
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.usageStatus" placeholder="使用状态">
+          <el-select v-model="listQuery.usageStatus" clearable placeholder="使用状态">
             <el-option v-for="item in useStatusList" :key="item.value" :label="item.name" :value="item.value" />
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.useSign" placeholder="在用信息">
+          <el-select v-model="listQuery.useSign" clearable placeholder="在用信息">
             <el-option v-for="item in inUseList" :key="item.value" :label="item.name" :value="item.value" />
           </el-select>
         </search-item>
         <search-item>
           <!-- <el-input v-model.trim="listQuery.usePosition" placeholder="使用岗位" clearable /> -->
-          <el-select v-model="listQuery.usePositionId" placeholder="使用岗位">
+          <el-select v-model="listQuery.usePositionId" clearable placeholder="使用岗位">
             <el-option v-for="item in usePositionList" :key="item.id" :label="item.positionName" :value="item.id" />
           </el-select>
         </search-item>
         <search-item>
           <!-- <el-input v-model.trim="listQuery.installLocation" placeholder="安装位置" clearable /> -->
-          <el-select v-model="listQuery.installLocation" placeholder="安装位置">
+          <el-select v-model="listQuery.installLocation" clearable placeholder="安装位置">
             <el-option v-for="item in installLocationList" :key="item.id" :label="item.installLocation" :value="item.id" />
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.taskId" placeholder="参试任务">
+          <el-select v-model="listQuery.taskId" clearable placeholder="参试任务">
             <el-option v-for="item in taskList" :key="item.value" :label="item.name" :value="item.value" />
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.groupId" placeholder="分组">
+          <el-select v-model="listQuery.groupId" clearable placeholder="分组">
             <el-option v-for="item in groupList" :key="item.value" :label="item.name" :value="item.value" />
           </el-select>
           <!-- <el-input v-model.trim="listQuery.groupId" placeholder="分组" clearable /> -->
diff --git a/src/views/tested/device/remind/index.vue b/src/views/tested/device/remind/index.vue
index 69f8764..b981cee 100644
--- a/src/views/tested/device/remind/index.vue
+++ b/src/views/tested/device/remind/index.vue
@@ -354,7 +354,7 @@
       </search-item> -->
       <search-item>
         <!-- <dept-select v-model="listQuery.deptIds" placeholder="使用部门" /> -->
-        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门" style="width: 100%;">
+        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门" style="width: 100%;" clearable>
           <el-option v-for="item in deptList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </search-item>
@@ -377,6 +377,7 @@
           placeholder="证书有效期开始时间"
           value-format="YYYY-MM-DD 00:00:00"
           format="YYYY-MM-DD"
+          clearable
         />
       </search-item>
       <search-item>
@@ -386,6 +387,7 @@
           placeholder="证书有效期结束时间"
           value-format="YYYY-MM-DD 23:59:59"
           format="YYYY-MM-DD"
+          clearable
         />
       </search-item>
       <search-item>
@@ -417,6 +419,7 @@
         <el-date-picker
           v-model="datetimerange1" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="参试任务开始时间" end-placeholder="参试任务结束时间"
+          clearable
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/device/task/index.vue b/src/views/tested/device/task/index.vue
index 79e4de7..9c66f67 100644
--- a/src/views/tested/device/task/index.vue
+++ b/src/views/tested/device/task/index.vue
@@ -160,6 +160,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="参试开始时间" end-placeholder="参试结束时间"
+          clearable
         />
       </search-item>
     </search-area>
@@ -170,7 +171,7 @@
       </template>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
         :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
       >
         <template #columns>
diff --git a/src/views/tested/subpackage/certificate/index.vue b/src/views/tested/subpackage/certificate/index.vue
index 4ffb25b..915558a 100644
--- a/src/views/tested/subpackage/certificate/index.vue
+++ b/src/views/tested/subpackage/certificate/index.vue
@@ -352,12 +352,14 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="检定开始时间" end-placeholder="检定结束时间"
+          clearable
         />
       </search-item>
       <search-item>
         <el-date-picker
           v-model="datetimerange1" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
+          clearable
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/subpackage/directory/components/list.vue b/src/views/tested/subpackage/directory/components/list.vue
index 3373bf8..1d3c333 100644
--- a/src/views/tested/subpackage/directory/components/list.vue
+++ b/src/views/tested/subpackage/directory/components/list.vue
@@ -287,6 +287,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/subpackage/review/components/list.vue b/src/views/tested/subpackage/review/components/list.vue
index 6d8a7b2..386caad 100644
--- a/src/views/tested/subpackage/review/components/list.vue
+++ b/src/views/tested/subpackage/review/components/list.vue
@@ -281,6 +281,7 @@
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="申请开始时间" end-placeholder="申请结束时间"
+          clearable
         />
       </search-item>
     </search-area>