diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue
index 58aa0af..1c1c923 100644
--- a/src/views/tested/MeasurementBusiness/detection/index.vue
+++ b/src/views/tested/MeasurementBusiness/detection/index.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/detection'
 import { printJSON } from '@/utils/printUtils'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   noticeDateEnd: '',
@@ -14,6 +15,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'InspectionResultReviewNotice')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {

diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue
index 58aa0af..1c1c923 100644
--- a/src/views/tested/MeasurementBusiness/detection/index.vue
+++ b/src/views/tested/MeasurementBusiness/detection/index.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/detection'
 import { printJSON } from '@/utils/printUtils'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   noticeDateEnd: '',
@@ -14,6 +15,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'InspectionResultReviewNotice')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
diff --git a/src/views/tested/MeasurementBusiness/notice/index.vue b/src/views/tested/MeasurementBusiness/notice/index.vue
index de0cf86..e161859 100644
--- a/src/views/tested/MeasurementBusiness/notice/index.vue
+++ b/src/views/tested/MeasurementBusiness/notice/index.vue
@@ -3,6 +3,7 @@
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/notice'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   applicantName: '',
@@ -18,6 +19,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'SubcontractingNotice')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {

diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue
index 58aa0af..1c1c923 100644
--- a/src/views/tested/MeasurementBusiness/detection/index.vue
+++ b/src/views/tested/MeasurementBusiness/detection/index.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/detection'
 import { printJSON } from '@/utils/printUtils'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   noticeDateEnd: '',
@@ -14,6 +15,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'InspectionResultReviewNotice')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
diff --git a/src/views/tested/MeasurementBusiness/notice/index.vue b/src/views/tested/MeasurementBusiness/notice/index.vue
index de0cf86..e161859 100644
--- a/src/views/tested/MeasurementBusiness/notice/index.vue
+++ b/src/views/tested/MeasurementBusiness/notice/index.vue
@@ -3,6 +3,7 @@
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/notice'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   applicantName: '',
@@ -18,6 +19,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'SubcontractingNotice')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
diff --git a/src/views/tested/MeasurementBusiness/opinion/components/list.vue b/src/views/tested/MeasurementBusiness/opinion/components/list.vue
index a2e035c..4e5fd62 100644
--- a/src/views/tested/MeasurementBusiness/opinion/components/list.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/components/list.vue
@@ -9,6 +9,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { getDictByCode } from '@/api/system/dict'
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   statusName: {
     type: String,
@@ -24,6 +25,9 @@
   未通过: '5',
   已取消: '6',
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'ClientOpinionForm')
+})
 const listQuery = reactive({
   approvalStatus: '0',
   createTimeEnd: '',

diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue
index 58aa0af..1c1c923 100644
--- a/src/views/tested/MeasurementBusiness/detection/index.vue
+++ b/src/views/tested/MeasurementBusiness/detection/index.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/detection'
 import { printJSON } from '@/utils/printUtils'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   noticeDateEnd: '',
@@ -14,6 +15,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'InspectionResultReviewNotice')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
diff --git a/src/views/tested/MeasurementBusiness/notice/index.vue b/src/views/tested/MeasurementBusiness/notice/index.vue
index de0cf86..e161859 100644
--- a/src/views/tested/MeasurementBusiness/notice/index.vue
+++ b/src/views/tested/MeasurementBusiness/notice/index.vue
@@ -3,6 +3,7 @@
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/notice'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   applicantName: '',
@@ -18,6 +19,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'SubcontractingNotice')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
diff --git a/src/views/tested/MeasurementBusiness/opinion/components/list.vue b/src/views/tested/MeasurementBusiness/opinion/components/list.vue
index a2e035c..4e5fd62 100644
--- a/src/views/tested/MeasurementBusiness/opinion/components/list.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/components/list.vue
@@ -9,6 +9,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { getDictByCode } from '@/api/system/dict'
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   statusName: {
     type: String,
@@ -24,6 +25,9 @@
   未通过: '5',
   已取消: '6',
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'ClientOpinionForm')
+})
 const listQuery = reactive({
   approvalStatus: '0',
   createTimeEnd: '',
diff --git a/src/views/tested/MeasurementBusiness/review/index.vue b/src/views/tested/MeasurementBusiness/review/index.vue
index b4c16f9..c2f4c68 100644
--- a/src/views/tested/MeasurementBusiness/review/index.vue
+++ b/src/views/tested/MeasurementBusiness/review/index.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/review'
 import { getDictByCode } from '@/api/system/dict'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   approvalStatus: '',
@@ -18,6 +19,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'ReviewForm')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref([
   `${new Date().getFullYear()}-01-01`,

diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue
index 58aa0af..1c1c923 100644
--- a/src/views/tested/MeasurementBusiness/detection/index.vue
+++ b/src/views/tested/MeasurementBusiness/detection/index.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/detection'
 import { printJSON } from '@/utils/printUtils'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   noticeDateEnd: '',
@@ -14,6 +15,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'InspectionResultReviewNotice')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
diff --git a/src/views/tested/MeasurementBusiness/notice/index.vue b/src/views/tested/MeasurementBusiness/notice/index.vue
index de0cf86..e161859 100644
--- a/src/views/tested/MeasurementBusiness/notice/index.vue
+++ b/src/views/tested/MeasurementBusiness/notice/index.vue
@@ -3,6 +3,7 @@
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/notice'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   applicantName: '',
@@ -18,6 +19,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'SubcontractingNotice')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
diff --git a/src/views/tested/MeasurementBusiness/opinion/components/list.vue b/src/views/tested/MeasurementBusiness/opinion/components/list.vue
index a2e035c..4e5fd62 100644
--- a/src/views/tested/MeasurementBusiness/opinion/components/list.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/components/list.vue
@@ -9,6 +9,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { getDictByCode } from '@/api/system/dict'
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   statusName: {
     type: String,
@@ -24,6 +25,9 @@
   未通过: '5',
   已取消: '6',
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'ClientOpinionForm')
+})
 const listQuery = reactive({
   approvalStatus: '0',
   createTimeEnd: '',
diff --git a/src/views/tested/MeasurementBusiness/review/index.vue b/src/views/tested/MeasurementBusiness/review/index.vue
index b4c16f9..c2f4c68 100644
--- a/src/views/tested/MeasurementBusiness/review/index.vue
+++ b/src/views/tested/MeasurementBusiness/review/index.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/review'
 import { getDictByCode } from '@/api/system/dict'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   approvalStatus: '',
@@ -18,6 +19,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'ReviewForm')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref([
   `${new Date().getFullYear()}-01-01`,
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/index.vue b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
index 238bbd6..aef9dab 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/index.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
@@ -3,6 +3,7 @@
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/satisfaction'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   sendTimeStart: '',
@@ -11,6 +12,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'ClientSatisfactionSurveyForm')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {

diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue
index 58aa0af..1c1c923 100644
--- a/src/views/tested/MeasurementBusiness/detection/index.vue
+++ b/src/views/tested/MeasurementBusiness/detection/index.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/detection'
 import { printJSON } from '@/utils/printUtils'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   noticeDateEnd: '',
@@ -14,6 +15,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'InspectionResultReviewNotice')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
diff --git a/src/views/tested/MeasurementBusiness/notice/index.vue b/src/views/tested/MeasurementBusiness/notice/index.vue
index de0cf86..e161859 100644
--- a/src/views/tested/MeasurementBusiness/notice/index.vue
+++ b/src/views/tested/MeasurementBusiness/notice/index.vue
@@ -3,6 +3,7 @@
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/notice'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   applicantName: '',
@@ -18,6 +19,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'SubcontractingNotice')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
diff --git a/src/views/tested/MeasurementBusiness/opinion/components/list.vue b/src/views/tested/MeasurementBusiness/opinion/components/list.vue
index a2e035c..4e5fd62 100644
--- a/src/views/tested/MeasurementBusiness/opinion/components/list.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/components/list.vue
@@ -9,6 +9,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { getDictByCode } from '@/api/system/dict'
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   statusName: {
     type: String,
@@ -24,6 +25,9 @@
   未通过: '5',
   已取消: '6',
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'ClientOpinionForm')
+})
 const listQuery = reactive({
   approvalStatus: '0',
   createTimeEnd: '',
diff --git a/src/views/tested/MeasurementBusiness/review/index.vue b/src/views/tested/MeasurementBusiness/review/index.vue
index b4c16f9..c2f4c68 100644
--- a/src/views/tested/MeasurementBusiness/review/index.vue
+++ b/src/views/tested/MeasurementBusiness/review/index.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/review'
 import { getDictByCode } from '@/api/system/dict'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   approvalStatus: '',
@@ -18,6 +19,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'ReviewForm')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref([
   `${new Date().getFullYear()}-01-01`,
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/index.vue b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
index 238bbd6..aef9dab 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/index.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
@@ -3,6 +3,7 @@
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/satisfaction'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   sendTimeStart: '',
@@ -11,6 +12,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'ClientSatisfactionSurveyForm')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
diff --git a/src/views/tested/MeasurementPlan/board/index.vue b/src/views/tested/MeasurementPlan/board/index.vue
index 8d14386..850326e 100644
--- a/src/views/tested/MeasurementPlan/board/index.vue
+++ b/src/views/tested/MeasurementPlan/board/index.vue
@@ -5,12 +5,16 @@
 import { exportListApi, getListPage } from '@/api/eqpt/measurementPlan/board'
 import { exportFile } from '@/utils/exportUtils'
 import { buildTree, toTreeList } from '@/utils/structure'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   deptName: '',
   // offset: 1,
   // limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'BoardList')
+})
 const columns = ref<any>([
   {
     text: '部门',

diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue
index 58aa0af..1c1c923 100644
--- a/src/views/tested/MeasurementBusiness/detection/index.vue
+++ b/src/views/tested/MeasurementBusiness/detection/index.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/detection'
 import { printJSON } from '@/utils/printUtils'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   noticeDateEnd: '',
@@ -14,6 +15,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'InspectionResultReviewNotice')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
diff --git a/src/views/tested/MeasurementBusiness/notice/index.vue b/src/views/tested/MeasurementBusiness/notice/index.vue
index de0cf86..e161859 100644
--- a/src/views/tested/MeasurementBusiness/notice/index.vue
+++ b/src/views/tested/MeasurementBusiness/notice/index.vue
@@ -3,6 +3,7 @@
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/notice'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   applicantName: '',
@@ -18,6 +19,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'SubcontractingNotice')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
diff --git a/src/views/tested/MeasurementBusiness/opinion/components/list.vue b/src/views/tested/MeasurementBusiness/opinion/components/list.vue
index a2e035c..4e5fd62 100644
--- a/src/views/tested/MeasurementBusiness/opinion/components/list.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/components/list.vue
@@ -9,6 +9,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { getDictByCode } from '@/api/system/dict'
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   statusName: {
     type: String,
@@ -24,6 +25,9 @@
   未通过: '5',
   已取消: '6',
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'ClientOpinionForm')
+})
 const listQuery = reactive({
   approvalStatus: '0',
   createTimeEnd: '',
diff --git a/src/views/tested/MeasurementBusiness/review/index.vue b/src/views/tested/MeasurementBusiness/review/index.vue
index b4c16f9..c2f4c68 100644
--- a/src/views/tested/MeasurementBusiness/review/index.vue
+++ b/src/views/tested/MeasurementBusiness/review/index.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/review'
 import { getDictByCode } from '@/api/system/dict'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   approvalStatus: '',
@@ -18,6 +19,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'ReviewForm')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref([
   `${new Date().getFullYear()}-01-01`,
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/index.vue b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
index 238bbd6..aef9dab 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/index.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
@@ -3,6 +3,7 @@
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/satisfaction'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   sendTimeStart: '',
@@ -11,6 +12,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'ClientSatisfactionSurveyForm')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
diff --git a/src/views/tested/MeasurementPlan/board/index.vue b/src/views/tested/MeasurementPlan/board/index.vue
index 8d14386..850326e 100644
--- a/src/views/tested/MeasurementPlan/board/index.vue
+++ b/src/views/tested/MeasurementPlan/board/index.vue
@@ -5,12 +5,16 @@
 import { exportListApi, getListPage } from '@/api/eqpt/measurementPlan/board'
 import { exportFile } from '@/utils/exportUtils'
 import { buildTree, toTreeList } from '@/utils/structure'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   deptName: '',
   // offset: 1,
   // limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'BoardList')
+})
 const columns = ref<any>([
   {
     text: '部门',
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index f7390f9..e2061e0 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -5,6 +5,7 @@
 import { getListPage } from '@/api/eqpt/measurementPlan/dept'
 import useUserStore from '@/store/modules/user'
 import { getUserDept } from '@/api/system/user'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   // notifyType 通知类型(负责人/部门，字典值)
   notifyType: {
@@ -12,6 +13,10 @@
     required: true,
   },
 })
+
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, $props.notifyType === '2' ? 'DeptNotice' : 'CuratorNotice')
+})
 const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
 const userStore = useUserStore()

diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue
index 58aa0af..1c1c923 100644
--- a/src/views/tested/MeasurementBusiness/detection/index.vue
+++ b/src/views/tested/MeasurementBusiness/detection/index.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/detection'
 import { printJSON } from '@/utils/printUtils'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   noticeDateEnd: '',
@@ -14,6 +15,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'InspectionResultReviewNotice')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
diff --git a/src/views/tested/MeasurementBusiness/notice/index.vue b/src/views/tested/MeasurementBusiness/notice/index.vue
index de0cf86..e161859 100644
--- a/src/views/tested/MeasurementBusiness/notice/index.vue
+++ b/src/views/tested/MeasurementBusiness/notice/index.vue
@@ -3,6 +3,7 @@
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/notice'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   applicantName: '',
@@ -18,6 +19,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'SubcontractingNotice')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
diff --git a/src/views/tested/MeasurementBusiness/opinion/components/list.vue b/src/views/tested/MeasurementBusiness/opinion/components/list.vue
index a2e035c..4e5fd62 100644
--- a/src/views/tested/MeasurementBusiness/opinion/components/list.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/components/list.vue
@@ -9,6 +9,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { getDictByCode } from '@/api/system/dict'
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   statusName: {
     type: String,
@@ -24,6 +25,9 @@
   未通过: '5',
   已取消: '6',
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'ClientOpinionForm')
+})
 const listQuery = reactive({
   approvalStatus: '0',
   createTimeEnd: '',
diff --git a/src/views/tested/MeasurementBusiness/review/index.vue b/src/views/tested/MeasurementBusiness/review/index.vue
index b4c16f9..c2f4c68 100644
--- a/src/views/tested/MeasurementBusiness/review/index.vue
+++ b/src/views/tested/MeasurementBusiness/review/index.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/review'
 import { getDictByCode } from '@/api/system/dict'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   approvalStatus: '',
@@ -18,6 +19,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'ReviewForm')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref([
   `${new Date().getFullYear()}-01-01`,
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/index.vue b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
index 238bbd6..aef9dab 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/index.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
@@ -3,6 +3,7 @@
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/satisfaction'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   sendTimeStart: '',
@@ -11,6 +12,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'ClientSatisfactionSurveyForm')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
diff --git a/src/views/tested/MeasurementPlan/board/index.vue b/src/views/tested/MeasurementPlan/board/index.vue
index 8d14386..850326e 100644
--- a/src/views/tested/MeasurementPlan/board/index.vue
+++ b/src/views/tested/MeasurementPlan/board/index.vue
@@ -5,12 +5,16 @@
 import { exportListApi, getListPage } from '@/api/eqpt/measurementPlan/board'
 import { exportFile } from '@/utils/exportUtils'
 import { buildTree, toTreeList } from '@/utils/structure'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   deptName: '',
   // offset: 1,
   // limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'BoardList')
+})
 const columns = ref<any>([
   {
     text: '部门',
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index f7390f9..e2061e0 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -5,6 +5,7 @@
 import { getListPage } from '@/api/eqpt/measurementPlan/dept'
 import useUserStore from '@/store/modules/user'
 import { getUserDept } from '@/api/system/user'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   // notifyType 通知类型(负责人/部门，字典值)
   notifyType: {
@@ -12,6 +13,10 @@
     required: true,
   },
 })
+
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, $props.notifyType === '2' ? 'DeptNotice' : 'CuratorNotice')
+})
 const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
 const userStore = useUserStore()
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index 1f64a62..ee1d163 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -11,6 +11,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 import { getPostList } from '@/api/system/post'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   // 申请类型（字典值，提前/延迟）
   approvalType: {
@@ -23,6 +24,9 @@
     required: true,
   },
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, $props.approvalType === '0' ? 'EarlyApplication' : 'DelayApplication')
+})
 const applyDict = ref<{ [key: string]: string }>({
   审批: '',
   草稿箱: '1',

diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue
index 58aa0af..1c1c923 100644
--- a/src/views/tested/MeasurementBusiness/detection/index.vue
+++ b/src/views/tested/MeasurementBusiness/detection/index.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/detection'
 import { printJSON } from '@/utils/printUtils'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   noticeDateEnd: '',
@@ -14,6 +15,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'InspectionResultReviewNotice')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
diff --git a/src/views/tested/MeasurementBusiness/notice/index.vue b/src/views/tested/MeasurementBusiness/notice/index.vue
index de0cf86..e161859 100644
--- a/src/views/tested/MeasurementBusiness/notice/index.vue
+++ b/src/views/tested/MeasurementBusiness/notice/index.vue
@@ -3,6 +3,7 @@
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/notice'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   applicantName: '',
@@ -18,6 +19,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'SubcontractingNotice')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
diff --git a/src/views/tested/MeasurementBusiness/opinion/components/list.vue b/src/views/tested/MeasurementBusiness/opinion/components/list.vue
index a2e035c..4e5fd62 100644
--- a/src/views/tested/MeasurementBusiness/opinion/components/list.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/components/list.vue
@@ -9,6 +9,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { getDictByCode } from '@/api/system/dict'
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   statusName: {
     type: String,
@@ -24,6 +25,9 @@
   未通过: '5',
   已取消: '6',
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'ClientOpinionForm')
+})
 const listQuery = reactive({
   approvalStatus: '0',
   createTimeEnd: '',
diff --git a/src/views/tested/MeasurementBusiness/review/index.vue b/src/views/tested/MeasurementBusiness/review/index.vue
index b4c16f9..c2f4c68 100644
--- a/src/views/tested/MeasurementBusiness/review/index.vue
+++ b/src/views/tested/MeasurementBusiness/review/index.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/review'
 import { getDictByCode } from '@/api/system/dict'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   approvalStatus: '',
@@ -18,6 +19,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'ReviewForm')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref([
   `${new Date().getFullYear()}-01-01`,
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/index.vue b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
index 238bbd6..aef9dab 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/index.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
@@ -3,6 +3,7 @@
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/satisfaction'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   sendTimeStart: '',
@@ -11,6 +12,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'ClientSatisfactionSurveyForm')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
diff --git a/src/views/tested/MeasurementPlan/board/index.vue b/src/views/tested/MeasurementPlan/board/index.vue
index 8d14386..850326e 100644
--- a/src/views/tested/MeasurementPlan/board/index.vue
+++ b/src/views/tested/MeasurementPlan/board/index.vue
@@ -5,12 +5,16 @@
 import { exportListApi, getListPage } from '@/api/eqpt/measurementPlan/board'
 import { exportFile } from '@/utils/exportUtils'
 import { buildTree, toTreeList } from '@/utils/structure'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   deptName: '',
   // offset: 1,
   // limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'BoardList')
+})
 const columns = ref<any>([
   {
     text: '部门',
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index f7390f9..e2061e0 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -5,6 +5,7 @@
 import { getListPage } from '@/api/eqpt/measurementPlan/dept'
 import useUserStore from '@/store/modules/user'
 import { getUserDept } from '@/api/system/user'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   // notifyType 通知类型(负责人/部门，字典值)
   notifyType: {
@@ -12,6 +13,10 @@
     required: true,
   },
 })
+
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, $props.notifyType === '2' ? 'DeptNotice' : 'CuratorNotice')
+})
 const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
 const userStore = useUserStore()
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index 1f64a62..ee1d163 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -11,6 +11,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 import { getPostList } from '@/api/system/post'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   // 申请类型（字典值，提前/延迟）
   approvalType: {
@@ -23,6 +24,9 @@
     required: true,
   },
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, $props.approvalType === '0' ? 'EarlyApplication' : 'DelayApplication')
+})
 const applyDict = ref<{ [key: string]: string }>({
   审批: '',
   草稿箱: '1',
diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue
index f5eedcb..d5b57e4 100644
--- a/src/views/tested/MeasurementPlan/plan/components/list.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/list.vue
@@ -13,6 +13,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 import useUserStore from '@/store/modules/user'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   statusName: {
     type: String,
@@ -28,6 +29,9 @@
   未通过: '5',
   已取消: '6',
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'PlanIndex')
+})
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   approvalStatus: '', //	申请状态(审批列表传)		false

diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue
index 58aa0af..1c1c923 100644
--- a/src/views/tested/MeasurementBusiness/detection/index.vue
+++ b/src/views/tested/MeasurementBusiness/detection/index.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/detection'
 import { printJSON } from '@/utils/printUtils'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   noticeDateEnd: '',
@@ -14,6 +15,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'InspectionResultReviewNotice')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
diff --git a/src/views/tested/MeasurementBusiness/notice/index.vue b/src/views/tested/MeasurementBusiness/notice/index.vue
index de0cf86..e161859 100644
--- a/src/views/tested/MeasurementBusiness/notice/index.vue
+++ b/src/views/tested/MeasurementBusiness/notice/index.vue
@@ -3,6 +3,7 @@
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/notice'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   applicantName: '',
@@ -18,6 +19,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'SubcontractingNotice')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
diff --git a/src/views/tested/MeasurementBusiness/opinion/components/list.vue b/src/views/tested/MeasurementBusiness/opinion/components/list.vue
index a2e035c..4e5fd62 100644
--- a/src/views/tested/MeasurementBusiness/opinion/components/list.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/components/list.vue
@@ -9,6 +9,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { getDictByCode } from '@/api/system/dict'
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   statusName: {
     type: String,
@@ -24,6 +25,9 @@
   未通过: '5',
   已取消: '6',
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'ClientOpinionForm')
+})
 const listQuery = reactive({
   approvalStatus: '0',
   createTimeEnd: '',
diff --git a/src/views/tested/MeasurementBusiness/review/index.vue b/src/views/tested/MeasurementBusiness/review/index.vue
index b4c16f9..c2f4c68 100644
--- a/src/views/tested/MeasurementBusiness/review/index.vue
+++ b/src/views/tested/MeasurementBusiness/review/index.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/review'
 import { getDictByCode } from '@/api/system/dict'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   approvalStatus: '',
@@ -18,6 +19,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'ReviewForm')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref([
   `${new Date().getFullYear()}-01-01`,
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/index.vue b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
index 238bbd6..aef9dab 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/index.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
@@ -3,6 +3,7 @@
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/satisfaction'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   sendTimeStart: '',
@@ -11,6 +12,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'ClientSatisfactionSurveyForm')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
diff --git a/src/views/tested/MeasurementPlan/board/index.vue b/src/views/tested/MeasurementPlan/board/index.vue
index 8d14386..850326e 100644
--- a/src/views/tested/MeasurementPlan/board/index.vue
+++ b/src/views/tested/MeasurementPlan/board/index.vue
@@ -5,12 +5,16 @@
 import { exportListApi, getListPage } from '@/api/eqpt/measurementPlan/board'
 import { exportFile } from '@/utils/exportUtils'
 import { buildTree, toTreeList } from '@/utils/structure'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   deptName: '',
   // offset: 1,
   // limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'BoardList')
+})
 const columns = ref<any>([
   {
     text: '部门',
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index f7390f9..e2061e0 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -5,6 +5,7 @@
 import { getListPage } from '@/api/eqpt/measurementPlan/dept'
 import useUserStore from '@/store/modules/user'
 import { getUserDept } from '@/api/system/user'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   // notifyType 通知类型(负责人/部门，字典值)
   notifyType: {
@@ -12,6 +13,10 @@
     required: true,
   },
 })
+
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, $props.notifyType === '2' ? 'DeptNotice' : 'CuratorNotice')
+})
 const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
 const userStore = useUserStore()
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index 1f64a62..ee1d163 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -11,6 +11,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 import { getPostList } from '@/api/system/post'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   // 申请类型（字典值，提前/延迟）
   approvalType: {
@@ -23,6 +24,9 @@
     required: true,
   },
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, $props.approvalType === '0' ? 'EarlyApplication' : 'DelayApplication')
+})
 const applyDict = ref<{ [key: string]: string }>({
   审批: '',
   草稿箱: '1',
diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue
index f5eedcb..d5b57e4 100644
--- a/src/views/tested/MeasurementPlan/plan/components/list.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/list.vue
@@ -13,6 +13,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 import useUserStore from '@/store/modules/user'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   statusName: {
     type: String,
@@ -28,6 +29,9 @@
   未通过: '5',
   已取消: '6',
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'PlanIndex')
+})
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   approvalStatus: '', //	申请状态(审批列表传)		false
diff --git a/src/views/tested/MeasurementPlan/task/components/edit.vue b/src/views/tested/MeasurementPlan/task/components/edit.vue
index 9c2f2d9..86b6bd2 100644
--- a/src/views/tested/MeasurementPlan/task/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/task/components/edit.vue
@@ -54,6 +54,7 @@
   isOnSiteCheck: '0',
   onSiteCheckTime: '',
   deptId: '',
+  orderStatusName: '',
 }) // 表单
 const checkPhone = (rule: any, value: any, callback: any) => {
   if (value === '') {
@@ -550,7 +551,7 @@
           <el-row v-if="$route.path.includes('detail') && $route.query.statusName === '全部'" :gutter="24" class="marg">
             <el-col :span="6">
               <el-form-item label="任务单状态">
-                <el-input v-model.trim="ruleForm.receiveStatusName" />
+                <el-input v-model.trim="ruleForm.orderStatusName" />
               </el-form-item>
             </el-col>
             <el-col :span="12">

diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue
index 58aa0af..1c1c923 100644
--- a/src/views/tested/MeasurementBusiness/detection/index.vue
+++ b/src/views/tested/MeasurementBusiness/detection/index.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/detection'
 import { printJSON } from '@/utils/printUtils'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   noticeDateEnd: '',
@@ -14,6 +15,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'InspectionResultReviewNotice')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
diff --git a/src/views/tested/MeasurementBusiness/notice/index.vue b/src/views/tested/MeasurementBusiness/notice/index.vue
index de0cf86..e161859 100644
--- a/src/views/tested/MeasurementBusiness/notice/index.vue
+++ b/src/views/tested/MeasurementBusiness/notice/index.vue
@@ -3,6 +3,7 @@
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/notice'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   applicantName: '',
@@ -18,6 +19,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'SubcontractingNotice')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
diff --git a/src/views/tested/MeasurementBusiness/opinion/components/list.vue b/src/views/tested/MeasurementBusiness/opinion/components/list.vue
index a2e035c..4e5fd62 100644
--- a/src/views/tested/MeasurementBusiness/opinion/components/list.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/components/list.vue
@@ -9,6 +9,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { getDictByCode } from '@/api/system/dict'
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   statusName: {
     type: String,
@@ -24,6 +25,9 @@
   未通过: '5',
   已取消: '6',
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'ClientOpinionForm')
+})
 const listQuery = reactive({
   approvalStatus: '0',
   createTimeEnd: '',
diff --git a/src/views/tested/MeasurementBusiness/review/index.vue b/src/views/tested/MeasurementBusiness/review/index.vue
index b4c16f9..c2f4c68 100644
--- a/src/views/tested/MeasurementBusiness/review/index.vue
+++ b/src/views/tested/MeasurementBusiness/review/index.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/review'
 import { getDictByCode } from '@/api/system/dict'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   approvalStatus: '',
@@ -18,6 +19,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'ReviewForm')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref([
   `${new Date().getFullYear()}-01-01`,
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/index.vue b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
index 238bbd6..aef9dab 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/index.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
@@ -3,6 +3,7 @@
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/satisfaction'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   sendTimeStart: '',
@@ -11,6 +12,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'ClientSatisfactionSurveyForm')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
diff --git a/src/views/tested/MeasurementPlan/board/index.vue b/src/views/tested/MeasurementPlan/board/index.vue
index 8d14386..850326e 100644
--- a/src/views/tested/MeasurementPlan/board/index.vue
+++ b/src/views/tested/MeasurementPlan/board/index.vue
@@ -5,12 +5,16 @@
 import { exportListApi, getListPage } from '@/api/eqpt/measurementPlan/board'
 import { exportFile } from '@/utils/exportUtils'
 import { buildTree, toTreeList } from '@/utils/structure'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   deptName: '',
   // offset: 1,
   // limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'BoardList')
+})
 const columns = ref<any>([
   {
     text: '部门',
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index f7390f9..e2061e0 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -5,6 +5,7 @@
 import { getListPage } from '@/api/eqpt/measurementPlan/dept'
 import useUserStore from '@/store/modules/user'
 import { getUserDept } from '@/api/system/user'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   // notifyType 通知类型(负责人/部门，字典值)
   notifyType: {
@@ -12,6 +13,10 @@
     required: true,
   },
 })
+
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, $props.notifyType === '2' ? 'DeptNotice' : 'CuratorNotice')
+})
 const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
 const userStore = useUserStore()
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index 1f64a62..ee1d163 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -11,6 +11,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 import { getPostList } from '@/api/system/post'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   // 申请类型（字典值，提前/延迟）
   approvalType: {
@@ -23,6 +24,9 @@
     required: true,
   },
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, $props.approvalType === '0' ? 'EarlyApplication' : 'DelayApplication')
+})
 const applyDict = ref<{ [key: string]: string }>({
   审批: '',
   草稿箱: '1',
diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue
index f5eedcb..d5b57e4 100644
--- a/src/views/tested/MeasurementPlan/plan/components/list.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/list.vue
@@ -13,6 +13,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 import useUserStore from '@/store/modules/user'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   statusName: {
     type: String,
@@ -28,6 +29,9 @@
   未通过: '5',
   已取消: '6',
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'PlanIndex')
+})
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   approvalStatus: '', //	申请状态(审批列表传)		false
diff --git a/src/views/tested/MeasurementPlan/task/components/edit.vue b/src/views/tested/MeasurementPlan/task/components/edit.vue
index 9c2f2d9..86b6bd2 100644
--- a/src/views/tested/MeasurementPlan/task/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/task/components/edit.vue
@@ -54,6 +54,7 @@
   isOnSiteCheck: '0',
   onSiteCheckTime: '',
   deptId: '',
+  orderStatusName: '',
 }) // 表单
 const checkPhone = (rule: any, value: any, callback: any) => {
   if (value === '') {
@@ -550,7 +551,7 @@
           <el-row v-if="$route.path.includes('detail') && $route.query.statusName === '全部'" :gutter="24" class="marg">
             <el-col :span="6">
               <el-form-item label="任务单状态">
-                <el-input v-model.trim="ruleForm.receiveStatusName" />
+                <el-input v-model.trim="ruleForm.orderStatusName" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
diff --git a/src/views/tested/MeasurementPlan/task/components/list.vue b/src/views/tested/MeasurementPlan/task/components/list.vue
index c81fd92..d5c6e17 100644
--- a/src/views/tested/MeasurementPlan/task/components/list.vue
+++ b/src/views/tested/MeasurementPlan/task/components/list.vue
@@ -31,7 +31,7 @@
   usePositionId: '',
   measureCompany: '',
   manufactureNo: '',
-  receiveStatus: '',
+  orderStatus: '',
   offset: 1,
   limit: 20,
   sort: 'desc',
@@ -110,7 +110,7 @@
   // },
   {
     text: '计划送检时间',
-    value: 'requireOverTime',
+    value: 'planDeliverTime',
     align: 'center',
   },
   // {
@@ -144,7 +144,7 @@
 watch(() => $props.statusName, (newVal) => {
   if (newVal) {
     listQuery.approvalStatus = applyDict.value[newVal] as string
-    listQuery.receiveStatus = $props.statusName === '全部' ? '' : listQuery.receiveStatus
+    listQuery.orderStatus = $props.statusName === '全部' ? '' : listQuery.orderStatus
     fetchData()
   }
 },
@@ -165,7 +165,7 @@
   listQuery.usePositionId = ''
   listQuery.measureCompany = ''
   listQuery.manufactureNo = ''
-  listQuery.receiveStatus = ''
+  listQuery.orderStatus = ''
   listQuery.offset = 1
   listQuery.limit = 20
   listQuery.sort = 'desc'
@@ -278,7 +278,7 @@
   })
   // })
   // 接收状态
-  getDictByCode('orderStatus').then((res) => {
+  getDictByCode('eqptTaskStatus').then((res) => {
     receiveStatusList.value = res.data
   })
 }
@@ -362,9 +362,12 @@
       case '已退回':
         color = '#F68787'
         break
-      case '检测完成':
+      case '待取回':
         color = '#82CD5E'
         break
+      case '已取回':
+        color = '#89D961'
+        break
       default:
         color = '#000'
         break
@@ -408,7 +411,7 @@
         <el-input v-model.trim="listQuery.manufactureNo" placeholder="设备出厂编号" clearable />
       </search-item>
       <search-item v-if="$props.statusName === '全部'">
-        <el-select v-model="listQuery.receiveStatus" placeholder="任务单状态" clearable>
+        <el-select v-model="listQuery.orderStatus" placeholder="任务单状态" clearable>
           <el-option v-for="item in receiveStatusList" :key="item.value" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
@@ -435,8 +438,8 @@
         <template #columns>
           <el-table-column v-if="$props.statusName === '全部'" label="任务单状态" align="center">
             <template #default="scope">
-              <span :style="{ color: TextColor(scope.row.receiveStatusName) }">
-                {{ scope.row.receiveStatusName }}
+              <span :style="{ color: TextColor(scope.row.orderStatusName) }">
+                {{ scope.row.orderStatusName }}
               </span>
             </template>
           </el-table-column>
@@ -487,7 +490,7 @@
               <!-- <el-button v-if="proxy.hasPerm(permUrl.edit) && $props.statusName === '全部'" link type="primary" :disabled="scope.row.receiveStatusName !== '未接收'" size="small" @click="handler(scope.row, 'update')">
                 编辑
               </el-button> -->
-              <el-button v-if="proxy.hasPerm(permUrl.cancel) && $props.statusName === '全部'" :disabled="scope.row.receiveStatusName !== '未接收'" link type="danger" size="small" @click="cancelHandler(scope.row)">
+              <el-button v-if="proxy.hasPerm(permUrl.cancel) && $props.statusName === '全部'" :disabled="scope.row.orderStatusName !== '未接收'" link type="danger" size="small" @click="cancelHandler(scope.row)">
                 取消
               </el-button>
             </template>

diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue
index 58aa0af..1c1c923 100644
--- a/src/views/tested/MeasurementBusiness/detection/index.vue
+++ b/src/views/tested/MeasurementBusiness/detection/index.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/detection'
 import { printJSON } from '@/utils/printUtils'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   noticeDateEnd: '',
@@ -14,6 +15,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'InspectionResultReviewNotice')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
diff --git a/src/views/tested/MeasurementBusiness/notice/index.vue b/src/views/tested/MeasurementBusiness/notice/index.vue
index de0cf86..e161859 100644
--- a/src/views/tested/MeasurementBusiness/notice/index.vue
+++ b/src/views/tested/MeasurementBusiness/notice/index.vue
@@ -3,6 +3,7 @@
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/notice'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   applicantName: '',
@@ -18,6 +19,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'SubcontractingNotice')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
diff --git a/src/views/tested/MeasurementBusiness/opinion/components/list.vue b/src/views/tested/MeasurementBusiness/opinion/components/list.vue
index a2e035c..4e5fd62 100644
--- a/src/views/tested/MeasurementBusiness/opinion/components/list.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/components/list.vue
@@ -9,6 +9,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { getDictByCode } from '@/api/system/dict'
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   statusName: {
     type: String,
@@ -24,6 +25,9 @@
   未通过: '5',
   已取消: '6',
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'ClientOpinionForm')
+})
 const listQuery = reactive({
   approvalStatus: '0',
   createTimeEnd: '',
diff --git a/src/views/tested/MeasurementBusiness/review/index.vue b/src/views/tested/MeasurementBusiness/review/index.vue
index b4c16f9..c2f4c68 100644
--- a/src/views/tested/MeasurementBusiness/review/index.vue
+++ b/src/views/tested/MeasurementBusiness/review/index.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/review'
 import { getDictByCode } from '@/api/system/dict'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   approvalStatus: '',
@@ -18,6 +19,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'ReviewForm')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref([
   `${new Date().getFullYear()}-01-01`,
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/index.vue b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
index 238bbd6..aef9dab 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/index.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
@@ -3,6 +3,7 @@
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/satisfaction'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   sendTimeStart: '',
@@ -11,6 +12,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'ClientSatisfactionSurveyForm')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
diff --git a/src/views/tested/MeasurementPlan/board/index.vue b/src/views/tested/MeasurementPlan/board/index.vue
index 8d14386..850326e 100644
--- a/src/views/tested/MeasurementPlan/board/index.vue
+++ b/src/views/tested/MeasurementPlan/board/index.vue
@@ -5,12 +5,16 @@
 import { exportListApi, getListPage } from '@/api/eqpt/measurementPlan/board'
 import { exportFile } from '@/utils/exportUtils'
 import { buildTree, toTreeList } from '@/utils/structure'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   deptName: '',
   // offset: 1,
   // limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'BoardList')
+})
 const columns = ref<any>([
   {
     text: '部门',
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index f7390f9..e2061e0 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -5,6 +5,7 @@
 import { getListPage } from '@/api/eqpt/measurementPlan/dept'
 import useUserStore from '@/store/modules/user'
 import { getUserDept } from '@/api/system/user'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   // notifyType 通知类型(负责人/部门，字典值)
   notifyType: {
@@ -12,6 +13,10 @@
     required: true,
   },
 })
+
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, $props.notifyType === '2' ? 'DeptNotice' : 'CuratorNotice')
+})
 const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
 const userStore = useUserStore()
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index 1f64a62..ee1d163 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -11,6 +11,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 import { getPostList } from '@/api/system/post'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   // 申请类型（字典值，提前/延迟）
   approvalType: {
@@ -23,6 +24,9 @@
     required: true,
   },
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, $props.approvalType === '0' ? 'EarlyApplication' : 'DelayApplication')
+})
 const applyDict = ref<{ [key: string]: string }>({
   审批: '',
   草稿箱: '1',
diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue
index f5eedcb..d5b57e4 100644
--- a/src/views/tested/MeasurementPlan/plan/components/list.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/list.vue
@@ -13,6 +13,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 import useUserStore from '@/store/modules/user'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   statusName: {
     type: String,
@@ -28,6 +29,9 @@
   未通过: '5',
   已取消: '6',
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'PlanIndex')
+})
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   approvalStatus: '', //	申请状态(审批列表传)		false
diff --git a/src/views/tested/MeasurementPlan/task/components/edit.vue b/src/views/tested/MeasurementPlan/task/components/edit.vue
index 9c2f2d9..86b6bd2 100644
--- a/src/views/tested/MeasurementPlan/task/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/task/components/edit.vue
@@ -54,6 +54,7 @@
   isOnSiteCheck: '0',
   onSiteCheckTime: '',
   deptId: '',
+  orderStatusName: '',
 }) // 表单
 const checkPhone = (rule: any, value: any, callback: any) => {
   if (value === '') {
@@ -550,7 +551,7 @@
           <el-row v-if="$route.path.includes('detail') && $route.query.statusName === '全部'" :gutter="24" class="marg">
             <el-col :span="6">
               <el-form-item label="任务单状态">
-                <el-input v-model.trim="ruleForm.receiveStatusName" />
+                <el-input v-model.trim="ruleForm.orderStatusName" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
diff --git a/src/views/tested/MeasurementPlan/task/components/list.vue b/src/views/tested/MeasurementPlan/task/components/list.vue
index c81fd92..d5c6e17 100644
--- a/src/views/tested/MeasurementPlan/task/components/list.vue
+++ b/src/views/tested/MeasurementPlan/task/components/list.vue
@@ -31,7 +31,7 @@
   usePositionId: '',
   measureCompany: '',
   manufactureNo: '',
-  receiveStatus: '',
+  orderStatus: '',
   offset: 1,
   limit: 20,
   sort: 'desc',
@@ -110,7 +110,7 @@
   // },
   {
     text: '计划送检时间',
-    value: 'requireOverTime',
+    value: 'planDeliverTime',
     align: 'center',
   },
   // {
@@ -144,7 +144,7 @@
 watch(() => $props.statusName, (newVal) => {
   if (newVal) {
     listQuery.approvalStatus = applyDict.value[newVal] as string
-    listQuery.receiveStatus = $props.statusName === '全部' ? '' : listQuery.receiveStatus
+    listQuery.orderStatus = $props.statusName === '全部' ? '' : listQuery.orderStatus
     fetchData()
   }
 },
@@ -165,7 +165,7 @@
   listQuery.usePositionId = ''
   listQuery.measureCompany = ''
   listQuery.manufactureNo = ''
-  listQuery.receiveStatus = ''
+  listQuery.orderStatus = ''
   listQuery.offset = 1
   listQuery.limit = 20
   listQuery.sort = 'desc'
@@ -278,7 +278,7 @@
   })
   // })
   // 接收状态
-  getDictByCode('orderStatus').then((res) => {
+  getDictByCode('eqptTaskStatus').then((res) => {
     receiveStatusList.value = res.data
   })
 }
@@ -362,9 +362,12 @@
       case '已退回':
         color = '#F68787'
         break
-      case '检测完成':
+      case '待取回':
         color = '#82CD5E'
         break
+      case '已取回':
+        color = '#89D961'
+        break
       default:
         color = '#000'
         break
@@ -408,7 +411,7 @@
         <el-input v-model.trim="listQuery.manufactureNo" placeholder="设备出厂编号" clearable />
       </search-item>
       <search-item v-if="$props.statusName === '全部'">
-        <el-select v-model="listQuery.receiveStatus" placeholder="任务单状态" clearable>
+        <el-select v-model="listQuery.orderStatus" placeholder="任务单状态" clearable>
           <el-option v-for="item in receiveStatusList" :key="item.value" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
@@ -435,8 +438,8 @@
         <template #columns>
           <el-table-column v-if="$props.statusName === '全部'" label="任务单状态" align="center">
             <template #default="scope">
-              <span :style="{ color: TextColor(scope.row.receiveStatusName) }">
-                {{ scope.row.receiveStatusName }}
+              <span :style="{ color: TextColor(scope.row.orderStatusName) }">
+                {{ scope.row.orderStatusName }}
               </span>
             </template>
           </el-table-column>
@@ -487,7 +490,7 @@
               <!-- <el-button v-if="proxy.hasPerm(permUrl.edit) && $props.statusName === '全部'" link type="primary" :disabled="scope.row.receiveStatusName !== '未接收'" size="small" @click="handler(scope.row, 'update')">
                 编辑
               </el-button> -->
-              <el-button v-if="proxy.hasPerm(permUrl.cancel) && $props.statusName === '全部'" :disabled="scope.row.receiveStatusName !== '未接收'" link type="danger" size="small" @click="cancelHandler(scope.row)">
+              <el-button v-if="proxy.hasPerm(permUrl.cancel) && $props.statusName === '全部'" :disabled="scope.row.orderStatusName !== '未接收'" link type="danger" size="small" @click="cancelHandler(scope.row)">
                 取消
               </el-button>
             </template>
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index 0bf751f..8110a5b 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -314,23 +314,44 @@
   return (name: string) => {
     let color = ''
     switch (name) {
-      case '未接收':
-        color = '#888'
+      // case '未接收':
+      //   color = '#888'
+      //   break
+      // case '已接收':
+      //   color = '#000'
+      //   break
+      // case '已取消':
+      //   color = '#EAA341'
+      //   break
+      // case '已退回':
+      //   color = '#F68787'
+      //   break
+      // case '待取回':
+      //   color = '#82CD5E'
+      //   break
+      // case '已取回':
+      //   color = '#89D961'
+      //   break
+      case '检定中':
+        color = '#40AAFF'
         break
-      case '已接收':
+      case '已检完':
+        color = '#F0F9EB'
+        break
+      case '未检定':
         color = '#000'
         break
-      case '已取消':
-        color = '#EAA341'
+      case '已接收':
+        color = '#F0F9EB'
+        break
+      case '未接收':
+        color = '#000'
         break
       case '已退回':
         color = '#F68787'
         break
-      case '检测完成':
-        color = '#82CD5E'
-        break
-      case '检定中':
-        color = '#4FA6FF'
+      case '待补送':
+        color = '#EAA341'
         break
       default:
         color = '#000'
@@ -372,11 +393,12 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in ($route.path.includes('detail') && $route.query.statusName === '全部' ? columnsDetail : columnsHandler)" :key="item.value" :width="item.width" :prop="item.value" :label="item.text"
-        align="center"
+        v-for="item in ($route.path.includes('detail') && $route.query.statusName === '全部' ? columnsDetail : columnsHandler)"
+        :key="item.value" :width="item.width" :prop="item.value" :label="item.text" align="center"
       >
         <template #header>
-          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text
+          }}</span>
         </template>
         <template #default="scope">
           <!-- <el-button v-if="!scope.row.editable && !item.isUpload && item.text === '设备名称' && $route.path.includes('detail')" link type="primary" @click="deviceDetail(scope.row)">
@@ -388,11 +410,11 @@
             v-if="scope.row.editable && !item.isBtn && !item.isUpload" v-model="scope.row[item.value]" :autofocus="true"
             :placeholder="`${item.text}`" class="input"
           /> -->
-          <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+          <span v-if="!scope.row.editable" :class="{ link: $route.query.statusName === '全部' && item.text === '设备名称' ? true : false }" @click="deviceDetail(scope.row)"> {{
+            scope.row[item.value] }}</span>
           <el-input
             v-if="scope.row.editable && item.type === 'input'" v-model="scope.row[item.value]" :autofocus="true"
-            :placeholder="`${item.text}`" class="input"
-            @focus="select(item.text, scope.$index)"
+            :placeholder="`${item.text}`" class="input" @focus="select(item.text, scope.$index)"
           />
           <el-input
             v-if="scope.row.editable && item.type === 'btn'" v-model="scope.row[item.value]" :autofocus="true"
@@ -420,11 +442,16 @@
             </span>
           </template>
         </el-table-column>
+
+        <el-table-column align="center" label="接受状态说明">
+          <template #default="scope">
+            {{ scope.row.remark }}
+          </template>
+        </el-table-column>
         <el-table-column align="center" label="检定结果">
           <template #default="scope">
             <el-tag
-              v-if="['合格', '不合格', '限用'].includes(scope.row.measureCompletePercent)" :type="
-                scope.row.measureCompletePercent === '合格' ? 'success' : scope.row.measureCompletePercent === '不合格' ? 'danger' : scope.row.measureCompletePercent === '限用' ? 'warning' : 'primary'
+              v-if="['合格', '不合格', '限用'].includes(scope.row.measureCompletePercent)" :type="scope.row.measureCompletePercent === '合格' ? 'success' : scope.row.measureCompletePercent === '不合格' ? 'danger' : scope.row.measureCompletePercent === '限用' ? 'warning' : ''
               "
             >
               {{ scope.row.measureCompletePercent }}
@@ -439,6 +466,11 @@
             {{ scope.row.measureCompleteTime }}
           </template>
         </el-table-column>
+        <el-table-column align="center" label="检定说明">
+          <template #default="scope">
+            {{ scope.row.measureRemark }}
+          </template>
+        </el-table-column>
       </template>
     </el-table>
   </detail-block-switch>
@@ -452,4 +484,13 @@
 .el-select {
   width: 100%;
 }
+
+.link {
+  color: #40aaff;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
 </style>

diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue
index 58aa0af..1c1c923 100644
--- a/src/views/tested/MeasurementBusiness/detection/index.vue
+++ b/src/views/tested/MeasurementBusiness/detection/index.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/detection'
 import { printJSON } from '@/utils/printUtils'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   noticeDateEnd: '',
@@ -14,6 +15,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'InspectionResultReviewNotice')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
diff --git a/src/views/tested/MeasurementBusiness/notice/index.vue b/src/views/tested/MeasurementBusiness/notice/index.vue
index de0cf86..e161859 100644
--- a/src/views/tested/MeasurementBusiness/notice/index.vue
+++ b/src/views/tested/MeasurementBusiness/notice/index.vue
@@ -3,6 +3,7 @@
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/notice'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   applicantName: '',
@@ -18,6 +19,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'SubcontractingNotice')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
diff --git a/src/views/tested/MeasurementBusiness/opinion/components/list.vue b/src/views/tested/MeasurementBusiness/opinion/components/list.vue
index a2e035c..4e5fd62 100644
--- a/src/views/tested/MeasurementBusiness/opinion/components/list.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/components/list.vue
@@ -9,6 +9,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { getDictByCode } from '@/api/system/dict'
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   statusName: {
     type: String,
@@ -24,6 +25,9 @@
   未通过: '5',
   已取消: '6',
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'ClientOpinionForm')
+})
 const listQuery = reactive({
   approvalStatus: '0',
   createTimeEnd: '',
diff --git a/src/views/tested/MeasurementBusiness/review/index.vue b/src/views/tested/MeasurementBusiness/review/index.vue
index b4c16f9..c2f4c68 100644
--- a/src/views/tested/MeasurementBusiness/review/index.vue
+++ b/src/views/tested/MeasurementBusiness/review/index.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/review'
 import { getDictByCode } from '@/api/system/dict'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   approvalStatus: '',
@@ -18,6 +19,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'ReviewForm')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref([
   `${new Date().getFullYear()}-01-01`,
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/index.vue b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
index 238bbd6..aef9dab 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/index.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
@@ -3,6 +3,7 @@
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/satisfaction'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   sendTimeStart: '',
@@ -11,6 +12,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'ClientSatisfactionSurveyForm')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
diff --git a/src/views/tested/MeasurementPlan/board/index.vue b/src/views/tested/MeasurementPlan/board/index.vue
index 8d14386..850326e 100644
--- a/src/views/tested/MeasurementPlan/board/index.vue
+++ b/src/views/tested/MeasurementPlan/board/index.vue
@@ -5,12 +5,16 @@
 import { exportListApi, getListPage } from '@/api/eqpt/measurementPlan/board'
 import { exportFile } from '@/utils/exportUtils'
 import { buildTree, toTreeList } from '@/utils/structure'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   deptName: '',
   // offset: 1,
   // limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'BoardList')
+})
 const columns = ref<any>([
   {
     text: '部门',
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index f7390f9..e2061e0 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -5,6 +5,7 @@
 import { getListPage } from '@/api/eqpt/measurementPlan/dept'
 import useUserStore from '@/store/modules/user'
 import { getUserDept } from '@/api/system/user'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   // notifyType 通知类型(负责人/部门，字典值)
   notifyType: {
@@ -12,6 +13,10 @@
     required: true,
   },
 })
+
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, $props.notifyType === '2' ? 'DeptNotice' : 'CuratorNotice')
+})
 const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
 const userStore = useUserStore()
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index 1f64a62..ee1d163 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -11,6 +11,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 import { getPostList } from '@/api/system/post'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   // 申请类型（字典值，提前/延迟）
   approvalType: {
@@ -23,6 +24,9 @@
     required: true,
   },
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, $props.approvalType === '0' ? 'EarlyApplication' : 'DelayApplication')
+})
 const applyDict = ref<{ [key: string]: string }>({
   审批: '',
   草稿箱: '1',
diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue
index f5eedcb..d5b57e4 100644
--- a/src/views/tested/MeasurementPlan/plan/components/list.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/list.vue
@@ -13,6 +13,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 import useUserStore from '@/store/modules/user'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   statusName: {
     type: String,
@@ -28,6 +29,9 @@
   未通过: '5',
   已取消: '6',
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'PlanIndex')
+})
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   approvalStatus: '', //	申请状态(审批列表传)		false
diff --git a/src/views/tested/MeasurementPlan/task/components/edit.vue b/src/views/tested/MeasurementPlan/task/components/edit.vue
index 9c2f2d9..86b6bd2 100644
--- a/src/views/tested/MeasurementPlan/task/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/task/components/edit.vue
@@ -54,6 +54,7 @@
   isOnSiteCheck: '0',
   onSiteCheckTime: '',
   deptId: '',
+  orderStatusName: '',
 }) // 表单
 const checkPhone = (rule: any, value: any, callback: any) => {
   if (value === '') {
@@ -550,7 +551,7 @@
           <el-row v-if="$route.path.includes('detail') && $route.query.statusName === '全部'" :gutter="24" class="marg">
             <el-col :span="6">
               <el-form-item label="任务单状态">
-                <el-input v-model.trim="ruleForm.receiveStatusName" />
+                <el-input v-model.trim="ruleForm.orderStatusName" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
diff --git a/src/views/tested/MeasurementPlan/task/components/list.vue b/src/views/tested/MeasurementPlan/task/components/list.vue
index c81fd92..d5c6e17 100644
--- a/src/views/tested/MeasurementPlan/task/components/list.vue
+++ b/src/views/tested/MeasurementPlan/task/components/list.vue
@@ -31,7 +31,7 @@
   usePositionId: '',
   measureCompany: '',
   manufactureNo: '',
-  receiveStatus: '',
+  orderStatus: '',
   offset: 1,
   limit: 20,
   sort: 'desc',
@@ -110,7 +110,7 @@
   // },
   {
     text: '计划送检时间',
-    value: 'requireOverTime',
+    value: 'planDeliverTime',
     align: 'center',
   },
   // {
@@ -144,7 +144,7 @@
 watch(() => $props.statusName, (newVal) => {
   if (newVal) {
     listQuery.approvalStatus = applyDict.value[newVal] as string
-    listQuery.receiveStatus = $props.statusName === '全部' ? '' : listQuery.receiveStatus
+    listQuery.orderStatus = $props.statusName === '全部' ? '' : listQuery.orderStatus
     fetchData()
   }
 },
@@ -165,7 +165,7 @@
   listQuery.usePositionId = ''
   listQuery.measureCompany = ''
   listQuery.manufactureNo = ''
-  listQuery.receiveStatus = ''
+  listQuery.orderStatus = ''
   listQuery.offset = 1
   listQuery.limit = 20
   listQuery.sort = 'desc'
@@ -278,7 +278,7 @@
   })
   // })
   // 接收状态
-  getDictByCode('orderStatus').then((res) => {
+  getDictByCode('eqptTaskStatus').then((res) => {
     receiveStatusList.value = res.data
   })
 }
@@ -362,9 +362,12 @@
       case '已退回':
         color = '#F68787'
         break
-      case '检测完成':
+      case '待取回':
         color = '#82CD5E'
         break
+      case '已取回':
+        color = '#89D961'
+        break
       default:
         color = '#000'
         break
@@ -408,7 +411,7 @@
         <el-input v-model.trim="listQuery.manufactureNo" placeholder="设备出厂编号" clearable />
       </search-item>
       <search-item v-if="$props.statusName === '全部'">
-        <el-select v-model="listQuery.receiveStatus" placeholder="任务单状态" clearable>
+        <el-select v-model="listQuery.orderStatus" placeholder="任务单状态" clearable>
           <el-option v-for="item in receiveStatusList" :key="item.value" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
@@ -435,8 +438,8 @@
         <template #columns>
           <el-table-column v-if="$props.statusName === '全部'" label="任务单状态" align="center">
             <template #default="scope">
-              <span :style="{ color: TextColor(scope.row.receiveStatusName) }">
-                {{ scope.row.receiveStatusName }}
+              <span :style="{ color: TextColor(scope.row.orderStatusName) }">
+                {{ scope.row.orderStatusName }}
               </span>
             </template>
           </el-table-column>
@@ -487,7 +490,7 @@
               <!-- <el-button v-if="proxy.hasPerm(permUrl.edit) && $props.statusName === '全部'" link type="primary" :disabled="scope.row.receiveStatusName !== '未接收'" size="small" @click="handler(scope.row, 'update')">
                 编辑
               </el-button> -->
-              <el-button v-if="proxy.hasPerm(permUrl.cancel) && $props.statusName === '全部'" :disabled="scope.row.receiveStatusName !== '未接收'" link type="danger" size="small" @click="cancelHandler(scope.row)">
+              <el-button v-if="proxy.hasPerm(permUrl.cancel) && $props.statusName === '全部'" :disabled="scope.row.orderStatusName !== '未接收'" link type="danger" size="small" @click="cancelHandler(scope.row)">
                 取消
               </el-button>
             </template>
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index 0bf751f..8110a5b 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -314,23 +314,44 @@
   return (name: string) => {
     let color = ''
     switch (name) {
-      case '未接收':
-        color = '#888'
+      // case '未接收':
+      //   color = '#888'
+      //   break
+      // case '已接收':
+      //   color = '#000'
+      //   break
+      // case '已取消':
+      //   color = '#EAA341'
+      //   break
+      // case '已退回':
+      //   color = '#F68787'
+      //   break
+      // case '待取回':
+      //   color = '#82CD5E'
+      //   break
+      // case '已取回':
+      //   color = '#89D961'
+      //   break
+      case '检定中':
+        color = '#40AAFF'
         break
-      case '已接收':
+      case '已检完':
+        color = '#F0F9EB'
+        break
+      case '未检定':
         color = '#000'
         break
-      case '已取消':
-        color = '#EAA341'
+      case '已接收':
+        color = '#F0F9EB'
+        break
+      case '未接收':
+        color = '#000'
         break
       case '已退回':
         color = '#F68787'
         break
-      case '检测完成':
-        color = '#82CD5E'
-        break
-      case '检定中':
-        color = '#4FA6FF'
+      case '待补送':
+        color = '#EAA341'
         break
       default:
         color = '#000'
@@ -372,11 +393,12 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in ($route.path.includes('detail') && $route.query.statusName === '全部' ? columnsDetail : columnsHandler)" :key="item.value" :width="item.width" :prop="item.value" :label="item.text"
-        align="center"
+        v-for="item in ($route.path.includes('detail') && $route.query.statusName === '全部' ? columnsDetail : columnsHandler)"
+        :key="item.value" :width="item.width" :prop="item.value" :label="item.text" align="center"
       >
         <template #header>
-          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text
+          }}</span>
         </template>
         <template #default="scope">
           <!-- <el-button v-if="!scope.row.editable && !item.isUpload && item.text === '设备名称' && $route.path.includes('detail')" link type="primary" @click="deviceDetail(scope.row)">
@@ -388,11 +410,11 @@
             v-if="scope.row.editable && !item.isBtn && !item.isUpload" v-model="scope.row[item.value]" :autofocus="true"
             :placeholder="`${item.text}`" class="input"
           /> -->
-          <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+          <span v-if="!scope.row.editable" :class="{ link: $route.query.statusName === '全部' && item.text === '设备名称' ? true : false }" @click="deviceDetail(scope.row)"> {{
+            scope.row[item.value] }}</span>
           <el-input
             v-if="scope.row.editable && item.type === 'input'" v-model="scope.row[item.value]" :autofocus="true"
-            :placeholder="`${item.text}`" class="input"
-            @focus="select(item.text, scope.$index)"
+            :placeholder="`${item.text}`" class="input" @focus="select(item.text, scope.$index)"
           />
           <el-input
             v-if="scope.row.editable && item.type === 'btn'" v-model="scope.row[item.value]" :autofocus="true"
@@ -420,11 +442,16 @@
             </span>
           </template>
         </el-table-column>
+
+        <el-table-column align="center" label="接受状态说明">
+          <template #default="scope">
+            {{ scope.row.remark }}
+          </template>
+        </el-table-column>
         <el-table-column align="center" label="检定结果">
           <template #default="scope">
             <el-tag
-              v-if="['合格', '不合格', '限用'].includes(scope.row.measureCompletePercent)" :type="
-                scope.row.measureCompletePercent === '合格' ? 'success' : scope.row.measureCompletePercent === '不合格' ? 'danger' : scope.row.measureCompletePercent === '限用' ? 'warning' : 'primary'
+              v-if="['合格', '不合格', '限用'].includes(scope.row.measureCompletePercent)" :type="scope.row.measureCompletePercent === '合格' ? 'success' : scope.row.measureCompletePercent === '不合格' ? 'danger' : scope.row.measureCompletePercent === '限用' ? 'warning' : ''
               "
             >
               {{ scope.row.measureCompletePercent }}
@@ -439,6 +466,11 @@
             {{ scope.row.measureCompleteTime }}
           </template>
         </el-table-column>
+        <el-table-column align="center" label="检定说明">
+          <template #default="scope">
+            {{ scope.row.measureRemark }}
+          </template>
+        </el-table-column>
       </template>
     </el-table>
   </detail-block-switch>
@@ -452,4 +484,13 @@
 .el-select {
   width: 100%;
 }
+
+.link {
+  color: #40aaff;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
 </style>
diff --git a/src/views/tested/dashboard/list.vue b/src/views/tested/dashboard/list.vue
index f82c9b0..ec65781 100644
--- a/src/views/tested/dashboard/list.vue
+++ b/src/views/tested/dashboard/list.vue
@@ -1,8 +1,13 @@
 <script lang="ts" setup name="BoardIndex">
 import messList from './components/list.vue'
 import apprList from './components/listApprove.vue'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $route = useRoute()
 //  检定 verification  通知 notice  审批 approve  工作 work
+
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'BoardIndex')
+})
 </script>
 
 <template>

diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue
index 58aa0af..1c1c923 100644
--- a/src/views/tested/MeasurementBusiness/detection/index.vue
+++ b/src/views/tested/MeasurementBusiness/detection/index.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/detection'
 import { printJSON } from '@/utils/printUtils'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   noticeDateEnd: '',
@@ -14,6 +15,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'InspectionResultReviewNotice')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
diff --git a/src/views/tested/MeasurementBusiness/notice/index.vue b/src/views/tested/MeasurementBusiness/notice/index.vue
index de0cf86..e161859 100644
--- a/src/views/tested/MeasurementBusiness/notice/index.vue
+++ b/src/views/tested/MeasurementBusiness/notice/index.vue
@@ -3,6 +3,7 @@
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/notice'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   applicantName: '',
@@ -18,6 +19,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'SubcontractingNotice')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
diff --git a/src/views/tested/MeasurementBusiness/opinion/components/list.vue b/src/views/tested/MeasurementBusiness/opinion/components/list.vue
index a2e035c..4e5fd62 100644
--- a/src/views/tested/MeasurementBusiness/opinion/components/list.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/components/list.vue
@@ -9,6 +9,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { getDictByCode } from '@/api/system/dict'
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   statusName: {
     type: String,
@@ -24,6 +25,9 @@
   未通过: '5',
   已取消: '6',
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'ClientOpinionForm')
+})
 const listQuery = reactive({
   approvalStatus: '0',
   createTimeEnd: '',
diff --git a/src/views/tested/MeasurementBusiness/review/index.vue b/src/views/tested/MeasurementBusiness/review/index.vue
index b4c16f9..c2f4c68 100644
--- a/src/views/tested/MeasurementBusiness/review/index.vue
+++ b/src/views/tested/MeasurementBusiness/review/index.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/review'
 import { getDictByCode } from '@/api/system/dict'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   approvalStatus: '',
@@ -18,6 +19,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'ReviewForm')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref([
   `${new Date().getFullYear()}-01-01`,
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/index.vue b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
index 238bbd6..aef9dab 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/index.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
@@ -3,6 +3,7 @@
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/satisfaction'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   sendTimeStart: '',
@@ -11,6 +12,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'ClientSatisfactionSurveyForm')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
diff --git a/src/views/tested/MeasurementPlan/board/index.vue b/src/views/tested/MeasurementPlan/board/index.vue
index 8d14386..850326e 100644
--- a/src/views/tested/MeasurementPlan/board/index.vue
+++ b/src/views/tested/MeasurementPlan/board/index.vue
@@ -5,12 +5,16 @@
 import { exportListApi, getListPage } from '@/api/eqpt/measurementPlan/board'
 import { exportFile } from '@/utils/exportUtils'
 import { buildTree, toTreeList } from '@/utils/structure'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   deptName: '',
   // offset: 1,
   // limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'BoardList')
+})
 const columns = ref<any>([
   {
     text: '部门',
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index f7390f9..e2061e0 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -5,6 +5,7 @@
 import { getListPage } from '@/api/eqpt/measurementPlan/dept'
 import useUserStore from '@/store/modules/user'
 import { getUserDept } from '@/api/system/user'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   // notifyType 通知类型(负责人/部门，字典值)
   notifyType: {
@@ -12,6 +13,10 @@
     required: true,
   },
 })
+
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, $props.notifyType === '2' ? 'DeptNotice' : 'CuratorNotice')
+})
 const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
 const userStore = useUserStore()
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index 1f64a62..ee1d163 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -11,6 +11,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 import { getPostList } from '@/api/system/post'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   // 申请类型（字典值，提前/延迟）
   approvalType: {
@@ -23,6 +24,9 @@
     required: true,
   },
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, $props.approvalType === '0' ? 'EarlyApplication' : 'DelayApplication')
+})
 const applyDict = ref<{ [key: string]: string }>({
   审批: '',
   草稿箱: '1',
diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue
index f5eedcb..d5b57e4 100644
--- a/src/views/tested/MeasurementPlan/plan/components/list.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/list.vue
@@ -13,6 +13,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 import useUserStore from '@/store/modules/user'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   statusName: {
     type: String,
@@ -28,6 +29,9 @@
   未通过: '5',
   已取消: '6',
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'PlanIndex')
+})
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   approvalStatus: '', //	申请状态(审批列表传)		false
diff --git a/src/views/tested/MeasurementPlan/task/components/edit.vue b/src/views/tested/MeasurementPlan/task/components/edit.vue
index 9c2f2d9..86b6bd2 100644
--- a/src/views/tested/MeasurementPlan/task/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/task/components/edit.vue
@@ -54,6 +54,7 @@
   isOnSiteCheck: '0',
   onSiteCheckTime: '',
   deptId: '',
+  orderStatusName: '',
 }) // 表单
 const checkPhone = (rule: any, value: any, callback: any) => {
   if (value === '') {
@@ -550,7 +551,7 @@
           <el-row v-if="$route.path.includes('detail') && $route.query.statusName === '全部'" :gutter="24" class="marg">
             <el-col :span="6">
               <el-form-item label="任务单状态">
-                <el-input v-model.trim="ruleForm.receiveStatusName" />
+                <el-input v-model.trim="ruleForm.orderStatusName" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
diff --git a/src/views/tested/MeasurementPlan/task/components/list.vue b/src/views/tested/MeasurementPlan/task/components/list.vue
index c81fd92..d5c6e17 100644
--- a/src/views/tested/MeasurementPlan/task/components/list.vue
+++ b/src/views/tested/MeasurementPlan/task/components/list.vue
@@ -31,7 +31,7 @@
   usePositionId: '',
   measureCompany: '',
   manufactureNo: '',
-  receiveStatus: '',
+  orderStatus: '',
   offset: 1,
   limit: 20,
   sort: 'desc',
@@ -110,7 +110,7 @@
   // },
   {
     text: '计划送检时间',
-    value: 'requireOverTime',
+    value: 'planDeliverTime',
     align: 'center',
   },
   // {
@@ -144,7 +144,7 @@
 watch(() => $props.statusName, (newVal) => {
   if (newVal) {
     listQuery.approvalStatus = applyDict.value[newVal] as string
-    listQuery.receiveStatus = $props.statusName === '全部' ? '' : listQuery.receiveStatus
+    listQuery.orderStatus = $props.statusName === '全部' ? '' : listQuery.orderStatus
     fetchData()
   }
 },
@@ -165,7 +165,7 @@
   listQuery.usePositionId = ''
   listQuery.measureCompany = ''
   listQuery.manufactureNo = ''
-  listQuery.receiveStatus = ''
+  listQuery.orderStatus = ''
   listQuery.offset = 1
   listQuery.limit = 20
   listQuery.sort = 'desc'
@@ -278,7 +278,7 @@
   })
   // })
   // 接收状态
-  getDictByCode('orderStatus').then((res) => {
+  getDictByCode('eqptTaskStatus').then((res) => {
     receiveStatusList.value = res.data
   })
 }
@@ -362,9 +362,12 @@
       case '已退回':
         color = '#F68787'
         break
-      case '检测完成':
+      case '待取回':
         color = '#82CD5E'
         break
+      case '已取回':
+        color = '#89D961'
+        break
       default:
         color = '#000'
         break
@@ -408,7 +411,7 @@
         <el-input v-model.trim="listQuery.manufactureNo" placeholder="设备出厂编号" clearable />
       </search-item>
       <search-item v-if="$props.statusName === '全部'">
-        <el-select v-model="listQuery.receiveStatus" placeholder="任务单状态" clearable>
+        <el-select v-model="listQuery.orderStatus" placeholder="任务单状态" clearable>
           <el-option v-for="item in receiveStatusList" :key="item.value" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
@@ -435,8 +438,8 @@
         <template #columns>
           <el-table-column v-if="$props.statusName === '全部'" label="任务单状态" align="center">
             <template #default="scope">
-              <span :style="{ color: TextColor(scope.row.receiveStatusName) }">
-                {{ scope.row.receiveStatusName }}
+              <span :style="{ color: TextColor(scope.row.orderStatusName) }">
+                {{ scope.row.orderStatusName }}
               </span>
             </template>
           </el-table-column>
@@ -487,7 +490,7 @@
               <!-- <el-button v-if="proxy.hasPerm(permUrl.edit) && $props.statusName === '全部'" link type="primary" :disabled="scope.row.receiveStatusName !== '未接收'" size="small" @click="handler(scope.row, 'update')">
                 编辑
               </el-button> -->
-              <el-button v-if="proxy.hasPerm(permUrl.cancel) && $props.statusName === '全部'" :disabled="scope.row.receiveStatusName !== '未接收'" link type="danger" size="small" @click="cancelHandler(scope.row)">
+              <el-button v-if="proxy.hasPerm(permUrl.cancel) && $props.statusName === '全部'" :disabled="scope.row.orderStatusName !== '未接收'" link type="danger" size="small" @click="cancelHandler(scope.row)">
                 取消
               </el-button>
             </template>
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index 0bf751f..8110a5b 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -314,23 +314,44 @@
   return (name: string) => {
     let color = ''
     switch (name) {
-      case '未接收':
-        color = '#888'
+      // case '未接收':
+      //   color = '#888'
+      //   break
+      // case '已接收':
+      //   color = '#000'
+      //   break
+      // case '已取消':
+      //   color = '#EAA341'
+      //   break
+      // case '已退回':
+      //   color = '#F68787'
+      //   break
+      // case '待取回':
+      //   color = '#82CD5E'
+      //   break
+      // case '已取回':
+      //   color = '#89D961'
+      //   break
+      case '检定中':
+        color = '#40AAFF'
         break
-      case '已接收':
+      case '已检完':
+        color = '#F0F9EB'
+        break
+      case '未检定':
         color = '#000'
         break
-      case '已取消':
-        color = '#EAA341'
+      case '已接收':
+        color = '#F0F9EB'
+        break
+      case '未接收':
+        color = '#000'
         break
       case '已退回':
         color = '#F68787'
         break
-      case '检测完成':
-        color = '#82CD5E'
-        break
-      case '检定中':
-        color = '#4FA6FF'
+      case '待补送':
+        color = '#EAA341'
         break
       default:
         color = '#000'
@@ -372,11 +393,12 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in ($route.path.includes('detail') && $route.query.statusName === '全部' ? columnsDetail : columnsHandler)" :key="item.value" :width="item.width" :prop="item.value" :label="item.text"
-        align="center"
+        v-for="item in ($route.path.includes('detail') && $route.query.statusName === '全部' ? columnsDetail : columnsHandler)"
+        :key="item.value" :width="item.width" :prop="item.value" :label="item.text" align="center"
       >
         <template #header>
-          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text
+          }}</span>
         </template>
         <template #default="scope">
           <!-- <el-button v-if="!scope.row.editable && !item.isUpload && item.text === '设备名称' && $route.path.includes('detail')" link type="primary" @click="deviceDetail(scope.row)">
@@ -388,11 +410,11 @@
             v-if="scope.row.editable && !item.isBtn && !item.isUpload" v-model="scope.row[item.value]" :autofocus="true"
             :placeholder="`${item.text}`" class="input"
           /> -->
-          <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+          <span v-if="!scope.row.editable" :class="{ link: $route.query.statusName === '全部' && item.text === '设备名称' ? true : false }" @click="deviceDetail(scope.row)"> {{
+            scope.row[item.value] }}</span>
           <el-input
             v-if="scope.row.editable && item.type === 'input'" v-model="scope.row[item.value]" :autofocus="true"
-            :placeholder="`${item.text}`" class="input"
-            @focus="select(item.text, scope.$index)"
+            :placeholder="`${item.text}`" class="input" @focus="select(item.text, scope.$index)"
           />
           <el-input
             v-if="scope.row.editable && item.type === 'btn'" v-model="scope.row[item.value]" :autofocus="true"
@@ -420,11 +442,16 @@
             </span>
           </template>
         </el-table-column>
+
+        <el-table-column align="center" label="接受状态说明">
+          <template #default="scope">
+            {{ scope.row.remark }}
+          </template>
+        </el-table-column>
         <el-table-column align="center" label="检定结果">
           <template #default="scope">
             <el-tag
-              v-if="['合格', '不合格', '限用'].includes(scope.row.measureCompletePercent)" :type="
-                scope.row.measureCompletePercent === '合格' ? 'success' : scope.row.measureCompletePercent === '不合格' ? 'danger' : scope.row.measureCompletePercent === '限用' ? 'warning' : 'primary'
+              v-if="['合格', '不合格', '限用'].includes(scope.row.measureCompletePercent)" :type="scope.row.measureCompletePercent === '合格' ? 'success' : scope.row.measureCompletePercent === '不合格' ? 'danger' : scope.row.measureCompletePercent === '限用' ? 'warning' : ''
               "
             >
               {{ scope.row.measureCompletePercent }}
@@ -439,6 +466,11 @@
             {{ scope.row.measureCompleteTime }}
           </template>
         </el-table-column>
+        <el-table-column align="center" label="检定说明">
+          <template #default="scope">
+            {{ scope.row.measureRemark }}
+          </template>
+        </el-table-column>
       </template>
     </el-table>
   </detail-block-switch>
@@ -452,4 +484,13 @@
 .el-select {
   width: 100%;
 }
+
+.link {
+  color: #40aaff;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
 </style>
diff --git a/src/views/tested/dashboard/list.vue b/src/views/tested/dashboard/list.vue
index f82c9b0..ec65781 100644
--- a/src/views/tested/dashboard/list.vue
+++ b/src/views/tested/dashboard/list.vue
@@ -1,8 +1,13 @@
 <script lang="ts" setup name="BoardIndex">
 import messList from './components/list.vue'
 import apprList from './components/listApprove.vue'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $route = useRoute()
 //  检定 verification  通知 notice  审批 approve  工作 work
+
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'BoardIndex')
+})
 </script>
 
 <template>
diff --git a/src/views/tested/device/group/components/list.vue b/src/views/tested/device/group/components/list.vue
index 4d3e229..04df4b7 100644
--- a/src/views/tested/device/group/components/list.vue
+++ b/src/views/tested/device/group/components/list.vue
@@ -8,6 +8,7 @@
 import { toTreeList } from '@/utils/structure'
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
 import { getDeptList, getDeptTree, getDeptTreeList, getDeptTreeListByPid } from '@/api/system/dept'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const userStore = useUserStore()
 const listQuery = reactive({
@@ -23,6 +24,10 @@
   sort: 'desc',
   orderBy: 'create_time',
 })
+
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'DeviceGroupIndex')
+})
 const columns = ref([
   {
     text: '所在单位',

diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue
index 58aa0af..1c1c923 100644
--- a/src/views/tested/MeasurementBusiness/detection/index.vue
+++ b/src/views/tested/MeasurementBusiness/detection/index.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/detection'
 import { printJSON } from '@/utils/printUtils'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   noticeDateEnd: '',
@@ -14,6 +15,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'InspectionResultReviewNotice')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
diff --git a/src/views/tested/MeasurementBusiness/notice/index.vue b/src/views/tested/MeasurementBusiness/notice/index.vue
index de0cf86..e161859 100644
--- a/src/views/tested/MeasurementBusiness/notice/index.vue
+++ b/src/views/tested/MeasurementBusiness/notice/index.vue
@@ -3,6 +3,7 @@
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/notice'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   applicantName: '',
@@ -18,6 +19,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'SubcontractingNotice')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
diff --git a/src/views/tested/MeasurementBusiness/opinion/components/list.vue b/src/views/tested/MeasurementBusiness/opinion/components/list.vue
index a2e035c..4e5fd62 100644
--- a/src/views/tested/MeasurementBusiness/opinion/components/list.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/components/list.vue
@@ -9,6 +9,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { getDictByCode } from '@/api/system/dict'
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   statusName: {
     type: String,
@@ -24,6 +25,9 @@
   未通过: '5',
   已取消: '6',
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'ClientOpinionForm')
+})
 const listQuery = reactive({
   approvalStatus: '0',
   createTimeEnd: '',
diff --git a/src/views/tested/MeasurementBusiness/review/index.vue b/src/views/tested/MeasurementBusiness/review/index.vue
index b4c16f9..c2f4c68 100644
--- a/src/views/tested/MeasurementBusiness/review/index.vue
+++ b/src/views/tested/MeasurementBusiness/review/index.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/review'
 import { getDictByCode } from '@/api/system/dict'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   approvalStatus: '',
@@ -18,6 +19,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'ReviewForm')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref([
   `${new Date().getFullYear()}-01-01`,
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/index.vue b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
index 238bbd6..aef9dab 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/index.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
@@ -3,6 +3,7 @@
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/satisfaction'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   sendTimeStart: '',
@@ -11,6 +12,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'ClientSatisfactionSurveyForm')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
diff --git a/src/views/tested/MeasurementPlan/board/index.vue b/src/views/tested/MeasurementPlan/board/index.vue
index 8d14386..850326e 100644
--- a/src/views/tested/MeasurementPlan/board/index.vue
+++ b/src/views/tested/MeasurementPlan/board/index.vue
@@ -5,12 +5,16 @@
 import { exportListApi, getListPage } from '@/api/eqpt/measurementPlan/board'
 import { exportFile } from '@/utils/exportUtils'
 import { buildTree, toTreeList } from '@/utils/structure'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   deptName: '',
   // offset: 1,
   // limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'BoardList')
+})
 const columns = ref<any>([
   {
     text: '部门',
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index f7390f9..e2061e0 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -5,6 +5,7 @@
 import { getListPage } from '@/api/eqpt/measurementPlan/dept'
 import useUserStore from '@/store/modules/user'
 import { getUserDept } from '@/api/system/user'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   // notifyType 通知类型(负责人/部门，字典值)
   notifyType: {
@@ -12,6 +13,10 @@
     required: true,
   },
 })
+
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, $props.notifyType === '2' ? 'DeptNotice' : 'CuratorNotice')
+})
 const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
 const userStore = useUserStore()
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index 1f64a62..ee1d163 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -11,6 +11,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 import { getPostList } from '@/api/system/post'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   // 申请类型（字典值，提前/延迟）
   approvalType: {
@@ -23,6 +24,9 @@
     required: true,
   },
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, $props.approvalType === '0' ? 'EarlyApplication' : 'DelayApplication')
+})
 const applyDict = ref<{ [key: string]: string }>({
   审批: '',
   草稿箱: '1',
diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue
index f5eedcb..d5b57e4 100644
--- a/src/views/tested/MeasurementPlan/plan/components/list.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/list.vue
@@ -13,6 +13,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 import useUserStore from '@/store/modules/user'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   statusName: {
     type: String,
@@ -28,6 +29,9 @@
   未通过: '5',
   已取消: '6',
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'PlanIndex')
+})
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   approvalStatus: '', //	申请状态(审批列表传)		false
diff --git a/src/views/tested/MeasurementPlan/task/components/edit.vue b/src/views/tested/MeasurementPlan/task/components/edit.vue
index 9c2f2d9..86b6bd2 100644
--- a/src/views/tested/MeasurementPlan/task/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/task/components/edit.vue
@@ -54,6 +54,7 @@
   isOnSiteCheck: '0',
   onSiteCheckTime: '',
   deptId: '',
+  orderStatusName: '',
 }) // 表单
 const checkPhone = (rule: any, value: any, callback: any) => {
   if (value === '') {
@@ -550,7 +551,7 @@
           <el-row v-if="$route.path.includes('detail') && $route.query.statusName === '全部'" :gutter="24" class="marg">
             <el-col :span="6">
               <el-form-item label="任务单状态">
-                <el-input v-model.trim="ruleForm.receiveStatusName" />
+                <el-input v-model.trim="ruleForm.orderStatusName" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
diff --git a/src/views/tested/MeasurementPlan/task/components/list.vue b/src/views/tested/MeasurementPlan/task/components/list.vue
index c81fd92..d5c6e17 100644
--- a/src/views/tested/MeasurementPlan/task/components/list.vue
+++ b/src/views/tested/MeasurementPlan/task/components/list.vue
@@ -31,7 +31,7 @@
   usePositionId: '',
   measureCompany: '',
   manufactureNo: '',
-  receiveStatus: '',
+  orderStatus: '',
   offset: 1,
   limit: 20,
   sort: 'desc',
@@ -110,7 +110,7 @@
   // },
   {
     text: '计划送检时间',
-    value: 'requireOverTime',
+    value: 'planDeliverTime',
     align: 'center',
   },
   // {
@@ -144,7 +144,7 @@
 watch(() => $props.statusName, (newVal) => {
   if (newVal) {
     listQuery.approvalStatus = applyDict.value[newVal] as string
-    listQuery.receiveStatus = $props.statusName === '全部' ? '' : listQuery.receiveStatus
+    listQuery.orderStatus = $props.statusName === '全部' ? '' : listQuery.orderStatus
     fetchData()
   }
 },
@@ -165,7 +165,7 @@
   listQuery.usePositionId = ''
   listQuery.measureCompany = ''
   listQuery.manufactureNo = ''
-  listQuery.receiveStatus = ''
+  listQuery.orderStatus = ''
   listQuery.offset = 1
   listQuery.limit = 20
   listQuery.sort = 'desc'
@@ -278,7 +278,7 @@
   })
   // })
   // 接收状态
-  getDictByCode('orderStatus').then((res) => {
+  getDictByCode('eqptTaskStatus').then((res) => {
     receiveStatusList.value = res.data
   })
 }
@@ -362,9 +362,12 @@
       case '已退回':
         color = '#F68787'
         break
-      case '检测完成':
+      case '待取回':
         color = '#82CD5E'
         break
+      case '已取回':
+        color = '#89D961'
+        break
       default:
         color = '#000'
         break
@@ -408,7 +411,7 @@
         <el-input v-model.trim="listQuery.manufactureNo" placeholder="设备出厂编号" clearable />
       </search-item>
       <search-item v-if="$props.statusName === '全部'">
-        <el-select v-model="listQuery.receiveStatus" placeholder="任务单状态" clearable>
+        <el-select v-model="listQuery.orderStatus" placeholder="任务单状态" clearable>
           <el-option v-for="item in receiveStatusList" :key="item.value" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
@@ -435,8 +438,8 @@
         <template #columns>
           <el-table-column v-if="$props.statusName === '全部'" label="任务单状态" align="center">
             <template #default="scope">
-              <span :style="{ color: TextColor(scope.row.receiveStatusName) }">
-                {{ scope.row.receiveStatusName }}
+              <span :style="{ color: TextColor(scope.row.orderStatusName) }">
+                {{ scope.row.orderStatusName }}
               </span>
             </template>
           </el-table-column>
@@ -487,7 +490,7 @@
               <!-- <el-button v-if="proxy.hasPerm(permUrl.edit) && $props.statusName === '全部'" link type="primary" :disabled="scope.row.receiveStatusName !== '未接收'" size="small" @click="handler(scope.row, 'update')">
                 编辑
               </el-button> -->
-              <el-button v-if="proxy.hasPerm(permUrl.cancel) && $props.statusName === '全部'" :disabled="scope.row.receiveStatusName !== '未接收'" link type="danger" size="small" @click="cancelHandler(scope.row)">
+              <el-button v-if="proxy.hasPerm(permUrl.cancel) && $props.statusName === '全部'" :disabled="scope.row.orderStatusName !== '未接收'" link type="danger" size="small" @click="cancelHandler(scope.row)">
                 取消
               </el-button>
             </template>
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index 0bf751f..8110a5b 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -314,23 +314,44 @@
   return (name: string) => {
     let color = ''
     switch (name) {
-      case '未接收':
-        color = '#888'
+      // case '未接收':
+      //   color = '#888'
+      //   break
+      // case '已接收':
+      //   color = '#000'
+      //   break
+      // case '已取消':
+      //   color = '#EAA341'
+      //   break
+      // case '已退回':
+      //   color = '#F68787'
+      //   break
+      // case '待取回':
+      //   color = '#82CD5E'
+      //   break
+      // case '已取回':
+      //   color = '#89D961'
+      //   break
+      case '检定中':
+        color = '#40AAFF'
         break
-      case '已接收':
+      case '已检完':
+        color = '#F0F9EB'
+        break
+      case '未检定':
         color = '#000'
         break
-      case '已取消':
-        color = '#EAA341'
+      case '已接收':
+        color = '#F0F9EB'
+        break
+      case '未接收':
+        color = '#000'
         break
       case '已退回':
         color = '#F68787'
         break
-      case '检测完成':
-        color = '#82CD5E'
-        break
-      case '检定中':
-        color = '#4FA6FF'
+      case '待补送':
+        color = '#EAA341'
         break
       default:
         color = '#000'
@@ -372,11 +393,12 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in ($route.path.includes('detail') && $route.query.statusName === '全部' ? columnsDetail : columnsHandler)" :key="item.value" :width="item.width" :prop="item.value" :label="item.text"
-        align="center"
+        v-for="item in ($route.path.includes('detail') && $route.query.statusName === '全部' ? columnsDetail : columnsHandler)"
+        :key="item.value" :width="item.width" :prop="item.value" :label="item.text" align="center"
       >
         <template #header>
-          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text
+          }}</span>
         </template>
         <template #default="scope">
           <!-- <el-button v-if="!scope.row.editable && !item.isUpload && item.text === '设备名称' && $route.path.includes('detail')" link type="primary" @click="deviceDetail(scope.row)">
@@ -388,11 +410,11 @@
             v-if="scope.row.editable && !item.isBtn && !item.isUpload" v-model="scope.row[item.value]" :autofocus="true"
             :placeholder="`${item.text}`" class="input"
           /> -->
-          <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+          <span v-if="!scope.row.editable" :class="{ link: $route.query.statusName === '全部' && item.text === '设备名称' ? true : false }" @click="deviceDetail(scope.row)"> {{
+            scope.row[item.value] }}</span>
           <el-input
             v-if="scope.row.editable && item.type === 'input'" v-model="scope.row[item.value]" :autofocus="true"
-            :placeholder="`${item.text}`" class="input"
-            @focus="select(item.text, scope.$index)"
+            :placeholder="`${item.text}`" class="input" @focus="select(item.text, scope.$index)"
           />
           <el-input
             v-if="scope.row.editable && item.type === 'btn'" v-model="scope.row[item.value]" :autofocus="true"
@@ -420,11 +442,16 @@
             </span>
           </template>
         </el-table-column>
+
+        <el-table-column align="center" label="接受状态说明">
+          <template #default="scope">
+            {{ scope.row.remark }}
+          </template>
+        </el-table-column>
         <el-table-column align="center" label="检定结果">
           <template #default="scope">
             <el-tag
-              v-if="['合格', '不合格', '限用'].includes(scope.row.measureCompletePercent)" :type="
-                scope.row.measureCompletePercent === '合格' ? 'success' : scope.row.measureCompletePercent === '不合格' ? 'danger' : scope.row.measureCompletePercent === '限用' ? 'warning' : 'primary'
+              v-if="['合格', '不合格', '限用'].includes(scope.row.measureCompletePercent)" :type="scope.row.measureCompletePercent === '合格' ? 'success' : scope.row.measureCompletePercent === '不合格' ? 'danger' : scope.row.measureCompletePercent === '限用' ? 'warning' : ''
               "
             >
               {{ scope.row.measureCompletePercent }}
@@ -439,6 +466,11 @@
             {{ scope.row.measureCompleteTime }}
           </template>
         </el-table-column>
+        <el-table-column align="center" label="检定说明">
+          <template #default="scope">
+            {{ scope.row.measureRemark }}
+          </template>
+        </el-table-column>
       </template>
     </el-table>
   </detail-block-switch>
@@ -452,4 +484,13 @@
 .el-select {
   width: 100%;
 }
+
+.link {
+  color: #40aaff;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
 </style>
diff --git a/src/views/tested/dashboard/list.vue b/src/views/tested/dashboard/list.vue
index f82c9b0..ec65781 100644
--- a/src/views/tested/dashboard/list.vue
+++ b/src/views/tested/dashboard/list.vue
@@ -1,8 +1,13 @@
 <script lang="ts" setup name="BoardIndex">
 import messList from './components/list.vue'
 import apprList from './components/listApprove.vue'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $route = useRoute()
 //  检定 verification  通知 notice  审批 approve  工作 work
+
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'BoardIndex')
+})
 </script>
 
 <template>
diff --git a/src/views/tested/device/group/components/list.vue b/src/views/tested/device/group/components/list.vue
index 4d3e229..04df4b7 100644
--- a/src/views/tested/device/group/components/list.vue
+++ b/src/views/tested/device/group/components/list.vue
@@ -8,6 +8,7 @@
 import { toTreeList } from '@/utils/structure'
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
 import { getDeptList, getDeptTree, getDeptTreeList, getDeptTreeListByPid } from '@/api/system/dept'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const userStore = useUserStore()
 const listQuery = reactive({
@@ -23,6 +24,10 @@
   sort: 'desc',
   orderBy: 'create_time',
 })
+
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'DeviceGroupIndex')
+})
 const columns = ref([
   {
     text: '所在单位',
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index 755d7ea..b3003ea 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -461,6 +461,14 @@
         //     ruleForm.value.deptId = deptList.value[0].id
         //   }
         // })
+        // 自定填充部门
+        if ($route.params.type === 'create') {
+          if (userStore.deptName !== ruleForm.value.companyName) {
+            setTimeout(() => {
+              ruleForm.value.deptId = userStore.deptId
+            })
+          }
+        }
       }
     })
   }

diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue
index 58aa0af..1c1c923 100644
--- a/src/views/tested/MeasurementBusiness/detection/index.vue
+++ b/src/views/tested/MeasurementBusiness/detection/index.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/detection'
 import { printJSON } from '@/utils/printUtils'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   noticeDateEnd: '',
@@ -14,6 +15,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'InspectionResultReviewNotice')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
diff --git a/src/views/tested/MeasurementBusiness/notice/index.vue b/src/views/tested/MeasurementBusiness/notice/index.vue
index de0cf86..e161859 100644
--- a/src/views/tested/MeasurementBusiness/notice/index.vue
+++ b/src/views/tested/MeasurementBusiness/notice/index.vue
@@ -3,6 +3,7 @@
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/notice'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   applicantName: '',
@@ -18,6 +19,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'SubcontractingNotice')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
diff --git a/src/views/tested/MeasurementBusiness/opinion/components/list.vue b/src/views/tested/MeasurementBusiness/opinion/components/list.vue
index a2e035c..4e5fd62 100644
--- a/src/views/tested/MeasurementBusiness/opinion/components/list.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/components/list.vue
@@ -9,6 +9,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { getDictByCode } from '@/api/system/dict'
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   statusName: {
     type: String,
@@ -24,6 +25,9 @@
   未通过: '5',
   已取消: '6',
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'ClientOpinionForm')
+})
 const listQuery = reactive({
   approvalStatus: '0',
   createTimeEnd: '',
diff --git a/src/views/tested/MeasurementBusiness/review/index.vue b/src/views/tested/MeasurementBusiness/review/index.vue
index b4c16f9..c2f4c68 100644
--- a/src/views/tested/MeasurementBusiness/review/index.vue
+++ b/src/views/tested/MeasurementBusiness/review/index.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/review'
 import { getDictByCode } from '@/api/system/dict'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   approvalStatus: '',
@@ -18,6 +19,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'ReviewForm')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref([
   `${new Date().getFullYear()}-01-01`,
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/index.vue b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
index 238bbd6..aef9dab 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/index.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
@@ -3,6 +3,7 @@
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/satisfaction'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   sendTimeStart: '',
@@ -11,6 +12,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'ClientSatisfactionSurveyForm')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
diff --git a/src/views/tested/MeasurementPlan/board/index.vue b/src/views/tested/MeasurementPlan/board/index.vue
index 8d14386..850326e 100644
--- a/src/views/tested/MeasurementPlan/board/index.vue
+++ b/src/views/tested/MeasurementPlan/board/index.vue
@@ -5,12 +5,16 @@
 import { exportListApi, getListPage } from '@/api/eqpt/measurementPlan/board'
 import { exportFile } from '@/utils/exportUtils'
 import { buildTree, toTreeList } from '@/utils/structure'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   deptName: '',
   // offset: 1,
   // limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'BoardList')
+})
 const columns = ref<any>([
   {
     text: '部门',
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index f7390f9..e2061e0 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -5,6 +5,7 @@
 import { getListPage } from '@/api/eqpt/measurementPlan/dept'
 import useUserStore from '@/store/modules/user'
 import { getUserDept } from '@/api/system/user'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   // notifyType 通知类型(负责人/部门，字典值)
   notifyType: {
@@ -12,6 +13,10 @@
     required: true,
   },
 })
+
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, $props.notifyType === '2' ? 'DeptNotice' : 'CuratorNotice')
+})
 const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
 const userStore = useUserStore()
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index 1f64a62..ee1d163 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -11,6 +11,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 import { getPostList } from '@/api/system/post'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   // 申请类型（字典值，提前/延迟）
   approvalType: {
@@ -23,6 +24,9 @@
     required: true,
   },
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, $props.approvalType === '0' ? 'EarlyApplication' : 'DelayApplication')
+})
 const applyDict = ref<{ [key: string]: string }>({
   审批: '',
   草稿箱: '1',
diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue
index f5eedcb..d5b57e4 100644
--- a/src/views/tested/MeasurementPlan/plan/components/list.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/list.vue
@@ -13,6 +13,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 import useUserStore from '@/store/modules/user'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   statusName: {
     type: String,
@@ -28,6 +29,9 @@
   未通过: '5',
   已取消: '6',
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'PlanIndex')
+})
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   approvalStatus: '', //	申请状态(审批列表传)		false
diff --git a/src/views/tested/MeasurementPlan/task/components/edit.vue b/src/views/tested/MeasurementPlan/task/components/edit.vue
index 9c2f2d9..86b6bd2 100644
--- a/src/views/tested/MeasurementPlan/task/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/task/components/edit.vue
@@ -54,6 +54,7 @@
   isOnSiteCheck: '0',
   onSiteCheckTime: '',
   deptId: '',
+  orderStatusName: '',
 }) // 表单
 const checkPhone = (rule: any, value: any, callback: any) => {
   if (value === '') {
@@ -550,7 +551,7 @@
           <el-row v-if="$route.path.includes('detail') && $route.query.statusName === '全部'" :gutter="24" class="marg">
             <el-col :span="6">
               <el-form-item label="任务单状态">
-                <el-input v-model.trim="ruleForm.receiveStatusName" />
+                <el-input v-model.trim="ruleForm.orderStatusName" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
diff --git a/src/views/tested/MeasurementPlan/task/components/list.vue b/src/views/tested/MeasurementPlan/task/components/list.vue
index c81fd92..d5c6e17 100644
--- a/src/views/tested/MeasurementPlan/task/components/list.vue
+++ b/src/views/tested/MeasurementPlan/task/components/list.vue
@@ -31,7 +31,7 @@
   usePositionId: '',
   measureCompany: '',
   manufactureNo: '',
-  receiveStatus: '',
+  orderStatus: '',
   offset: 1,
   limit: 20,
   sort: 'desc',
@@ -110,7 +110,7 @@
   // },
   {
     text: '计划送检时间',
-    value: 'requireOverTime',
+    value: 'planDeliverTime',
     align: 'center',
   },
   // {
@@ -144,7 +144,7 @@
 watch(() => $props.statusName, (newVal) => {
   if (newVal) {
     listQuery.approvalStatus = applyDict.value[newVal] as string
-    listQuery.receiveStatus = $props.statusName === '全部' ? '' : listQuery.receiveStatus
+    listQuery.orderStatus = $props.statusName === '全部' ? '' : listQuery.orderStatus
     fetchData()
   }
 },
@@ -165,7 +165,7 @@
   listQuery.usePositionId = ''
   listQuery.measureCompany = ''
   listQuery.manufactureNo = ''
-  listQuery.receiveStatus = ''
+  listQuery.orderStatus = ''
   listQuery.offset = 1
   listQuery.limit = 20
   listQuery.sort = 'desc'
@@ -278,7 +278,7 @@
   })
   // })
   // 接收状态
-  getDictByCode('orderStatus').then((res) => {
+  getDictByCode('eqptTaskStatus').then((res) => {
     receiveStatusList.value = res.data
   })
 }
@@ -362,9 +362,12 @@
       case '已退回':
         color = '#F68787'
         break
-      case '检测完成':
+      case '待取回':
         color = '#82CD5E'
         break
+      case '已取回':
+        color = '#89D961'
+        break
       default:
         color = '#000'
         break
@@ -408,7 +411,7 @@
         <el-input v-model.trim="listQuery.manufactureNo" placeholder="设备出厂编号" clearable />
       </search-item>
       <search-item v-if="$props.statusName === '全部'">
-        <el-select v-model="listQuery.receiveStatus" placeholder="任务单状态" clearable>
+        <el-select v-model="listQuery.orderStatus" placeholder="任务单状态" clearable>
           <el-option v-for="item in receiveStatusList" :key="item.value" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
@@ -435,8 +438,8 @@
         <template #columns>
           <el-table-column v-if="$props.statusName === '全部'" label="任务单状态" align="center">
             <template #default="scope">
-              <span :style="{ color: TextColor(scope.row.receiveStatusName) }">
-                {{ scope.row.receiveStatusName }}
+              <span :style="{ color: TextColor(scope.row.orderStatusName) }">
+                {{ scope.row.orderStatusName }}
               </span>
             </template>
           </el-table-column>
@@ -487,7 +490,7 @@
               <!-- <el-button v-if="proxy.hasPerm(permUrl.edit) && $props.statusName === '全部'" link type="primary" :disabled="scope.row.receiveStatusName !== '未接收'" size="small" @click="handler(scope.row, 'update')">
                 编辑
               </el-button> -->
-              <el-button v-if="proxy.hasPerm(permUrl.cancel) && $props.statusName === '全部'" :disabled="scope.row.receiveStatusName !== '未接收'" link type="danger" size="small" @click="cancelHandler(scope.row)">
+              <el-button v-if="proxy.hasPerm(permUrl.cancel) && $props.statusName === '全部'" :disabled="scope.row.orderStatusName !== '未接收'" link type="danger" size="small" @click="cancelHandler(scope.row)">
                 取消
               </el-button>
             </template>
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index 0bf751f..8110a5b 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -314,23 +314,44 @@
   return (name: string) => {
     let color = ''
     switch (name) {
-      case '未接收':
-        color = '#888'
+      // case '未接收':
+      //   color = '#888'
+      //   break
+      // case '已接收':
+      //   color = '#000'
+      //   break
+      // case '已取消':
+      //   color = '#EAA341'
+      //   break
+      // case '已退回':
+      //   color = '#F68787'
+      //   break
+      // case '待取回':
+      //   color = '#82CD5E'
+      //   break
+      // case '已取回':
+      //   color = '#89D961'
+      //   break
+      case '检定中':
+        color = '#40AAFF'
         break
-      case '已接收':
+      case '已检完':
+        color = '#F0F9EB'
+        break
+      case '未检定':
         color = '#000'
         break
-      case '已取消':
-        color = '#EAA341'
+      case '已接收':
+        color = '#F0F9EB'
+        break
+      case '未接收':
+        color = '#000'
         break
       case '已退回':
         color = '#F68787'
         break
-      case '检测完成':
-        color = '#82CD5E'
-        break
-      case '检定中':
-        color = '#4FA6FF'
+      case '待补送':
+        color = '#EAA341'
         break
       default:
         color = '#000'
@@ -372,11 +393,12 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in ($route.path.includes('detail') && $route.query.statusName === '全部' ? columnsDetail : columnsHandler)" :key="item.value" :width="item.width" :prop="item.value" :label="item.text"
-        align="center"
+        v-for="item in ($route.path.includes('detail') && $route.query.statusName === '全部' ? columnsDetail : columnsHandler)"
+        :key="item.value" :width="item.width" :prop="item.value" :label="item.text" align="center"
       >
         <template #header>
-          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text
+          }}</span>
         </template>
         <template #default="scope">
           <!-- <el-button v-if="!scope.row.editable && !item.isUpload && item.text === '设备名称' && $route.path.includes('detail')" link type="primary" @click="deviceDetail(scope.row)">
@@ -388,11 +410,11 @@
             v-if="scope.row.editable && !item.isBtn && !item.isUpload" v-model="scope.row[item.value]" :autofocus="true"
             :placeholder="`${item.text}`" class="input"
           /> -->
-          <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+          <span v-if="!scope.row.editable" :class="{ link: $route.query.statusName === '全部' && item.text === '设备名称' ? true : false }" @click="deviceDetail(scope.row)"> {{
+            scope.row[item.value] }}</span>
           <el-input
             v-if="scope.row.editable && item.type === 'input'" v-model="scope.row[item.value]" :autofocus="true"
-            :placeholder="`${item.text}`" class="input"
-            @focus="select(item.text, scope.$index)"
+            :placeholder="`${item.text}`" class="input" @focus="select(item.text, scope.$index)"
           />
           <el-input
             v-if="scope.row.editable && item.type === 'btn'" v-model="scope.row[item.value]" :autofocus="true"
@@ -420,11 +442,16 @@
             </span>
           </template>
         </el-table-column>
+
+        <el-table-column align="center" label="接受状态说明">
+          <template #default="scope">
+            {{ scope.row.remark }}
+          </template>
+        </el-table-column>
         <el-table-column align="center" label="检定结果">
           <template #default="scope">
             <el-tag
-              v-if="['合格', '不合格', '限用'].includes(scope.row.measureCompletePercent)" :type="
-                scope.row.measureCompletePercent === '合格' ? 'success' : scope.row.measureCompletePercent === '不合格' ? 'danger' : scope.row.measureCompletePercent === '限用' ? 'warning' : 'primary'
+              v-if="['合格', '不合格', '限用'].includes(scope.row.measureCompletePercent)" :type="scope.row.measureCompletePercent === '合格' ? 'success' : scope.row.measureCompletePercent === '不合格' ? 'danger' : scope.row.measureCompletePercent === '限用' ? 'warning' : ''
               "
             >
               {{ scope.row.measureCompletePercent }}
@@ -439,6 +466,11 @@
             {{ scope.row.measureCompleteTime }}
           </template>
         </el-table-column>
+        <el-table-column align="center" label="检定说明">
+          <template #default="scope">
+            {{ scope.row.measureRemark }}
+          </template>
+        </el-table-column>
       </template>
     </el-table>
   </detail-block-switch>
@@ -452,4 +484,13 @@
 .el-select {
   width: 100%;
 }
+
+.link {
+  color: #40aaff;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
 </style>
diff --git a/src/views/tested/dashboard/list.vue b/src/views/tested/dashboard/list.vue
index f82c9b0..ec65781 100644
--- a/src/views/tested/dashboard/list.vue
+++ b/src/views/tested/dashboard/list.vue
@@ -1,8 +1,13 @@
 <script lang="ts" setup name="BoardIndex">
 import messList from './components/list.vue'
 import apprList from './components/listApprove.vue'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $route = useRoute()
 //  检定 verification  通知 notice  审批 approve  工作 work
+
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'BoardIndex')
+})
 </script>
 
 <template>
diff --git a/src/views/tested/device/group/components/list.vue b/src/views/tested/device/group/components/list.vue
index 4d3e229..04df4b7 100644
--- a/src/views/tested/device/group/components/list.vue
+++ b/src/views/tested/device/group/components/list.vue
@@ -8,6 +8,7 @@
 import { toTreeList } from '@/utils/structure'
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
 import { getDeptList, getDeptTree, getDeptTreeList, getDeptTreeListByPid } from '@/api/system/dept'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const userStore = useUserStore()
 const listQuery = reactive({
@@ -23,6 +24,10 @@
   sort: 'desc',
   orderBy: 'create_time',
 })
+
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'DeviceGroupIndex')
+})
 const columns = ref([
   {
     text: '所在单位',
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index 755d7ea..b3003ea 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -461,6 +461,14 @@
         //     ruleForm.value.deptId = deptList.value[0].id
         //   }
         // })
+        // 自定填充部门
+        if ($route.params.type === 'create') {
+          if (userStore.deptName !== ruleForm.value.companyName) {
+            setTimeout(() => {
+              ruleForm.value.deptId = userStore.deptId
+            })
+          }
+        }
       }
     })
   }
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index 8b8bfeb..a7aa6ab 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -36,7 +36,7 @@
   },
 })
 onBeforeRouteLeave((to: any) => {
-  keepSearchParams(to.path, 'DeviceInfo')
+  keepSearchParams(to.path, $props.equipmentType === '1' ? 'DeviceInfo' : 'SpecialDevice')
 })
 const userStore = useUserStore()
 const applyDict = ref<{ [key: string]: string }>({

diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue
index 58aa0af..1c1c923 100644
--- a/src/views/tested/MeasurementBusiness/detection/index.vue
+++ b/src/views/tested/MeasurementBusiness/detection/index.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/detection'
 import { printJSON } from '@/utils/printUtils'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   noticeDateEnd: '',
@@ -14,6 +15,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'InspectionResultReviewNotice')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
diff --git a/src/views/tested/MeasurementBusiness/notice/index.vue b/src/views/tested/MeasurementBusiness/notice/index.vue
index de0cf86..e161859 100644
--- a/src/views/tested/MeasurementBusiness/notice/index.vue
+++ b/src/views/tested/MeasurementBusiness/notice/index.vue
@@ -3,6 +3,7 @@
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/notice'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   applicantName: '',
@@ -18,6 +19,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'SubcontractingNotice')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
diff --git a/src/views/tested/MeasurementBusiness/opinion/components/list.vue b/src/views/tested/MeasurementBusiness/opinion/components/list.vue
index a2e035c..4e5fd62 100644
--- a/src/views/tested/MeasurementBusiness/opinion/components/list.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/components/list.vue
@@ -9,6 +9,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { getDictByCode } from '@/api/system/dict'
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   statusName: {
     type: String,
@@ -24,6 +25,9 @@
   未通过: '5',
   已取消: '6',
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'ClientOpinionForm')
+})
 const listQuery = reactive({
   approvalStatus: '0',
   createTimeEnd: '',
diff --git a/src/views/tested/MeasurementBusiness/review/index.vue b/src/views/tested/MeasurementBusiness/review/index.vue
index b4c16f9..c2f4c68 100644
--- a/src/views/tested/MeasurementBusiness/review/index.vue
+++ b/src/views/tested/MeasurementBusiness/review/index.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/review'
 import { getDictByCode } from '@/api/system/dict'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   approvalStatus: '',
@@ -18,6 +19,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'ReviewForm')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref([
   `${new Date().getFullYear()}-01-01`,
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/index.vue b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
index 238bbd6..aef9dab 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/index.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
@@ -3,6 +3,7 @@
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/satisfaction'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   sendTimeStart: '',
@@ -11,6 +12,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'ClientSatisfactionSurveyForm')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
diff --git a/src/views/tested/MeasurementPlan/board/index.vue b/src/views/tested/MeasurementPlan/board/index.vue
index 8d14386..850326e 100644
--- a/src/views/tested/MeasurementPlan/board/index.vue
+++ b/src/views/tested/MeasurementPlan/board/index.vue
@@ -5,12 +5,16 @@
 import { exportListApi, getListPage } from '@/api/eqpt/measurementPlan/board'
 import { exportFile } from '@/utils/exportUtils'
 import { buildTree, toTreeList } from '@/utils/structure'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   deptName: '',
   // offset: 1,
   // limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'BoardList')
+})
 const columns = ref<any>([
   {
     text: '部门',
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index f7390f9..e2061e0 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -5,6 +5,7 @@
 import { getListPage } from '@/api/eqpt/measurementPlan/dept'
 import useUserStore from '@/store/modules/user'
 import { getUserDept } from '@/api/system/user'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   // notifyType 通知类型(负责人/部门，字典值)
   notifyType: {
@@ -12,6 +13,10 @@
     required: true,
   },
 })
+
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, $props.notifyType === '2' ? 'DeptNotice' : 'CuratorNotice')
+})
 const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
 const userStore = useUserStore()
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index 1f64a62..ee1d163 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -11,6 +11,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 import { getPostList } from '@/api/system/post'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   // 申请类型（字典值，提前/延迟）
   approvalType: {
@@ -23,6 +24,9 @@
     required: true,
   },
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, $props.approvalType === '0' ? 'EarlyApplication' : 'DelayApplication')
+})
 const applyDict = ref<{ [key: string]: string }>({
   审批: '',
   草稿箱: '1',
diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue
index f5eedcb..d5b57e4 100644
--- a/src/views/tested/MeasurementPlan/plan/components/list.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/list.vue
@@ -13,6 +13,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 import useUserStore from '@/store/modules/user'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   statusName: {
     type: String,
@@ -28,6 +29,9 @@
   未通过: '5',
   已取消: '6',
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'PlanIndex')
+})
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   approvalStatus: '', //	申请状态(审批列表传)		false
diff --git a/src/views/tested/MeasurementPlan/task/components/edit.vue b/src/views/tested/MeasurementPlan/task/components/edit.vue
index 9c2f2d9..86b6bd2 100644
--- a/src/views/tested/MeasurementPlan/task/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/task/components/edit.vue
@@ -54,6 +54,7 @@
   isOnSiteCheck: '0',
   onSiteCheckTime: '',
   deptId: '',
+  orderStatusName: '',
 }) // 表单
 const checkPhone = (rule: any, value: any, callback: any) => {
   if (value === '') {
@@ -550,7 +551,7 @@
           <el-row v-if="$route.path.includes('detail') && $route.query.statusName === '全部'" :gutter="24" class="marg">
             <el-col :span="6">
               <el-form-item label="任务单状态">
-                <el-input v-model.trim="ruleForm.receiveStatusName" />
+                <el-input v-model.trim="ruleForm.orderStatusName" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
diff --git a/src/views/tested/MeasurementPlan/task/components/list.vue b/src/views/tested/MeasurementPlan/task/components/list.vue
index c81fd92..d5c6e17 100644
--- a/src/views/tested/MeasurementPlan/task/components/list.vue
+++ b/src/views/tested/MeasurementPlan/task/components/list.vue
@@ -31,7 +31,7 @@
   usePositionId: '',
   measureCompany: '',
   manufactureNo: '',
-  receiveStatus: '',
+  orderStatus: '',
   offset: 1,
   limit: 20,
   sort: 'desc',
@@ -110,7 +110,7 @@
   // },
   {
     text: '计划送检时间',
-    value: 'requireOverTime',
+    value: 'planDeliverTime',
     align: 'center',
   },
   // {
@@ -144,7 +144,7 @@
 watch(() => $props.statusName, (newVal) => {
   if (newVal) {
     listQuery.approvalStatus = applyDict.value[newVal] as string
-    listQuery.receiveStatus = $props.statusName === '全部' ? '' : listQuery.receiveStatus
+    listQuery.orderStatus = $props.statusName === '全部' ? '' : listQuery.orderStatus
     fetchData()
   }
 },
@@ -165,7 +165,7 @@
   listQuery.usePositionId = ''
   listQuery.measureCompany = ''
   listQuery.manufactureNo = ''
-  listQuery.receiveStatus = ''
+  listQuery.orderStatus = ''
   listQuery.offset = 1
   listQuery.limit = 20
   listQuery.sort = 'desc'
@@ -278,7 +278,7 @@
   })
   // })
   // 接收状态
-  getDictByCode('orderStatus').then((res) => {
+  getDictByCode('eqptTaskStatus').then((res) => {
     receiveStatusList.value = res.data
   })
 }
@@ -362,9 +362,12 @@
       case '已退回':
         color = '#F68787'
         break
-      case '检测完成':
+      case '待取回':
         color = '#82CD5E'
         break
+      case '已取回':
+        color = '#89D961'
+        break
       default:
         color = '#000'
         break
@@ -408,7 +411,7 @@
         <el-input v-model.trim="listQuery.manufactureNo" placeholder="设备出厂编号" clearable />
       </search-item>
       <search-item v-if="$props.statusName === '全部'">
-        <el-select v-model="listQuery.receiveStatus" placeholder="任务单状态" clearable>
+        <el-select v-model="listQuery.orderStatus" placeholder="任务单状态" clearable>
           <el-option v-for="item in receiveStatusList" :key="item.value" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
@@ -435,8 +438,8 @@
         <template #columns>
           <el-table-column v-if="$props.statusName === '全部'" label="任务单状态" align="center">
             <template #default="scope">
-              <span :style="{ color: TextColor(scope.row.receiveStatusName) }">
-                {{ scope.row.receiveStatusName }}
+              <span :style="{ color: TextColor(scope.row.orderStatusName) }">
+                {{ scope.row.orderStatusName }}
               </span>
             </template>
           </el-table-column>
@@ -487,7 +490,7 @@
               <!-- <el-button v-if="proxy.hasPerm(permUrl.edit) && $props.statusName === '全部'" link type="primary" :disabled="scope.row.receiveStatusName !== '未接收'" size="small" @click="handler(scope.row, 'update')">
                 编辑
               </el-button> -->
-              <el-button v-if="proxy.hasPerm(permUrl.cancel) && $props.statusName === '全部'" :disabled="scope.row.receiveStatusName !== '未接收'" link type="danger" size="small" @click="cancelHandler(scope.row)">
+              <el-button v-if="proxy.hasPerm(permUrl.cancel) && $props.statusName === '全部'" :disabled="scope.row.orderStatusName !== '未接收'" link type="danger" size="small" @click="cancelHandler(scope.row)">
                 取消
               </el-button>
             </template>
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index 0bf751f..8110a5b 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -314,23 +314,44 @@
   return (name: string) => {
     let color = ''
     switch (name) {
-      case '未接收':
-        color = '#888'
+      // case '未接收':
+      //   color = '#888'
+      //   break
+      // case '已接收':
+      //   color = '#000'
+      //   break
+      // case '已取消':
+      //   color = '#EAA341'
+      //   break
+      // case '已退回':
+      //   color = '#F68787'
+      //   break
+      // case '待取回':
+      //   color = '#82CD5E'
+      //   break
+      // case '已取回':
+      //   color = '#89D961'
+      //   break
+      case '检定中':
+        color = '#40AAFF'
         break
-      case '已接收':
+      case '已检完':
+        color = '#F0F9EB'
+        break
+      case '未检定':
         color = '#000'
         break
-      case '已取消':
-        color = '#EAA341'
+      case '已接收':
+        color = '#F0F9EB'
+        break
+      case '未接收':
+        color = '#000'
         break
       case '已退回':
         color = '#F68787'
         break
-      case '检测完成':
-        color = '#82CD5E'
-        break
-      case '检定中':
-        color = '#4FA6FF'
+      case '待补送':
+        color = '#EAA341'
         break
       default:
         color = '#000'
@@ -372,11 +393,12 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in ($route.path.includes('detail') && $route.query.statusName === '全部' ? columnsDetail : columnsHandler)" :key="item.value" :width="item.width" :prop="item.value" :label="item.text"
-        align="center"
+        v-for="item in ($route.path.includes('detail') && $route.query.statusName === '全部' ? columnsDetail : columnsHandler)"
+        :key="item.value" :width="item.width" :prop="item.value" :label="item.text" align="center"
       >
         <template #header>
-          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text
+          }}</span>
         </template>
         <template #default="scope">
           <!-- <el-button v-if="!scope.row.editable && !item.isUpload && item.text === '设备名称' && $route.path.includes('detail')" link type="primary" @click="deviceDetail(scope.row)">
@@ -388,11 +410,11 @@
             v-if="scope.row.editable && !item.isBtn && !item.isUpload" v-model="scope.row[item.value]" :autofocus="true"
             :placeholder="`${item.text}`" class="input"
           /> -->
-          <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+          <span v-if="!scope.row.editable" :class="{ link: $route.query.statusName === '全部' && item.text === '设备名称' ? true : false }" @click="deviceDetail(scope.row)"> {{
+            scope.row[item.value] }}</span>
           <el-input
             v-if="scope.row.editable && item.type === 'input'" v-model="scope.row[item.value]" :autofocus="true"
-            :placeholder="`${item.text}`" class="input"
-            @focus="select(item.text, scope.$index)"
+            :placeholder="`${item.text}`" class="input" @focus="select(item.text, scope.$index)"
           />
           <el-input
             v-if="scope.row.editable && item.type === 'btn'" v-model="scope.row[item.value]" :autofocus="true"
@@ -420,11 +442,16 @@
             </span>
           </template>
         </el-table-column>
+
+        <el-table-column align="center" label="接受状态说明">
+          <template #default="scope">
+            {{ scope.row.remark }}
+          </template>
+        </el-table-column>
         <el-table-column align="center" label="检定结果">
           <template #default="scope">
             <el-tag
-              v-if="['合格', '不合格', '限用'].includes(scope.row.measureCompletePercent)" :type="
-                scope.row.measureCompletePercent === '合格' ? 'success' : scope.row.measureCompletePercent === '不合格' ? 'danger' : scope.row.measureCompletePercent === '限用' ? 'warning' : 'primary'
+              v-if="['合格', '不合格', '限用'].includes(scope.row.measureCompletePercent)" :type="scope.row.measureCompletePercent === '合格' ? 'success' : scope.row.measureCompletePercent === '不合格' ? 'danger' : scope.row.measureCompletePercent === '限用' ? 'warning' : ''
               "
             >
               {{ scope.row.measureCompletePercent }}
@@ -439,6 +466,11 @@
             {{ scope.row.measureCompleteTime }}
           </template>
         </el-table-column>
+        <el-table-column align="center" label="检定说明">
+          <template #default="scope">
+            {{ scope.row.measureRemark }}
+          </template>
+        </el-table-column>
       </template>
     </el-table>
   </detail-block-switch>
@@ -452,4 +484,13 @@
 .el-select {
   width: 100%;
 }
+
+.link {
+  color: #40aaff;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
 </style>
diff --git a/src/views/tested/dashboard/list.vue b/src/views/tested/dashboard/list.vue
index f82c9b0..ec65781 100644
--- a/src/views/tested/dashboard/list.vue
+++ b/src/views/tested/dashboard/list.vue
@@ -1,8 +1,13 @@
 <script lang="ts" setup name="BoardIndex">
 import messList from './components/list.vue'
 import apprList from './components/listApprove.vue'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $route = useRoute()
 //  检定 verification  通知 notice  审批 approve  工作 work
+
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'BoardIndex')
+})
 </script>
 
 <template>
diff --git a/src/views/tested/device/group/components/list.vue b/src/views/tested/device/group/components/list.vue
index 4d3e229..04df4b7 100644
--- a/src/views/tested/device/group/components/list.vue
+++ b/src/views/tested/device/group/components/list.vue
@@ -8,6 +8,7 @@
 import { toTreeList } from '@/utils/structure'
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
 import { getDeptList, getDeptTree, getDeptTreeList, getDeptTreeListByPid } from '@/api/system/dept'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const userStore = useUserStore()
 const listQuery = reactive({
@@ -23,6 +24,10 @@
   sort: 'desc',
   orderBy: 'create_time',
 })
+
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'DeviceGroupIndex')
+})
 const columns = ref([
   {
     text: '所在单位',
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index 755d7ea..b3003ea 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -461,6 +461,14 @@
         //     ruleForm.value.deptId = deptList.value[0].id
         //   }
         // })
+        // 自定填充部门
+        if ($route.params.type === 'create') {
+          if (userStore.deptName !== ruleForm.value.companyName) {
+            setTimeout(() => {
+              ruleForm.value.deptId = userStore.deptId
+            })
+          }
+        }
       }
     })
   }
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index 8b8bfeb..a7aa6ab 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -36,7 +36,7 @@
   },
 })
 onBeforeRouteLeave((to: any) => {
-  keepSearchParams(to.path, 'DeviceInfo')
+  keepSearchParams(to.path, $props.equipmentType === '1' ? 'DeviceInfo' : 'SpecialDevice')
 })
 const userStore = useUserStore()
 const applyDict = ref<{ [key: string]: string }>({
diff --git a/src/views/tested/device/remind/index.vue b/src/views/tested/device/remind/index.vue
index 538572d..f5cf7d4 100644
--- a/src/views/tested/device/remind/index.vue
+++ b/src/views/tested/device/remind/index.vue
@@ -10,13 +10,16 @@
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 import { getTaskList } from '@/api/eqpt/device/task'
 import { getUserDept, getUserDeptSon } from '@/api/system/user'
+import { toTreeList } from '@/utils/structure'
 import { getPostList } from '@/api/system/post'
 import { getDeptTree, getDeptTreeList } from '@/api/system/dept'
+import useUserStore from '@/store/modules/user'
 import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 onBeforeRouteLeave((to: any) => {
   keepSearchParams(to.path, 'RemindList')
 })
+const userStore = useUserStore()
 const listQuery = reactive({
   certificateValidEnd: '',
   certificateValidStart: '',
@@ -65,14 +68,21 @@
     align: 'center',
   },
   {
+    text: '使用部门',
+    value: 'deptName',
+    align: 'center',
+  },
+  {
     text: '计量标识',
     value: 'meterIdentifyName',
     align: 'center',
+    width: '90',
   },
   {
     text: '检定周期',
     value: 'checkCycle',
     align: 'center',
+    width: '90',
   },
 ])
 const otherColumns = ref([
@@ -80,6 +90,7 @@
     text: '使用状态',
     value: 'usageStatusName',
     align: 'center',
+    width: '90',
   },
   // {
   //   text: '备注',
@@ -97,6 +108,12 @@
     value: 'taskTimes',
     align: 'center',
   },
+  {
+    text: '检定去向',
+    value: 'checkDestinationName',
+    align: 'center',
+    width: '90',
+  },
 ])
 const list = ref([])
 const total = ref(0)
@@ -285,13 +302,18 @@
     remindList.value = res.data
   })
   // 获取当前用户所在单位
-  // getUserDept().then((res) => {
-  // getDeptTree({ pid: '0' }).then((res1) => {
-  //   deptList.value = res1.data.filter((item: any) => item.pids.split(',').length === 3 && item.pid !== '0').map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
-  // })
-  getUserDeptSon({ }).then((res) => {
-    deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  getUserDept().then((res) => {
+    // getDeptTree({ pid: '0' }).then((res1) => {
+    //   deptList.value = res1.data.filter((item: any) => item.pids.split(',').length === 3 && item.pid !== '0').map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+    // })
+    // getUserDeptSon({ }).then((res) => {
+    //   deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+    //   console.log(deptList.value, 'deptList.value')
+    getDeptTreeList({ pid: res.data.id }).then((res) => {
+      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id }))) as any
+    })
   })
+
   // })
   // 使用岗位
   getPostList({}).then((res) => {
@@ -358,9 +380,13 @@
       </search-item> -->
       <search-item>
         <!-- <dept-select v-model="listQuery.deptIds" placeholder="使用部门" /> -->
-        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门" style="width: 100%;" clearable>
+        <!-- <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>
+        </el-select> -->
+        <el-tree-select
+          v-model="listQuery.deptIds" :data="deptList" :render-after-expand="false" check-strictly
+          placeholder="使用部门"
+        />
       </search-item>
       <search-item>
         <!-- <el-input v-model.trim="listQuery.usePosition" placeholder="使用岗位" clearable /> -->
@@ -376,22 +402,14 @@
       </search-item> -->
       <search-item>
         <el-date-picker
-          v-model="listQuery.certificateValidStart"
-          type="date"
-          placeholder="证书有效期开始时间"
-          value-format="YYYY-MM-DD 00:00:00"
-          format="YYYY-MM-DD"
-          clearable
+          v-model="listQuery.certificateValidStart" type="date" placeholder="证书有效期开始时间"
+          value-format="YYYY-MM-DD 00:00:00" format="YYYY-MM-DD" clearable
         />
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="listQuery.certificateValidEnd"
-          type="date"
-          placeholder="证书有效期结束时间"
-          value-format="YYYY-MM-DD 23:59:59"
-          format="YYYY-MM-DD"
-          clearable
+          v-model="listQuery.certificateValidEnd" type="date" placeholder="证书有效期结束时间"
+          value-format="YYYY-MM-DD 23:59:59" format="YYYY-MM-DD" clearable
         />
       </search-item>
       <search-item>
@@ -421,9 +439,8 @@
       </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
+          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>
@@ -434,24 +451,29 @@
       </template>
       <!-- 普通表格 -->
       <normal-table
-        v-if="showTable"
-        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
-        :is-showmulti-select="true" :is-multi="true" @change="changePage"
+        v-if="showTable" :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>
           <el-table-column label="证书有效期" align="center">
             <template #default="scope">
-              <span :class="rowClassName(scope.row. certificateValid)">{{ scope.row. certificateValid }}</span>
+              <span :class="rowClassName(scope.row.certificateValid)">{{ scope.row.certificateValid }}</span>
             </template>
           </el-table-column>
-          <el-table-column v-for="item in otherColumns" :key="item.text" :width="item.width" :label="item.text" :prop="item.value" align="center" />
+          <el-table-column
+            v-for="item in otherColumns" :key="item.text" :width="item.width" :label="item.text"
+            :prop="item.value" align="center"
+          />
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
               <el-button link type="primary" size="small" @click="detail(scope.row)">
                 查看
               </el-button>
-              <el-button v-if="proxy.hasPerm('/tested/device/remind/remind')" link type="primary" size="small" @click="remind(scope.row)">
+              <el-button
+                v-if="proxy.hasPerm('/tested/device/remind/remind')" link type="primary" size="small"
+                @click="remind(scope.row)"
+              >
                 提醒
               </el-button>
             </template>
@@ -472,4 +494,3 @@
   color: red;
 }
 </style>
-

diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue
index 58aa0af..1c1c923 100644
--- a/src/views/tested/MeasurementBusiness/detection/index.vue
+++ b/src/views/tested/MeasurementBusiness/detection/index.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/detection'
 import { printJSON } from '@/utils/printUtils'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   noticeDateEnd: '',
@@ -14,6 +15,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'InspectionResultReviewNotice')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
diff --git a/src/views/tested/MeasurementBusiness/notice/index.vue b/src/views/tested/MeasurementBusiness/notice/index.vue
index de0cf86..e161859 100644
--- a/src/views/tested/MeasurementBusiness/notice/index.vue
+++ b/src/views/tested/MeasurementBusiness/notice/index.vue
@@ -3,6 +3,7 @@
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/notice'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   applicantName: '',
@@ -18,6 +19,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'SubcontractingNotice')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
diff --git a/src/views/tested/MeasurementBusiness/opinion/components/list.vue b/src/views/tested/MeasurementBusiness/opinion/components/list.vue
index a2e035c..4e5fd62 100644
--- a/src/views/tested/MeasurementBusiness/opinion/components/list.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/components/list.vue
@@ -9,6 +9,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { getDictByCode } from '@/api/system/dict'
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   statusName: {
     type: String,
@@ -24,6 +25,9 @@
   未通过: '5',
   已取消: '6',
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'ClientOpinionForm')
+})
 const listQuery = reactive({
   approvalStatus: '0',
   createTimeEnd: '',
diff --git a/src/views/tested/MeasurementBusiness/review/index.vue b/src/views/tested/MeasurementBusiness/review/index.vue
index b4c16f9..c2f4c68 100644
--- a/src/views/tested/MeasurementBusiness/review/index.vue
+++ b/src/views/tested/MeasurementBusiness/review/index.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/review'
 import { getDictByCode } from '@/api/system/dict'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   approvalStatus: '',
@@ -18,6 +19,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'ReviewForm')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref([
   `${new Date().getFullYear()}-01-01`,
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/index.vue b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
index 238bbd6..aef9dab 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/index.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
@@ -3,6 +3,7 @@
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/satisfaction'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   sendTimeStart: '',
@@ -11,6 +12,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'ClientSatisfactionSurveyForm')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
diff --git a/src/views/tested/MeasurementPlan/board/index.vue b/src/views/tested/MeasurementPlan/board/index.vue
index 8d14386..850326e 100644
--- a/src/views/tested/MeasurementPlan/board/index.vue
+++ b/src/views/tested/MeasurementPlan/board/index.vue
@@ -5,12 +5,16 @@
 import { exportListApi, getListPage } from '@/api/eqpt/measurementPlan/board'
 import { exportFile } from '@/utils/exportUtils'
 import { buildTree, toTreeList } from '@/utils/structure'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   deptName: '',
   // offset: 1,
   // limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'BoardList')
+})
 const columns = ref<any>([
   {
     text: '部门',
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index f7390f9..e2061e0 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -5,6 +5,7 @@
 import { getListPage } from '@/api/eqpt/measurementPlan/dept'
 import useUserStore from '@/store/modules/user'
 import { getUserDept } from '@/api/system/user'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   // notifyType 通知类型(负责人/部门，字典值)
   notifyType: {
@@ -12,6 +13,10 @@
     required: true,
   },
 })
+
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, $props.notifyType === '2' ? 'DeptNotice' : 'CuratorNotice')
+})
 const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
 const userStore = useUserStore()
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index 1f64a62..ee1d163 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -11,6 +11,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 import { getPostList } from '@/api/system/post'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   // 申请类型（字典值，提前/延迟）
   approvalType: {
@@ -23,6 +24,9 @@
     required: true,
   },
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, $props.approvalType === '0' ? 'EarlyApplication' : 'DelayApplication')
+})
 const applyDict = ref<{ [key: string]: string }>({
   审批: '',
   草稿箱: '1',
diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue
index f5eedcb..d5b57e4 100644
--- a/src/views/tested/MeasurementPlan/plan/components/list.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/list.vue
@@ -13,6 +13,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 import useUserStore from '@/store/modules/user'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   statusName: {
     type: String,
@@ -28,6 +29,9 @@
   未通过: '5',
   已取消: '6',
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'PlanIndex')
+})
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   approvalStatus: '', //	申请状态(审批列表传)		false
diff --git a/src/views/tested/MeasurementPlan/task/components/edit.vue b/src/views/tested/MeasurementPlan/task/components/edit.vue
index 9c2f2d9..86b6bd2 100644
--- a/src/views/tested/MeasurementPlan/task/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/task/components/edit.vue
@@ -54,6 +54,7 @@
   isOnSiteCheck: '0',
   onSiteCheckTime: '',
   deptId: '',
+  orderStatusName: '',
 }) // 表单
 const checkPhone = (rule: any, value: any, callback: any) => {
   if (value === '') {
@@ -550,7 +551,7 @@
           <el-row v-if="$route.path.includes('detail') && $route.query.statusName === '全部'" :gutter="24" class="marg">
             <el-col :span="6">
               <el-form-item label="任务单状态">
-                <el-input v-model.trim="ruleForm.receiveStatusName" />
+                <el-input v-model.trim="ruleForm.orderStatusName" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
diff --git a/src/views/tested/MeasurementPlan/task/components/list.vue b/src/views/tested/MeasurementPlan/task/components/list.vue
index c81fd92..d5c6e17 100644
--- a/src/views/tested/MeasurementPlan/task/components/list.vue
+++ b/src/views/tested/MeasurementPlan/task/components/list.vue
@@ -31,7 +31,7 @@
   usePositionId: '',
   measureCompany: '',
   manufactureNo: '',
-  receiveStatus: '',
+  orderStatus: '',
   offset: 1,
   limit: 20,
   sort: 'desc',
@@ -110,7 +110,7 @@
   // },
   {
     text: '计划送检时间',
-    value: 'requireOverTime',
+    value: 'planDeliverTime',
     align: 'center',
   },
   // {
@@ -144,7 +144,7 @@
 watch(() => $props.statusName, (newVal) => {
   if (newVal) {
     listQuery.approvalStatus = applyDict.value[newVal] as string
-    listQuery.receiveStatus = $props.statusName === '全部' ? '' : listQuery.receiveStatus
+    listQuery.orderStatus = $props.statusName === '全部' ? '' : listQuery.orderStatus
     fetchData()
   }
 },
@@ -165,7 +165,7 @@
   listQuery.usePositionId = ''
   listQuery.measureCompany = ''
   listQuery.manufactureNo = ''
-  listQuery.receiveStatus = ''
+  listQuery.orderStatus = ''
   listQuery.offset = 1
   listQuery.limit = 20
   listQuery.sort = 'desc'
@@ -278,7 +278,7 @@
   })
   // })
   // 接收状态
-  getDictByCode('orderStatus').then((res) => {
+  getDictByCode('eqptTaskStatus').then((res) => {
     receiveStatusList.value = res.data
   })
 }
@@ -362,9 +362,12 @@
       case '已退回':
         color = '#F68787'
         break
-      case '检测完成':
+      case '待取回':
         color = '#82CD5E'
         break
+      case '已取回':
+        color = '#89D961'
+        break
       default:
         color = '#000'
         break
@@ -408,7 +411,7 @@
         <el-input v-model.trim="listQuery.manufactureNo" placeholder="设备出厂编号" clearable />
       </search-item>
       <search-item v-if="$props.statusName === '全部'">
-        <el-select v-model="listQuery.receiveStatus" placeholder="任务单状态" clearable>
+        <el-select v-model="listQuery.orderStatus" placeholder="任务单状态" clearable>
           <el-option v-for="item in receiveStatusList" :key="item.value" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
@@ -435,8 +438,8 @@
         <template #columns>
           <el-table-column v-if="$props.statusName === '全部'" label="任务单状态" align="center">
             <template #default="scope">
-              <span :style="{ color: TextColor(scope.row.receiveStatusName) }">
-                {{ scope.row.receiveStatusName }}
+              <span :style="{ color: TextColor(scope.row.orderStatusName) }">
+                {{ scope.row.orderStatusName }}
               </span>
             </template>
           </el-table-column>
@@ -487,7 +490,7 @@
               <!-- <el-button v-if="proxy.hasPerm(permUrl.edit) && $props.statusName === '全部'" link type="primary" :disabled="scope.row.receiveStatusName !== '未接收'" size="small" @click="handler(scope.row, 'update')">
                 编辑
               </el-button> -->
-              <el-button v-if="proxy.hasPerm(permUrl.cancel) && $props.statusName === '全部'" :disabled="scope.row.receiveStatusName !== '未接收'" link type="danger" size="small" @click="cancelHandler(scope.row)">
+              <el-button v-if="proxy.hasPerm(permUrl.cancel) && $props.statusName === '全部'" :disabled="scope.row.orderStatusName !== '未接收'" link type="danger" size="small" @click="cancelHandler(scope.row)">
                 取消
               </el-button>
             </template>
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index 0bf751f..8110a5b 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -314,23 +314,44 @@
   return (name: string) => {
     let color = ''
     switch (name) {
-      case '未接收':
-        color = '#888'
+      // case '未接收':
+      //   color = '#888'
+      //   break
+      // case '已接收':
+      //   color = '#000'
+      //   break
+      // case '已取消':
+      //   color = '#EAA341'
+      //   break
+      // case '已退回':
+      //   color = '#F68787'
+      //   break
+      // case '待取回':
+      //   color = '#82CD5E'
+      //   break
+      // case '已取回':
+      //   color = '#89D961'
+      //   break
+      case '检定中':
+        color = '#40AAFF'
         break
-      case '已接收':
+      case '已检完':
+        color = '#F0F9EB'
+        break
+      case '未检定':
         color = '#000'
         break
-      case '已取消':
-        color = '#EAA341'
+      case '已接收':
+        color = '#F0F9EB'
+        break
+      case '未接收':
+        color = '#000'
         break
       case '已退回':
         color = '#F68787'
         break
-      case '检测完成':
-        color = '#82CD5E'
-        break
-      case '检定中':
-        color = '#4FA6FF'
+      case '待补送':
+        color = '#EAA341'
         break
       default:
         color = '#000'
@@ -372,11 +393,12 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in ($route.path.includes('detail') && $route.query.statusName === '全部' ? columnsDetail : columnsHandler)" :key="item.value" :width="item.width" :prop="item.value" :label="item.text"
-        align="center"
+        v-for="item in ($route.path.includes('detail') && $route.query.statusName === '全部' ? columnsDetail : columnsHandler)"
+        :key="item.value" :width="item.width" :prop="item.value" :label="item.text" align="center"
       >
         <template #header>
-          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text
+          }}</span>
         </template>
         <template #default="scope">
           <!-- <el-button v-if="!scope.row.editable && !item.isUpload && item.text === '设备名称' && $route.path.includes('detail')" link type="primary" @click="deviceDetail(scope.row)">
@@ -388,11 +410,11 @@
             v-if="scope.row.editable && !item.isBtn && !item.isUpload" v-model="scope.row[item.value]" :autofocus="true"
             :placeholder="`${item.text}`" class="input"
           /> -->
-          <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+          <span v-if="!scope.row.editable" :class="{ link: $route.query.statusName === '全部' && item.text === '设备名称' ? true : false }" @click="deviceDetail(scope.row)"> {{
+            scope.row[item.value] }}</span>
           <el-input
             v-if="scope.row.editable && item.type === 'input'" v-model="scope.row[item.value]" :autofocus="true"
-            :placeholder="`${item.text}`" class="input"
-            @focus="select(item.text, scope.$index)"
+            :placeholder="`${item.text}`" class="input" @focus="select(item.text, scope.$index)"
           />
           <el-input
             v-if="scope.row.editable && item.type === 'btn'" v-model="scope.row[item.value]" :autofocus="true"
@@ -420,11 +442,16 @@
             </span>
           </template>
         </el-table-column>
+
+        <el-table-column align="center" label="接受状态说明">
+          <template #default="scope">
+            {{ scope.row.remark }}
+          </template>
+        </el-table-column>
         <el-table-column align="center" label="检定结果">
           <template #default="scope">
             <el-tag
-              v-if="['合格', '不合格', '限用'].includes(scope.row.measureCompletePercent)" :type="
-                scope.row.measureCompletePercent === '合格' ? 'success' : scope.row.measureCompletePercent === '不合格' ? 'danger' : scope.row.measureCompletePercent === '限用' ? 'warning' : 'primary'
+              v-if="['合格', '不合格', '限用'].includes(scope.row.measureCompletePercent)" :type="scope.row.measureCompletePercent === '合格' ? 'success' : scope.row.measureCompletePercent === '不合格' ? 'danger' : scope.row.measureCompletePercent === '限用' ? 'warning' : ''
               "
             >
               {{ scope.row.measureCompletePercent }}
@@ -439,6 +466,11 @@
             {{ scope.row.measureCompleteTime }}
           </template>
         </el-table-column>
+        <el-table-column align="center" label="检定说明">
+          <template #default="scope">
+            {{ scope.row.measureRemark }}
+          </template>
+        </el-table-column>
       </template>
     </el-table>
   </detail-block-switch>
@@ -452,4 +484,13 @@
 .el-select {
   width: 100%;
 }
+
+.link {
+  color: #40aaff;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
 </style>
diff --git a/src/views/tested/dashboard/list.vue b/src/views/tested/dashboard/list.vue
index f82c9b0..ec65781 100644
--- a/src/views/tested/dashboard/list.vue
+++ b/src/views/tested/dashboard/list.vue
@@ -1,8 +1,13 @@
 <script lang="ts" setup name="BoardIndex">
 import messList from './components/list.vue'
 import apprList from './components/listApprove.vue'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $route = useRoute()
 //  检定 verification  通知 notice  审批 approve  工作 work
+
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'BoardIndex')
+})
 </script>
 
 <template>
diff --git a/src/views/tested/device/group/components/list.vue b/src/views/tested/device/group/components/list.vue
index 4d3e229..04df4b7 100644
--- a/src/views/tested/device/group/components/list.vue
+++ b/src/views/tested/device/group/components/list.vue
@@ -8,6 +8,7 @@
 import { toTreeList } from '@/utils/structure'
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
 import { getDeptList, getDeptTree, getDeptTreeList, getDeptTreeListByPid } from '@/api/system/dept'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const userStore = useUserStore()
 const listQuery = reactive({
@@ -23,6 +24,10 @@
   sort: 'desc',
   orderBy: 'create_time',
 })
+
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'DeviceGroupIndex')
+})
 const columns = ref([
   {
     text: '所在单位',
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index 755d7ea..b3003ea 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -461,6 +461,14 @@
         //     ruleForm.value.deptId = deptList.value[0].id
         //   }
         // })
+        // 自定填充部门
+        if ($route.params.type === 'create') {
+          if (userStore.deptName !== ruleForm.value.companyName) {
+            setTimeout(() => {
+              ruleForm.value.deptId = userStore.deptId
+            })
+          }
+        }
       }
     })
   }
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index 8b8bfeb..a7aa6ab 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -36,7 +36,7 @@
   },
 })
 onBeforeRouteLeave((to: any) => {
-  keepSearchParams(to.path, 'DeviceInfo')
+  keepSearchParams(to.path, $props.equipmentType === '1' ? 'DeviceInfo' : 'SpecialDevice')
 })
 const userStore = useUserStore()
 const applyDict = ref<{ [key: string]: string }>({
diff --git a/src/views/tested/device/remind/index.vue b/src/views/tested/device/remind/index.vue
index 538572d..f5cf7d4 100644
--- a/src/views/tested/device/remind/index.vue
+++ b/src/views/tested/device/remind/index.vue
@@ -10,13 +10,16 @@
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 import { getTaskList } from '@/api/eqpt/device/task'
 import { getUserDept, getUserDeptSon } from '@/api/system/user'
+import { toTreeList } from '@/utils/structure'
 import { getPostList } from '@/api/system/post'
 import { getDeptTree, getDeptTreeList } from '@/api/system/dept'
+import useUserStore from '@/store/modules/user'
 import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 onBeforeRouteLeave((to: any) => {
   keepSearchParams(to.path, 'RemindList')
 })
+const userStore = useUserStore()
 const listQuery = reactive({
   certificateValidEnd: '',
   certificateValidStart: '',
@@ -65,14 +68,21 @@
     align: 'center',
   },
   {
+    text: '使用部门',
+    value: 'deptName',
+    align: 'center',
+  },
+  {
     text: '计量标识',
     value: 'meterIdentifyName',
     align: 'center',
+    width: '90',
   },
   {
     text: '检定周期',
     value: 'checkCycle',
     align: 'center',
+    width: '90',
   },
 ])
 const otherColumns = ref([
@@ -80,6 +90,7 @@
     text: '使用状态',
     value: 'usageStatusName',
     align: 'center',
+    width: '90',
   },
   // {
   //   text: '备注',
@@ -97,6 +108,12 @@
     value: 'taskTimes',
     align: 'center',
   },
+  {
+    text: '检定去向',
+    value: 'checkDestinationName',
+    align: 'center',
+    width: '90',
+  },
 ])
 const list = ref([])
 const total = ref(0)
@@ -285,13 +302,18 @@
     remindList.value = res.data
   })
   // 获取当前用户所在单位
-  // getUserDept().then((res) => {
-  // getDeptTree({ pid: '0' }).then((res1) => {
-  //   deptList.value = res1.data.filter((item: any) => item.pids.split(',').length === 3 && item.pid !== '0').map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
-  // })
-  getUserDeptSon({ }).then((res) => {
-    deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  getUserDept().then((res) => {
+    // getDeptTree({ pid: '0' }).then((res1) => {
+    //   deptList.value = res1.data.filter((item: any) => item.pids.split(',').length === 3 && item.pid !== '0').map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+    // })
+    // getUserDeptSon({ }).then((res) => {
+    //   deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+    //   console.log(deptList.value, 'deptList.value')
+    getDeptTreeList({ pid: res.data.id }).then((res) => {
+      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id }))) as any
+    })
   })
+
   // })
   // 使用岗位
   getPostList({}).then((res) => {
@@ -358,9 +380,13 @@
       </search-item> -->
       <search-item>
         <!-- <dept-select v-model="listQuery.deptIds" placeholder="使用部门" /> -->
-        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门" style="width: 100%;" clearable>
+        <!-- <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>
+        </el-select> -->
+        <el-tree-select
+          v-model="listQuery.deptIds" :data="deptList" :render-after-expand="false" check-strictly
+          placeholder="使用部门"
+        />
       </search-item>
       <search-item>
         <!-- <el-input v-model.trim="listQuery.usePosition" placeholder="使用岗位" clearable /> -->
@@ -376,22 +402,14 @@
       </search-item> -->
       <search-item>
         <el-date-picker
-          v-model="listQuery.certificateValidStart"
-          type="date"
-          placeholder="证书有效期开始时间"
-          value-format="YYYY-MM-DD 00:00:00"
-          format="YYYY-MM-DD"
-          clearable
+          v-model="listQuery.certificateValidStart" type="date" placeholder="证书有效期开始时间"
+          value-format="YYYY-MM-DD 00:00:00" format="YYYY-MM-DD" clearable
         />
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="listQuery.certificateValidEnd"
-          type="date"
-          placeholder="证书有效期结束时间"
-          value-format="YYYY-MM-DD 23:59:59"
-          format="YYYY-MM-DD"
-          clearable
+          v-model="listQuery.certificateValidEnd" type="date" placeholder="证书有效期结束时间"
+          value-format="YYYY-MM-DD 23:59:59" format="YYYY-MM-DD" clearable
         />
       </search-item>
       <search-item>
@@ -421,9 +439,8 @@
       </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
+          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>
@@ -434,24 +451,29 @@
       </template>
       <!-- 普通表格 -->
       <normal-table
-        v-if="showTable"
-        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
-        :is-showmulti-select="true" :is-multi="true" @change="changePage"
+        v-if="showTable" :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>
           <el-table-column label="证书有效期" align="center">
             <template #default="scope">
-              <span :class="rowClassName(scope.row. certificateValid)">{{ scope.row. certificateValid }}</span>
+              <span :class="rowClassName(scope.row.certificateValid)">{{ scope.row.certificateValid }}</span>
             </template>
           </el-table-column>
-          <el-table-column v-for="item in otherColumns" :key="item.text" :width="item.width" :label="item.text" :prop="item.value" align="center" />
+          <el-table-column
+            v-for="item in otherColumns" :key="item.text" :width="item.width" :label="item.text"
+            :prop="item.value" align="center"
+          />
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
               <el-button link type="primary" size="small" @click="detail(scope.row)">
                 查看
               </el-button>
-              <el-button v-if="proxy.hasPerm('/tested/device/remind/remind')" link type="primary" size="small" @click="remind(scope.row)">
+              <el-button
+                v-if="proxy.hasPerm('/tested/device/remind/remind')" link type="primary" size="small"
+                @click="remind(scope.row)"
+              >
                 提醒
               </el-button>
             </template>
@@ -472,4 +494,3 @@
   color: red;
 }
 </style>
-
diff --git a/src/views/tested/document/list/index.vue b/src/views/tested/document/list/index.vue
index e1ca1c4..1123be0 100644
--- a/src/views/tested/document/list/index.vue
+++ b/src/views/tested/document/list/index.vue
@@ -8,6 +8,7 @@
 import { getPhotoUrl } from '@/api/system/tool'
 import { getDictByCode } from '@/api/system/dict'
 import { getAdminDept } from '@/api/system/user'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive<IlistQuery>({
   fileNo: '',
@@ -21,6 +22,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'DocumentList')
+})
 const columns = ref([
   {
     text: '文件号',

diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue
index 58aa0af..1c1c923 100644
--- a/src/views/tested/MeasurementBusiness/detection/index.vue
+++ b/src/views/tested/MeasurementBusiness/detection/index.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/detection'
 import { printJSON } from '@/utils/printUtils'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   noticeDateEnd: '',
@@ -14,6 +15,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'InspectionResultReviewNotice')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
diff --git a/src/views/tested/MeasurementBusiness/notice/index.vue b/src/views/tested/MeasurementBusiness/notice/index.vue
index de0cf86..e161859 100644
--- a/src/views/tested/MeasurementBusiness/notice/index.vue
+++ b/src/views/tested/MeasurementBusiness/notice/index.vue
@@ -3,6 +3,7 @@
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/notice'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   applicantName: '',
@@ -18,6 +19,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'SubcontractingNotice')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
diff --git a/src/views/tested/MeasurementBusiness/opinion/components/list.vue b/src/views/tested/MeasurementBusiness/opinion/components/list.vue
index a2e035c..4e5fd62 100644
--- a/src/views/tested/MeasurementBusiness/opinion/components/list.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/components/list.vue
@@ -9,6 +9,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { getDictByCode } from '@/api/system/dict'
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   statusName: {
     type: String,
@@ -24,6 +25,9 @@
   未通过: '5',
   已取消: '6',
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'ClientOpinionForm')
+})
 const listQuery = reactive({
   approvalStatus: '0',
   createTimeEnd: '',
diff --git a/src/views/tested/MeasurementBusiness/review/index.vue b/src/views/tested/MeasurementBusiness/review/index.vue
index b4c16f9..c2f4c68 100644
--- a/src/views/tested/MeasurementBusiness/review/index.vue
+++ b/src/views/tested/MeasurementBusiness/review/index.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/review'
 import { getDictByCode } from '@/api/system/dict'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   approvalStatus: '',
@@ -18,6 +19,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'ReviewForm')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref([
   `${new Date().getFullYear()}-01-01`,
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/index.vue b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
index 238bbd6..aef9dab 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/index.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
@@ -3,6 +3,7 @@
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/satisfaction'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   sendTimeStart: '',
@@ -11,6 +12,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'ClientSatisfactionSurveyForm')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
diff --git a/src/views/tested/MeasurementPlan/board/index.vue b/src/views/tested/MeasurementPlan/board/index.vue
index 8d14386..850326e 100644
--- a/src/views/tested/MeasurementPlan/board/index.vue
+++ b/src/views/tested/MeasurementPlan/board/index.vue
@@ -5,12 +5,16 @@
 import { exportListApi, getListPage } from '@/api/eqpt/measurementPlan/board'
 import { exportFile } from '@/utils/exportUtils'
 import { buildTree, toTreeList } from '@/utils/structure'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   deptName: '',
   // offset: 1,
   // limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'BoardList')
+})
 const columns = ref<any>([
   {
     text: '部门',
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index f7390f9..e2061e0 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -5,6 +5,7 @@
 import { getListPage } from '@/api/eqpt/measurementPlan/dept'
 import useUserStore from '@/store/modules/user'
 import { getUserDept } from '@/api/system/user'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   // notifyType 通知类型(负责人/部门，字典值)
   notifyType: {
@@ -12,6 +13,10 @@
     required: true,
   },
 })
+
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, $props.notifyType === '2' ? 'DeptNotice' : 'CuratorNotice')
+})
 const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
 const userStore = useUserStore()
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index 1f64a62..ee1d163 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -11,6 +11,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 import { getPostList } from '@/api/system/post'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   // 申请类型（字典值，提前/延迟）
   approvalType: {
@@ -23,6 +24,9 @@
     required: true,
   },
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, $props.approvalType === '0' ? 'EarlyApplication' : 'DelayApplication')
+})
 const applyDict = ref<{ [key: string]: string }>({
   审批: '',
   草稿箱: '1',
diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue
index f5eedcb..d5b57e4 100644
--- a/src/views/tested/MeasurementPlan/plan/components/list.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/list.vue
@@ -13,6 +13,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 import useUserStore from '@/store/modules/user'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   statusName: {
     type: String,
@@ -28,6 +29,9 @@
   未通过: '5',
   已取消: '6',
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'PlanIndex')
+})
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   approvalStatus: '', //	申请状态(审批列表传)		false
diff --git a/src/views/tested/MeasurementPlan/task/components/edit.vue b/src/views/tested/MeasurementPlan/task/components/edit.vue
index 9c2f2d9..86b6bd2 100644
--- a/src/views/tested/MeasurementPlan/task/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/task/components/edit.vue
@@ -54,6 +54,7 @@
   isOnSiteCheck: '0',
   onSiteCheckTime: '',
   deptId: '',
+  orderStatusName: '',
 }) // 表单
 const checkPhone = (rule: any, value: any, callback: any) => {
   if (value === '') {
@@ -550,7 +551,7 @@
           <el-row v-if="$route.path.includes('detail') && $route.query.statusName === '全部'" :gutter="24" class="marg">
             <el-col :span="6">
               <el-form-item label="任务单状态">
-                <el-input v-model.trim="ruleForm.receiveStatusName" />
+                <el-input v-model.trim="ruleForm.orderStatusName" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
diff --git a/src/views/tested/MeasurementPlan/task/components/list.vue b/src/views/tested/MeasurementPlan/task/components/list.vue
index c81fd92..d5c6e17 100644
--- a/src/views/tested/MeasurementPlan/task/components/list.vue
+++ b/src/views/tested/MeasurementPlan/task/components/list.vue
@@ -31,7 +31,7 @@
   usePositionId: '',
   measureCompany: '',
   manufactureNo: '',
-  receiveStatus: '',
+  orderStatus: '',
   offset: 1,
   limit: 20,
   sort: 'desc',
@@ -110,7 +110,7 @@
   // },
   {
     text: '计划送检时间',
-    value: 'requireOverTime',
+    value: 'planDeliverTime',
     align: 'center',
   },
   // {
@@ -144,7 +144,7 @@
 watch(() => $props.statusName, (newVal) => {
   if (newVal) {
     listQuery.approvalStatus = applyDict.value[newVal] as string
-    listQuery.receiveStatus = $props.statusName === '全部' ? '' : listQuery.receiveStatus
+    listQuery.orderStatus = $props.statusName === '全部' ? '' : listQuery.orderStatus
     fetchData()
   }
 },
@@ -165,7 +165,7 @@
   listQuery.usePositionId = ''
   listQuery.measureCompany = ''
   listQuery.manufactureNo = ''
-  listQuery.receiveStatus = ''
+  listQuery.orderStatus = ''
   listQuery.offset = 1
   listQuery.limit = 20
   listQuery.sort = 'desc'
@@ -278,7 +278,7 @@
   })
   // })
   // 接收状态
-  getDictByCode('orderStatus').then((res) => {
+  getDictByCode('eqptTaskStatus').then((res) => {
     receiveStatusList.value = res.data
   })
 }
@@ -362,9 +362,12 @@
       case '已退回':
         color = '#F68787'
         break
-      case '检测完成':
+      case '待取回':
         color = '#82CD5E'
         break
+      case '已取回':
+        color = '#89D961'
+        break
       default:
         color = '#000'
         break
@@ -408,7 +411,7 @@
         <el-input v-model.trim="listQuery.manufactureNo" placeholder="设备出厂编号" clearable />
       </search-item>
       <search-item v-if="$props.statusName === '全部'">
-        <el-select v-model="listQuery.receiveStatus" placeholder="任务单状态" clearable>
+        <el-select v-model="listQuery.orderStatus" placeholder="任务单状态" clearable>
           <el-option v-for="item in receiveStatusList" :key="item.value" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
@@ -435,8 +438,8 @@
         <template #columns>
           <el-table-column v-if="$props.statusName === '全部'" label="任务单状态" align="center">
             <template #default="scope">
-              <span :style="{ color: TextColor(scope.row.receiveStatusName) }">
-                {{ scope.row.receiveStatusName }}
+              <span :style="{ color: TextColor(scope.row.orderStatusName) }">
+                {{ scope.row.orderStatusName }}
               </span>
             </template>
           </el-table-column>
@@ -487,7 +490,7 @@
               <!-- <el-button v-if="proxy.hasPerm(permUrl.edit) && $props.statusName === '全部'" link type="primary" :disabled="scope.row.receiveStatusName !== '未接收'" size="small" @click="handler(scope.row, 'update')">
                 编辑
               </el-button> -->
-              <el-button v-if="proxy.hasPerm(permUrl.cancel) && $props.statusName === '全部'" :disabled="scope.row.receiveStatusName !== '未接收'" link type="danger" size="small" @click="cancelHandler(scope.row)">
+              <el-button v-if="proxy.hasPerm(permUrl.cancel) && $props.statusName === '全部'" :disabled="scope.row.orderStatusName !== '未接收'" link type="danger" size="small" @click="cancelHandler(scope.row)">
                 取消
               </el-button>
             </template>
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index 0bf751f..8110a5b 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -314,23 +314,44 @@
   return (name: string) => {
     let color = ''
     switch (name) {
-      case '未接收':
-        color = '#888'
+      // case '未接收':
+      //   color = '#888'
+      //   break
+      // case '已接收':
+      //   color = '#000'
+      //   break
+      // case '已取消':
+      //   color = '#EAA341'
+      //   break
+      // case '已退回':
+      //   color = '#F68787'
+      //   break
+      // case '待取回':
+      //   color = '#82CD5E'
+      //   break
+      // case '已取回':
+      //   color = '#89D961'
+      //   break
+      case '检定中':
+        color = '#40AAFF'
         break
-      case '已接收':
+      case '已检完':
+        color = '#F0F9EB'
+        break
+      case '未检定':
         color = '#000'
         break
-      case '已取消':
-        color = '#EAA341'
+      case '已接收':
+        color = '#F0F9EB'
+        break
+      case '未接收':
+        color = '#000'
         break
       case '已退回':
         color = '#F68787'
         break
-      case '检测完成':
-        color = '#82CD5E'
-        break
-      case '检定中':
-        color = '#4FA6FF'
+      case '待补送':
+        color = '#EAA341'
         break
       default:
         color = '#000'
@@ -372,11 +393,12 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in ($route.path.includes('detail') && $route.query.statusName === '全部' ? columnsDetail : columnsHandler)" :key="item.value" :width="item.width" :prop="item.value" :label="item.text"
-        align="center"
+        v-for="item in ($route.path.includes('detail') && $route.query.statusName === '全部' ? columnsDetail : columnsHandler)"
+        :key="item.value" :width="item.width" :prop="item.value" :label="item.text" align="center"
       >
         <template #header>
-          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text
+          }}</span>
         </template>
         <template #default="scope">
           <!-- <el-button v-if="!scope.row.editable && !item.isUpload && item.text === '设备名称' && $route.path.includes('detail')" link type="primary" @click="deviceDetail(scope.row)">
@@ -388,11 +410,11 @@
             v-if="scope.row.editable && !item.isBtn && !item.isUpload" v-model="scope.row[item.value]" :autofocus="true"
             :placeholder="`${item.text}`" class="input"
           /> -->
-          <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+          <span v-if="!scope.row.editable" :class="{ link: $route.query.statusName === '全部' && item.text === '设备名称' ? true : false }" @click="deviceDetail(scope.row)"> {{
+            scope.row[item.value] }}</span>
           <el-input
             v-if="scope.row.editable && item.type === 'input'" v-model="scope.row[item.value]" :autofocus="true"
-            :placeholder="`${item.text}`" class="input"
-            @focus="select(item.text, scope.$index)"
+            :placeholder="`${item.text}`" class="input" @focus="select(item.text, scope.$index)"
           />
           <el-input
             v-if="scope.row.editable && item.type === 'btn'" v-model="scope.row[item.value]" :autofocus="true"
@@ -420,11 +442,16 @@
             </span>
           </template>
         </el-table-column>
+
+        <el-table-column align="center" label="接受状态说明">
+          <template #default="scope">
+            {{ scope.row.remark }}
+          </template>
+        </el-table-column>
         <el-table-column align="center" label="检定结果">
           <template #default="scope">
             <el-tag
-              v-if="['合格', '不合格', '限用'].includes(scope.row.measureCompletePercent)" :type="
-                scope.row.measureCompletePercent === '合格' ? 'success' : scope.row.measureCompletePercent === '不合格' ? 'danger' : scope.row.measureCompletePercent === '限用' ? 'warning' : 'primary'
+              v-if="['合格', '不合格', '限用'].includes(scope.row.measureCompletePercent)" :type="scope.row.measureCompletePercent === '合格' ? 'success' : scope.row.measureCompletePercent === '不合格' ? 'danger' : scope.row.measureCompletePercent === '限用' ? 'warning' : ''
               "
             >
               {{ scope.row.measureCompletePercent }}
@@ -439,6 +466,11 @@
             {{ scope.row.measureCompleteTime }}
           </template>
         </el-table-column>
+        <el-table-column align="center" label="检定说明">
+          <template #default="scope">
+            {{ scope.row.measureRemark }}
+          </template>
+        </el-table-column>
       </template>
     </el-table>
   </detail-block-switch>
@@ -452,4 +484,13 @@
 .el-select {
   width: 100%;
 }
+
+.link {
+  color: #40aaff;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
 </style>
diff --git a/src/views/tested/dashboard/list.vue b/src/views/tested/dashboard/list.vue
index f82c9b0..ec65781 100644
--- a/src/views/tested/dashboard/list.vue
+++ b/src/views/tested/dashboard/list.vue
@@ -1,8 +1,13 @@
 <script lang="ts" setup name="BoardIndex">
 import messList from './components/list.vue'
 import apprList from './components/listApprove.vue'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $route = useRoute()
 //  检定 verification  通知 notice  审批 approve  工作 work
+
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'BoardIndex')
+})
 </script>
 
 <template>
diff --git a/src/views/tested/device/group/components/list.vue b/src/views/tested/device/group/components/list.vue
index 4d3e229..04df4b7 100644
--- a/src/views/tested/device/group/components/list.vue
+++ b/src/views/tested/device/group/components/list.vue
@@ -8,6 +8,7 @@
 import { toTreeList } from '@/utils/structure'
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
 import { getDeptList, getDeptTree, getDeptTreeList, getDeptTreeListByPid } from '@/api/system/dept'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const userStore = useUserStore()
 const listQuery = reactive({
@@ -23,6 +24,10 @@
   sort: 'desc',
   orderBy: 'create_time',
 })
+
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'DeviceGroupIndex')
+})
 const columns = ref([
   {
     text: '所在单位',
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index 755d7ea..b3003ea 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -461,6 +461,14 @@
         //     ruleForm.value.deptId = deptList.value[0].id
         //   }
         // })
+        // 自定填充部门
+        if ($route.params.type === 'create') {
+          if (userStore.deptName !== ruleForm.value.companyName) {
+            setTimeout(() => {
+              ruleForm.value.deptId = userStore.deptId
+            })
+          }
+        }
       }
     })
   }
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index 8b8bfeb..a7aa6ab 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -36,7 +36,7 @@
   },
 })
 onBeforeRouteLeave((to: any) => {
-  keepSearchParams(to.path, 'DeviceInfo')
+  keepSearchParams(to.path, $props.equipmentType === '1' ? 'DeviceInfo' : 'SpecialDevice')
 })
 const userStore = useUserStore()
 const applyDict = ref<{ [key: string]: string }>({
diff --git a/src/views/tested/device/remind/index.vue b/src/views/tested/device/remind/index.vue
index 538572d..f5cf7d4 100644
--- a/src/views/tested/device/remind/index.vue
+++ b/src/views/tested/device/remind/index.vue
@@ -10,13 +10,16 @@
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 import { getTaskList } from '@/api/eqpt/device/task'
 import { getUserDept, getUserDeptSon } from '@/api/system/user'
+import { toTreeList } from '@/utils/structure'
 import { getPostList } from '@/api/system/post'
 import { getDeptTree, getDeptTreeList } from '@/api/system/dept'
+import useUserStore from '@/store/modules/user'
 import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 onBeforeRouteLeave((to: any) => {
   keepSearchParams(to.path, 'RemindList')
 })
+const userStore = useUserStore()
 const listQuery = reactive({
   certificateValidEnd: '',
   certificateValidStart: '',
@@ -65,14 +68,21 @@
     align: 'center',
   },
   {
+    text: '使用部门',
+    value: 'deptName',
+    align: 'center',
+  },
+  {
     text: '计量标识',
     value: 'meterIdentifyName',
     align: 'center',
+    width: '90',
   },
   {
     text: '检定周期',
     value: 'checkCycle',
     align: 'center',
+    width: '90',
   },
 ])
 const otherColumns = ref([
@@ -80,6 +90,7 @@
     text: '使用状态',
     value: 'usageStatusName',
     align: 'center',
+    width: '90',
   },
   // {
   //   text: '备注',
@@ -97,6 +108,12 @@
     value: 'taskTimes',
     align: 'center',
   },
+  {
+    text: '检定去向',
+    value: 'checkDestinationName',
+    align: 'center',
+    width: '90',
+  },
 ])
 const list = ref([])
 const total = ref(0)
@@ -285,13 +302,18 @@
     remindList.value = res.data
   })
   // 获取当前用户所在单位
-  // getUserDept().then((res) => {
-  // getDeptTree({ pid: '0' }).then((res1) => {
-  //   deptList.value = res1.data.filter((item: any) => item.pids.split(',').length === 3 && item.pid !== '0').map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
-  // })
-  getUserDeptSon({ }).then((res) => {
-    deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  getUserDept().then((res) => {
+    // getDeptTree({ pid: '0' }).then((res1) => {
+    //   deptList.value = res1.data.filter((item: any) => item.pids.split(',').length === 3 && item.pid !== '0').map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+    // })
+    // getUserDeptSon({ }).then((res) => {
+    //   deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+    //   console.log(deptList.value, 'deptList.value')
+    getDeptTreeList({ pid: res.data.id }).then((res) => {
+      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id }))) as any
+    })
   })
+
   // })
   // 使用岗位
   getPostList({}).then((res) => {
@@ -358,9 +380,13 @@
       </search-item> -->
       <search-item>
         <!-- <dept-select v-model="listQuery.deptIds" placeholder="使用部门" /> -->
-        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门" style="width: 100%;" clearable>
+        <!-- <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>
+        </el-select> -->
+        <el-tree-select
+          v-model="listQuery.deptIds" :data="deptList" :render-after-expand="false" check-strictly
+          placeholder="使用部门"
+        />
       </search-item>
       <search-item>
         <!-- <el-input v-model.trim="listQuery.usePosition" placeholder="使用岗位" clearable /> -->
@@ -376,22 +402,14 @@
       </search-item> -->
       <search-item>
         <el-date-picker
-          v-model="listQuery.certificateValidStart"
-          type="date"
-          placeholder="证书有效期开始时间"
-          value-format="YYYY-MM-DD 00:00:00"
-          format="YYYY-MM-DD"
-          clearable
+          v-model="listQuery.certificateValidStart" type="date" placeholder="证书有效期开始时间"
+          value-format="YYYY-MM-DD 00:00:00" format="YYYY-MM-DD" clearable
         />
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="listQuery.certificateValidEnd"
-          type="date"
-          placeholder="证书有效期结束时间"
-          value-format="YYYY-MM-DD 23:59:59"
-          format="YYYY-MM-DD"
-          clearable
+          v-model="listQuery.certificateValidEnd" type="date" placeholder="证书有效期结束时间"
+          value-format="YYYY-MM-DD 23:59:59" format="YYYY-MM-DD" clearable
         />
       </search-item>
       <search-item>
@@ -421,9 +439,8 @@
       </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
+          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>
@@ -434,24 +451,29 @@
       </template>
       <!-- 普通表格 -->
       <normal-table
-        v-if="showTable"
-        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
-        :is-showmulti-select="true" :is-multi="true" @change="changePage"
+        v-if="showTable" :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>
           <el-table-column label="证书有效期" align="center">
             <template #default="scope">
-              <span :class="rowClassName(scope.row. certificateValid)">{{ scope.row. certificateValid }}</span>
+              <span :class="rowClassName(scope.row.certificateValid)">{{ scope.row.certificateValid }}</span>
             </template>
           </el-table-column>
-          <el-table-column v-for="item in otherColumns" :key="item.text" :width="item.width" :label="item.text" :prop="item.value" align="center" />
+          <el-table-column
+            v-for="item in otherColumns" :key="item.text" :width="item.width" :label="item.text"
+            :prop="item.value" align="center"
+          />
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
               <el-button link type="primary" size="small" @click="detail(scope.row)">
                 查看
               </el-button>
-              <el-button v-if="proxy.hasPerm('/tested/device/remind/remind')" link type="primary" size="small" @click="remind(scope.row)">
+              <el-button
+                v-if="proxy.hasPerm('/tested/device/remind/remind')" link type="primary" size="small"
+                @click="remind(scope.row)"
+              >
                 提醒
               </el-button>
             </template>
@@ -472,4 +494,3 @@
   color: red;
 }
 </style>
-
diff --git a/src/views/tested/document/list/index.vue b/src/views/tested/document/list/index.vue
index e1ca1c4..1123be0 100644
--- a/src/views/tested/document/list/index.vue
+++ b/src/views/tested/document/list/index.vue
@@ -8,6 +8,7 @@
 import { getPhotoUrl } from '@/api/system/tool'
 import { getDictByCode } from '@/api/system/dict'
 import { getAdminDept } from '@/api/system/user'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive<IlistQuery>({
   fileNo: '',
@@ -21,6 +22,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'DocumentList')
+})
 const columns = ref([
   {
     text: '文件号',
diff --git a/src/views/tested/status/borrow/components/list.vue b/src/views/tested/status/borrow/components/list.vue
index 16861b6..6441b38 100644
--- a/src/views/tested/status/borrow/components/list.vue
+++ b/src/views/tested/status/borrow/components/list.vue
@@ -9,6 +9,7 @@
 import { getAdminDept, getUserDept } from '@/api/system/user'
 import { toTreeList } from '@/utils/structure'
 import { getDeptTreeList } from '@/api/system/dept'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   //  审批状态  全部 审批等
   statusName: {
@@ -24,6 +25,9 @@
   未通过: '5',
   已取消: '6',
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'DeviceBorrow')
+})
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   approvalNo: '',

diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue
index 58aa0af..1c1c923 100644
--- a/src/views/tested/MeasurementBusiness/detection/index.vue
+++ b/src/views/tested/MeasurementBusiness/detection/index.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/detection'
 import { printJSON } from '@/utils/printUtils'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   noticeDateEnd: '',
@@ -14,6 +15,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'InspectionResultReviewNotice')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
diff --git a/src/views/tested/MeasurementBusiness/notice/index.vue b/src/views/tested/MeasurementBusiness/notice/index.vue
index de0cf86..e161859 100644
--- a/src/views/tested/MeasurementBusiness/notice/index.vue
+++ b/src/views/tested/MeasurementBusiness/notice/index.vue
@@ -3,6 +3,7 @@
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/notice'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   applicantName: '',
@@ -18,6 +19,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'SubcontractingNotice')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
diff --git a/src/views/tested/MeasurementBusiness/opinion/components/list.vue b/src/views/tested/MeasurementBusiness/opinion/components/list.vue
index a2e035c..4e5fd62 100644
--- a/src/views/tested/MeasurementBusiness/opinion/components/list.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/components/list.vue
@@ -9,6 +9,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { getDictByCode } from '@/api/system/dict'
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   statusName: {
     type: String,
@@ -24,6 +25,9 @@
   未通过: '5',
   已取消: '6',
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'ClientOpinionForm')
+})
 const listQuery = reactive({
   approvalStatus: '0',
   createTimeEnd: '',
diff --git a/src/views/tested/MeasurementBusiness/review/index.vue b/src/views/tested/MeasurementBusiness/review/index.vue
index b4c16f9..c2f4c68 100644
--- a/src/views/tested/MeasurementBusiness/review/index.vue
+++ b/src/views/tested/MeasurementBusiness/review/index.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/review'
 import { getDictByCode } from '@/api/system/dict'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   approvalStatus: '',
@@ -18,6 +19,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'ReviewForm')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref([
   `${new Date().getFullYear()}-01-01`,
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/index.vue b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
index 238bbd6..aef9dab 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/index.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
@@ -3,6 +3,7 @@
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/satisfaction'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   sendTimeStart: '',
@@ -11,6 +12,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'ClientSatisfactionSurveyForm')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
diff --git a/src/views/tested/MeasurementPlan/board/index.vue b/src/views/tested/MeasurementPlan/board/index.vue
index 8d14386..850326e 100644
--- a/src/views/tested/MeasurementPlan/board/index.vue
+++ b/src/views/tested/MeasurementPlan/board/index.vue
@@ -5,12 +5,16 @@
 import { exportListApi, getListPage } from '@/api/eqpt/measurementPlan/board'
 import { exportFile } from '@/utils/exportUtils'
 import { buildTree, toTreeList } from '@/utils/structure'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   deptName: '',
   // offset: 1,
   // limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'BoardList')
+})
 const columns = ref<any>([
   {
     text: '部门',
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index f7390f9..e2061e0 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -5,6 +5,7 @@
 import { getListPage } from '@/api/eqpt/measurementPlan/dept'
 import useUserStore from '@/store/modules/user'
 import { getUserDept } from '@/api/system/user'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   // notifyType 通知类型(负责人/部门，字典值)
   notifyType: {
@@ -12,6 +13,10 @@
     required: true,
   },
 })
+
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, $props.notifyType === '2' ? 'DeptNotice' : 'CuratorNotice')
+})
 const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
 const userStore = useUserStore()
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index 1f64a62..ee1d163 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -11,6 +11,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 import { getPostList } from '@/api/system/post'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   // 申请类型（字典值，提前/延迟）
   approvalType: {
@@ -23,6 +24,9 @@
     required: true,
   },
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, $props.approvalType === '0' ? 'EarlyApplication' : 'DelayApplication')
+})
 const applyDict = ref<{ [key: string]: string }>({
   审批: '',
   草稿箱: '1',
diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue
index f5eedcb..d5b57e4 100644
--- a/src/views/tested/MeasurementPlan/plan/components/list.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/list.vue
@@ -13,6 +13,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 import useUserStore from '@/store/modules/user'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   statusName: {
     type: String,
@@ -28,6 +29,9 @@
   未通过: '5',
   已取消: '6',
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'PlanIndex')
+})
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   approvalStatus: '', //	申请状态(审批列表传)		false
diff --git a/src/views/tested/MeasurementPlan/task/components/edit.vue b/src/views/tested/MeasurementPlan/task/components/edit.vue
index 9c2f2d9..86b6bd2 100644
--- a/src/views/tested/MeasurementPlan/task/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/task/components/edit.vue
@@ -54,6 +54,7 @@
   isOnSiteCheck: '0',
   onSiteCheckTime: '',
   deptId: '',
+  orderStatusName: '',
 }) // 表单
 const checkPhone = (rule: any, value: any, callback: any) => {
   if (value === '') {
@@ -550,7 +551,7 @@
           <el-row v-if="$route.path.includes('detail') && $route.query.statusName === '全部'" :gutter="24" class="marg">
             <el-col :span="6">
               <el-form-item label="任务单状态">
-                <el-input v-model.trim="ruleForm.receiveStatusName" />
+                <el-input v-model.trim="ruleForm.orderStatusName" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
diff --git a/src/views/tested/MeasurementPlan/task/components/list.vue b/src/views/tested/MeasurementPlan/task/components/list.vue
index c81fd92..d5c6e17 100644
--- a/src/views/tested/MeasurementPlan/task/components/list.vue
+++ b/src/views/tested/MeasurementPlan/task/components/list.vue
@@ -31,7 +31,7 @@
   usePositionId: '',
   measureCompany: '',
   manufactureNo: '',
-  receiveStatus: '',
+  orderStatus: '',
   offset: 1,
   limit: 20,
   sort: 'desc',
@@ -110,7 +110,7 @@
   // },
   {
     text: '计划送检时间',
-    value: 'requireOverTime',
+    value: 'planDeliverTime',
     align: 'center',
   },
   // {
@@ -144,7 +144,7 @@
 watch(() => $props.statusName, (newVal) => {
   if (newVal) {
     listQuery.approvalStatus = applyDict.value[newVal] as string
-    listQuery.receiveStatus = $props.statusName === '全部' ? '' : listQuery.receiveStatus
+    listQuery.orderStatus = $props.statusName === '全部' ? '' : listQuery.orderStatus
     fetchData()
   }
 },
@@ -165,7 +165,7 @@
   listQuery.usePositionId = ''
   listQuery.measureCompany = ''
   listQuery.manufactureNo = ''
-  listQuery.receiveStatus = ''
+  listQuery.orderStatus = ''
   listQuery.offset = 1
   listQuery.limit = 20
   listQuery.sort = 'desc'
@@ -278,7 +278,7 @@
   })
   // })
   // 接收状态
-  getDictByCode('orderStatus').then((res) => {
+  getDictByCode('eqptTaskStatus').then((res) => {
     receiveStatusList.value = res.data
   })
 }
@@ -362,9 +362,12 @@
       case '已退回':
         color = '#F68787'
         break
-      case '检测完成':
+      case '待取回':
         color = '#82CD5E'
         break
+      case '已取回':
+        color = '#89D961'
+        break
       default:
         color = '#000'
         break
@@ -408,7 +411,7 @@
         <el-input v-model.trim="listQuery.manufactureNo" placeholder="设备出厂编号" clearable />
       </search-item>
       <search-item v-if="$props.statusName === '全部'">
-        <el-select v-model="listQuery.receiveStatus" placeholder="任务单状态" clearable>
+        <el-select v-model="listQuery.orderStatus" placeholder="任务单状态" clearable>
           <el-option v-for="item in receiveStatusList" :key="item.value" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
@@ -435,8 +438,8 @@
         <template #columns>
           <el-table-column v-if="$props.statusName === '全部'" label="任务单状态" align="center">
             <template #default="scope">
-              <span :style="{ color: TextColor(scope.row.receiveStatusName) }">
-                {{ scope.row.receiveStatusName }}
+              <span :style="{ color: TextColor(scope.row.orderStatusName) }">
+                {{ scope.row.orderStatusName }}
               </span>
             </template>
           </el-table-column>
@@ -487,7 +490,7 @@
               <!-- <el-button v-if="proxy.hasPerm(permUrl.edit) && $props.statusName === '全部'" link type="primary" :disabled="scope.row.receiveStatusName !== '未接收'" size="small" @click="handler(scope.row, 'update')">
                 编辑
               </el-button> -->
-              <el-button v-if="proxy.hasPerm(permUrl.cancel) && $props.statusName === '全部'" :disabled="scope.row.receiveStatusName !== '未接收'" link type="danger" size="small" @click="cancelHandler(scope.row)">
+              <el-button v-if="proxy.hasPerm(permUrl.cancel) && $props.statusName === '全部'" :disabled="scope.row.orderStatusName !== '未接收'" link type="danger" size="small" @click="cancelHandler(scope.row)">
                 取消
               </el-button>
             </template>
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index 0bf751f..8110a5b 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -314,23 +314,44 @@
   return (name: string) => {
     let color = ''
     switch (name) {
-      case '未接收':
-        color = '#888'
+      // case '未接收':
+      //   color = '#888'
+      //   break
+      // case '已接收':
+      //   color = '#000'
+      //   break
+      // case '已取消':
+      //   color = '#EAA341'
+      //   break
+      // case '已退回':
+      //   color = '#F68787'
+      //   break
+      // case '待取回':
+      //   color = '#82CD5E'
+      //   break
+      // case '已取回':
+      //   color = '#89D961'
+      //   break
+      case '检定中':
+        color = '#40AAFF'
         break
-      case '已接收':
+      case '已检完':
+        color = '#F0F9EB'
+        break
+      case '未检定':
         color = '#000'
         break
-      case '已取消':
-        color = '#EAA341'
+      case '已接收':
+        color = '#F0F9EB'
+        break
+      case '未接收':
+        color = '#000'
         break
       case '已退回':
         color = '#F68787'
         break
-      case '检测完成':
-        color = '#82CD5E'
-        break
-      case '检定中':
-        color = '#4FA6FF'
+      case '待补送':
+        color = '#EAA341'
         break
       default:
         color = '#000'
@@ -372,11 +393,12 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in ($route.path.includes('detail') && $route.query.statusName === '全部' ? columnsDetail : columnsHandler)" :key="item.value" :width="item.width" :prop="item.value" :label="item.text"
-        align="center"
+        v-for="item in ($route.path.includes('detail') && $route.query.statusName === '全部' ? columnsDetail : columnsHandler)"
+        :key="item.value" :width="item.width" :prop="item.value" :label="item.text" align="center"
       >
         <template #header>
-          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text
+          }}</span>
         </template>
         <template #default="scope">
           <!-- <el-button v-if="!scope.row.editable && !item.isUpload && item.text === '设备名称' && $route.path.includes('detail')" link type="primary" @click="deviceDetail(scope.row)">
@@ -388,11 +410,11 @@
             v-if="scope.row.editable && !item.isBtn && !item.isUpload" v-model="scope.row[item.value]" :autofocus="true"
             :placeholder="`${item.text}`" class="input"
           /> -->
-          <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+          <span v-if="!scope.row.editable" :class="{ link: $route.query.statusName === '全部' && item.text === '设备名称' ? true : false }" @click="deviceDetail(scope.row)"> {{
+            scope.row[item.value] }}</span>
           <el-input
             v-if="scope.row.editable && item.type === 'input'" v-model="scope.row[item.value]" :autofocus="true"
-            :placeholder="`${item.text}`" class="input"
-            @focus="select(item.text, scope.$index)"
+            :placeholder="`${item.text}`" class="input" @focus="select(item.text, scope.$index)"
           />
           <el-input
             v-if="scope.row.editable && item.type === 'btn'" v-model="scope.row[item.value]" :autofocus="true"
@@ -420,11 +442,16 @@
             </span>
           </template>
         </el-table-column>
+
+        <el-table-column align="center" label="接受状态说明">
+          <template #default="scope">
+            {{ scope.row.remark }}
+          </template>
+        </el-table-column>
         <el-table-column align="center" label="检定结果">
           <template #default="scope">
             <el-tag
-              v-if="['合格', '不合格', '限用'].includes(scope.row.measureCompletePercent)" :type="
-                scope.row.measureCompletePercent === '合格' ? 'success' : scope.row.measureCompletePercent === '不合格' ? 'danger' : scope.row.measureCompletePercent === '限用' ? 'warning' : 'primary'
+              v-if="['合格', '不合格', '限用'].includes(scope.row.measureCompletePercent)" :type="scope.row.measureCompletePercent === '合格' ? 'success' : scope.row.measureCompletePercent === '不合格' ? 'danger' : scope.row.measureCompletePercent === '限用' ? 'warning' : ''
               "
             >
               {{ scope.row.measureCompletePercent }}
@@ -439,6 +466,11 @@
             {{ scope.row.measureCompleteTime }}
           </template>
         </el-table-column>
+        <el-table-column align="center" label="检定说明">
+          <template #default="scope">
+            {{ scope.row.measureRemark }}
+          </template>
+        </el-table-column>
       </template>
     </el-table>
   </detail-block-switch>
@@ -452,4 +484,13 @@
 .el-select {
   width: 100%;
 }
+
+.link {
+  color: #40aaff;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
 </style>
diff --git a/src/views/tested/dashboard/list.vue b/src/views/tested/dashboard/list.vue
index f82c9b0..ec65781 100644
--- a/src/views/tested/dashboard/list.vue
+++ b/src/views/tested/dashboard/list.vue
@@ -1,8 +1,13 @@
 <script lang="ts" setup name="BoardIndex">
 import messList from './components/list.vue'
 import apprList from './components/listApprove.vue'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $route = useRoute()
 //  检定 verification  通知 notice  审批 approve  工作 work
+
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'BoardIndex')
+})
 </script>
 
 <template>
diff --git a/src/views/tested/device/group/components/list.vue b/src/views/tested/device/group/components/list.vue
index 4d3e229..04df4b7 100644
--- a/src/views/tested/device/group/components/list.vue
+++ b/src/views/tested/device/group/components/list.vue
@@ -8,6 +8,7 @@
 import { toTreeList } from '@/utils/structure'
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
 import { getDeptList, getDeptTree, getDeptTreeList, getDeptTreeListByPid } from '@/api/system/dept'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const userStore = useUserStore()
 const listQuery = reactive({
@@ -23,6 +24,10 @@
   sort: 'desc',
   orderBy: 'create_time',
 })
+
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'DeviceGroupIndex')
+})
 const columns = ref([
   {
     text: '所在单位',
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index 755d7ea..b3003ea 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -461,6 +461,14 @@
         //     ruleForm.value.deptId = deptList.value[0].id
         //   }
         // })
+        // 自定填充部门
+        if ($route.params.type === 'create') {
+          if (userStore.deptName !== ruleForm.value.companyName) {
+            setTimeout(() => {
+              ruleForm.value.deptId = userStore.deptId
+            })
+          }
+        }
       }
     })
   }
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index 8b8bfeb..a7aa6ab 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -36,7 +36,7 @@
   },
 })
 onBeforeRouteLeave((to: any) => {
-  keepSearchParams(to.path, 'DeviceInfo')
+  keepSearchParams(to.path, $props.equipmentType === '1' ? 'DeviceInfo' : 'SpecialDevice')
 })
 const userStore = useUserStore()
 const applyDict = ref<{ [key: string]: string }>({
diff --git a/src/views/tested/device/remind/index.vue b/src/views/tested/device/remind/index.vue
index 538572d..f5cf7d4 100644
--- a/src/views/tested/device/remind/index.vue
+++ b/src/views/tested/device/remind/index.vue
@@ -10,13 +10,16 @@
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 import { getTaskList } from '@/api/eqpt/device/task'
 import { getUserDept, getUserDeptSon } from '@/api/system/user'
+import { toTreeList } from '@/utils/structure'
 import { getPostList } from '@/api/system/post'
 import { getDeptTree, getDeptTreeList } from '@/api/system/dept'
+import useUserStore from '@/store/modules/user'
 import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 onBeforeRouteLeave((to: any) => {
   keepSearchParams(to.path, 'RemindList')
 })
+const userStore = useUserStore()
 const listQuery = reactive({
   certificateValidEnd: '',
   certificateValidStart: '',
@@ -65,14 +68,21 @@
     align: 'center',
   },
   {
+    text: '使用部门',
+    value: 'deptName',
+    align: 'center',
+  },
+  {
     text: '计量标识',
     value: 'meterIdentifyName',
     align: 'center',
+    width: '90',
   },
   {
     text: '检定周期',
     value: 'checkCycle',
     align: 'center',
+    width: '90',
   },
 ])
 const otherColumns = ref([
@@ -80,6 +90,7 @@
     text: '使用状态',
     value: 'usageStatusName',
     align: 'center',
+    width: '90',
   },
   // {
   //   text: '备注',
@@ -97,6 +108,12 @@
     value: 'taskTimes',
     align: 'center',
   },
+  {
+    text: '检定去向',
+    value: 'checkDestinationName',
+    align: 'center',
+    width: '90',
+  },
 ])
 const list = ref([])
 const total = ref(0)
@@ -285,13 +302,18 @@
     remindList.value = res.data
   })
   // 获取当前用户所在单位
-  // getUserDept().then((res) => {
-  // getDeptTree({ pid: '0' }).then((res1) => {
-  //   deptList.value = res1.data.filter((item: any) => item.pids.split(',').length === 3 && item.pid !== '0').map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
-  // })
-  getUserDeptSon({ }).then((res) => {
-    deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  getUserDept().then((res) => {
+    // getDeptTree({ pid: '0' }).then((res1) => {
+    //   deptList.value = res1.data.filter((item: any) => item.pids.split(',').length === 3 && item.pid !== '0').map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+    // })
+    // getUserDeptSon({ }).then((res) => {
+    //   deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+    //   console.log(deptList.value, 'deptList.value')
+    getDeptTreeList({ pid: res.data.id }).then((res) => {
+      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id }))) as any
+    })
   })
+
   // })
   // 使用岗位
   getPostList({}).then((res) => {
@@ -358,9 +380,13 @@
       </search-item> -->
       <search-item>
         <!-- <dept-select v-model="listQuery.deptIds" placeholder="使用部门" /> -->
-        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门" style="width: 100%;" clearable>
+        <!-- <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>
+        </el-select> -->
+        <el-tree-select
+          v-model="listQuery.deptIds" :data="deptList" :render-after-expand="false" check-strictly
+          placeholder="使用部门"
+        />
       </search-item>
       <search-item>
         <!-- <el-input v-model.trim="listQuery.usePosition" placeholder="使用岗位" clearable /> -->
@@ -376,22 +402,14 @@
       </search-item> -->
       <search-item>
         <el-date-picker
-          v-model="listQuery.certificateValidStart"
-          type="date"
-          placeholder="证书有效期开始时间"
-          value-format="YYYY-MM-DD 00:00:00"
-          format="YYYY-MM-DD"
-          clearable
+          v-model="listQuery.certificateValidStart" type="date" placeholder="证书有效期开始时间"
+          value-format="YYYY-MM-DD 00:00:00" format="YYYY-MM-DD" clearable
         />
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="listQuery.certificateValidEnd"
-          type="date"
-          placeholder="证书有效期结束时间"
-          value-format="YYYY-MM-DD 23:59:59"
-          format="YYYY-MM-DD"
-          clearable
+          v-model="listQuery.certificateValidEnd" type="date" placeholder="证书有效期结束时间"
+          value-format="YYYY-MM-DD 23:59:59" format="YYYY-MM-DD" clearable
         />
       </search-item>
       <search-item>
@@ -421,9 +439,8 @@
       </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
+          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>
@@ -434,24 +451,29 @@
       </template>
       <!-- 普通表格 -->
       <normal-table
-        v-if="showTable"
-        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
-        :is-showmulti-select="true" :is-multi="true" @change="changePage"
+        v-if="showTable" :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>
           <el-table-column label="证书有效期" align="center">
             <template #default="scope">
-              <span :class="rowClassName(scope.row. certificateValid)">{{ scope.row. certificateValid }}</span>
+              <span :class="rowClassName(scope.row.certificateValid)">{{ scope.row.certificateValid }}</span>
             </template>
           </el-table-column>
-          <el-table-column v-for="item in otherColumns" :key="item.text" :width="item.width" :label="item.text" :prop="item.value" align="center" />
+          <el-table-column
+            v-for="item in otherColumns" :key="item.text" :width="item.width" :label="item.text"
+            :prop="item.value" align="center"
+          />
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
               <el-button link type="primary" size="small" @click="detail(scope.row)">
                 查看
               </el-button>
-              <el-button v-if="proxy.hasPerm('/tested/device/remind/remind')" link type="primary" size="small" @click="remind(scope.row)">
+              <el-button
+                v-if="proxy.hasPerm('/tested/device/remind/remind')" link type="primary" size="small"
+                @click="remind(scope.row)"
+              >
                 提醒
               </el-button>
             </template>
@@ -472,4 +494,3 @@
   color: red;
 }
 </style>
-
diff --git a/src/views/tested/document/list/index.vue b/src/views/tested/document/list/index.vue
index e1ca1c4..1123be0 100644
--- a/src/views/tested/document/list/index.vue
+++ b/src/views/tested/document/list/index.vue
@@ -8,6 +8,7 @@
 import { getPhotoUrl } from '@/api/system/tool'
 import { getDictByCode } from '@/api/system/dict'
 import { getAdminDept } from '@/api/system/user'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive<IlistQuery>({
   fileNo: '',
@@ -21,6 +22,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'DocumentList')
+})
 const columns = ref([
   {
     text: '文件号',
diff --git a/src/views/tested/status/borrow/components/list.vue b/src/views/tested/status/borrow/components/list.vue
index 16861b6..6441b38 100644
--- a/src/views/tested/status/borrow/components/list.vue
+++ b/src/views/tested/status/borrow/components/list.vue
@@ -9,6 +9,7 @@
 import { getAdminDept, getUserDept } from '@/api/system/user'
 import { toTreeList } from '@/utils/structure'
 import { getDeptTreeList } from '@/api/system/dept'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   //  审批状态  全部 审批等
   statusName: {
@@ -24,6 +25,9 @@
   未通过: '5',
   已取消: '6',
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'DeviceBorrow')
+})
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   approvalNo: '',
diff --git a/src/views/tested/status/delay/components/list.vue b/src/views/tested/status/delay/components/list.vue
index 090ba91..b640ddd 100644
--- a/src/views/tested/status/delay/components/list.vue
+++ b/src/views/tested/status/delay/components/list.vue
@@ -11,6 +11,7 @@
 import { toTreeList, underlineToHump } from '@/utils/structure'
 import { getDeptList, getDeptTree, getDeptTreeList } from '@/api/system/dept'
 import { getPostList } from '@/api/system/post'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   //  审批状态  全部 审批等
   statusName: {
@@ -23,6 +24,16 @@
     default: '',
   },
 })
+const stsusDictAlive = {
+  1: 'SealPage',
+  2: 'UnsealPage',
+  3: 'DisabledPage',
+  4: 'ScrapPage',
+  5: 'DelayPage',
+}
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, stsusDictAlive[$props.statusType])
+})
 const applyDict = ref<{ [key: string]: string }>({
   审批: '',
   草稿箱: '1',

diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue
index 58aa0af..1c1c923 100644
--- a/src/views/tested/MeasurementBusiness/detection/index.vue
+++ b/src/views/tested/MeasurementBusiness/detection/index.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/detection'
 import { printJSON } from '@/utils/printUtils'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   noticeDateEnd: '',
@@ -14,6 +15,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'InspectionResultReviewNotice')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
diff --git a/src/views/tested/MeasurementBusiness/notice/index.vue b/src/views/tested/MeasurementBusiness/notice/index.vue
index de0cf86..e161859 100644
--- a/src/views/tested/MeasurementBusiness/notice/index.vue
+++ b/src/views/tested/MeasurementBusiness/notice/index.vue
@@ -3,6 +3,7 @@
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/notice'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   applicantName: '',
@@ -18,6 +19,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'SubcontractingNotice')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
diff --git a/src/views/tested/MeasurementBusiness/opinion/components/list.vue b/src/views/tested/MeasurementBusiness/opinion/components/list.vue
index a2e035c..4e5fd62 100644
--- a/src/views/tested/MeasurementBusiness/opinion/components/list.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/components/list.vue
@@ -9,6 +9,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { getDictByCode } from '@/api/system/dict'
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   statusName: {
     type: String,
@@ -24,6 +25,9 @@
   未通过: '5',
   已取消: '6',
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'ClientOpinionForm')
+})
 const listQuery = reactive({
   approvalStatus: '0',
   createTimeEnd: '',
diff --git a/src/views/tested/MeasurementBusiness/review/index.vue b/src/views/tested/MeasurementBusiness/review/index.vue
index b4c16f9..c2f4c68 100644
--- a/src/views/tested/MeasurementBusiness/review/index.vue
+++ b/src/views/tested/MeasurementBusiness/review/index.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/review'
 import { getDictByCode } from '@/api/system/dict'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   approvalStatus: '',
@@ -18,6 +19,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'ReviewForm')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref([
   `${new Date().getFullYear()}-01-01`,
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/index.vue b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
index 238bbd6..aef9dab 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/index.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
@@ -3,6 +3,7 @@
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/satisfaction'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   sendTimeStart: '',
@@ -11,6 +12,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'ClientSatisfactionSurveyForm')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
diff --git a/src/views/tested/MeasurementPlan/board/index.vue b/src/views/tested/MeasurementPlan/board/index.vue
index 8d14386..850326e 100644
--- a/src/views/tested/MeasurementPlan/board/index.vue
+++ b/src/views/tested/MeasurementPlan/board/index.vue
@@ -5,12 +5,16 @@
 import { exportListApi, getListPage } from '@/api/eqpt/measurementPlan/board'
 import { exportFile } from '@/utils/exportUtils'
 import { buildTree, toTreeList } from '@/utils/structure'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   deptName: '',
   // offset: 1,
   // limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'BoardList')
+})
 const columns = ref<any>([
   {
     text: '部门',
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index f7390f9..e2061e0 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -5,6 +5,7 @@
 import { getListPage } from '@/api/eqpt/measurementPlan/dept'
 import useUserStore from '@/store/modules/user'
 import { getUserDept } from '@/api/system/user'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   // notifyType 通知类型(负责人/部门，字典值)
   notifyType: {
@@ -12,6 +13,10 @@
     required: true,
   },
 })
+
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, $props.notifyType === '2' ? 'DeptNotice' : 'CuratorNotice')
+})
 const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
 const userStore = useUserStore()
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index 1f64a62..ee1d163 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -11,6 +11,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 import { getPostList } from '@/api/system/post'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   // 申请类型（字典值，提前/延迟）
   approvalType: {
@@ -23,6 +24,9 @@
     required: true,
   },
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, $props.approvalType === '0' ? 'EarlyApplication' : 'DelayApplication')
+})
 const applyDict = ref<{ [key: string]: string }>({
   审批: '',
   草稿箱: '1',
diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue
index f5eedcb..d5b57e4 100644
--- a/src/views/tested/MeasurementPlan/plan/components/list.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/list.vue
@@ -13,6 +13,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 import useUserStore from '@/store/modules/user'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   statusName: {
     type: String,
@@ -28,6 +29,9 @@
   未通过: '5',
   已取消: '6',
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'PlanIndex')
+})
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   approvalStatus: '', //	申请状态(审批列表传)		false
diff --git a/src/views/tested/MeasurementPlan/task/components/edit.vue b/src/views/tested/MeasurementPlan/task/components/edit.vue
index 9c2f2d9..86b6bd2 100644
--- a/src/views/tested/MeasurementPlan/task/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/task/components/edit.vue
@@ -54,6 +54,7 @@
   isOnSiteCheck: '0',
   onSiteCheckTime: '',
   deptId: '',
+  orderStatusName: '',
 }) // 表单
 const checkPhone = (rule: any, value: any, callback: any) => {
   if (value === '') {
@@ -550,7 +551,7 @@
           <el-row v-if="$route.path.includes('detail') && $route.query.statusName === '全部'" :gutter="24" class="marg">
             <el-col :span="6">
               <el-form-item label="任务单状态">
-                <el-input v-model.trim="ruleForm.receiveStatusName" />
+                <el-input v-model.trim="ruleForm.orderStatusName" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
diff --git a/src/views/tested/MeasurementPlan/task/components/list.vue b/src/views/tested/MeasurementPlan/task/components/list.vue
index c81fd92..d5c6e17 100644
--- a/src/views/tested/MeasurementPlan/task/components/list.vue
+++ b/src/views/tested/MeasurementPlan/task/components/list.vue
@@ -31,7 +31,7 @@
   usePositionId: '',
   measureCompany: '',
   manufactureNo: '',
-  receiveStatus: '',
+  orderStatus: '',
   offset: 1,
   limit: 20,
   sort: 'desc',
@@ -110,7 +110,7 @@
   // },
   {
     text: '计划送检时间',
-    value: 'requireOverTime',
+    value: 'planDeliverTime',
     align: 'center',
   },
   // {
@@ -144,7 +144,7 @@
 watch(() => $props.statusName, (newVal) => {
   if (newVal) {
     listQuery.approvalStatus = applyDict.value[newVal] as string
-    listQuery.receiveStatus = $props.statusName === '全部' ? '' : listQuery.receiveStatus
+    listQuery.orderStatus = $props.statusName === '全部' ? '' : listQuery.orderStatus
     fetchData()
   }
 },
@@ -165,7 +165,7 @@
   listQuery.usePositionId = ''
   listQuery.measureCompany = ''
   listQuery.manufactureNo = ''
-  listQuery.receiveStatus = ''
+  listQuery.orderStatus = ''
   listQuery.offset = 1
   listQuery.limit = 20
   listQuery.sort = 'desc'
@@ -278,7 +278,7 @@
   })
   // })
   // 接收状态
-  getDictByCode('orderStatus').then((res) => {
+  getDictByCode('eqptTaskStatus').then((res) => {
     receiveStatusList.value = res.data
   })
 }
@@ -362,9 +362,12 @@
       case '已退回':
         color = '#F68787'
         break
-      case '检测完成':
+      case '待取回':
         color = '#82CD5E'
         break
+      case '已取回':
+        color = '#89D961'
+        break
       default:
         color = '#000'
         break
@@ -408,7 +411,7 @@
         <el-input v-model.trim="listQuery.manufactureNo" placeholder="设备出厂编号" clearable />
       </search-item>
       <search-item v-if="$props.statusName === '全部'">
-        <el-select v-model="listQuery.receiveStatus" placeholder="任务单状态" clearable>
+        <el-select v-model="listQuery.orderStatus" placeholder="任务单状态" clearable>
           <el-option v-for="item in receiveStatusList" :key="item.value" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
@@ -435,8 +438,8 @@
         <template #columns>
           <el-table-column v-if="$props.statusName === '全部'" label="任务单状态" align="center">
             <template #default="scope">
-              <span :style="{ color: TextColor(scope.row.receiveStatusName) }">
-                {{ scope.row.receiveStatusName }}
+              <span :style="{ color: TextColor(scope.row.orderStatusName) }">
+                {{ scope.row.orderStatusName }}
               </span>
             </template>
           </el-table-column>
@@ -487,7 +490,7 @@
               <!-- <el-button v-if="proxy.hasPerm(permUrl.edit) && $props.statusName === '全部'" link type="primary" :disabled="scope.row.receiveStatusName !== '未接收'" size="small" @click="handler(scope.row, 'update')">
                 编辑
               </el-button> -->
-              <el-button v-if="proxy.hasPerm(permUrl.cancel) && $props.statusName === '全部'" :disabled="scope.row.receiveStatusName !== '未接收'" link type="danger" size="small" @click="cancelHandler(scope.row)">
+              <el-button v-if="proxy.hasPerm(permUrl.cancel) && $props.statusName === '全部'" :disabled="scope.row.orderStatusName !== '未接收'" link type="danger" size="small" @click="cancelHandler(scope.row)">
                 取消
               </el-button>
             </template>
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index 0bf751f..8110a5b 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -314,23 +314,44 @@
   return (name: string) => {
     let color = ''
     switch (name) {
-      case '未接收':
-        color = '#888'
+      // case '未接收':
+      //   color = '#888'
+      //   break
+      // case '已接收':
+      //   color = '#000'
+      //   break
+      // case '已取消':
+      //   color = '#EAA341'
+      //   break
+      // case '已退回':
+      //   color = '#F68787'
+      //   break
+      // case '待取回':
+      //   color = '#82CD5E'
+      //   break
+      // case '已取回':
+      //   color = '#89D961'
+      //   break
+      case '检定中':
+        color = '#40AAFF'
         break
-      case '已接收':
+      case '已检完':
+        color = '#F0F9EB'
+        break
+      case '未检定':
         color = '#000'
         break
-      case '已取消':
-        color = '#EAA341'
+      case '已接收':
+        color = '#F0F9EB'
+        break
+      case '未接收':
+        color = '#000'
         break
       case '已退回':
         color = '#F68787'
         break
-      case '检测完成':
-        color = '#82CD5E'
-        break
-      case '检定中':
-        color = '#4FA6FF'
+      case '待补送':
+        color = '#EAA341'
         break
       default:
         color = '#000'
@@ -372,11 +393,12 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in ($route.path.includes('detail') && $route.query.statusName === '全部' ? columnsDetail : columnsHandler)" :key="item.value" :width="item.width" :prop="item.value" :label="item.text"
-        align="center"
+        v-for="item in ($route.path.includes('detail') && $route.query.statusName === '全部' ? columnsDetail : columnsHandler)"
+        :key="item.value" :width="item.width" :prop="item.value" :label="item.text" align="center"
       >
         <template #header>
-          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text
+          }}</span>
         </template>
         <template #default="scope">
           <!-- <el-button v-if="!scope.row.editable && !item.isUpload && item.text === '设备名称' && $route.path.includes('detail')" link type="primary" @click="deviceDetail(scope.row)">
@@ -388,11 +410,11 @@
             v-if="scope.row.editable && !item.isBtn && !item.isUpload" v-model="scope.row[item.value]" :autofocus="true"
             :placeholder="`${item.text}`" class="input"
           /> -->
-          <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+          <span v-if="!scope.row.editable" :class="{ link: $route.query.statusName === '全部' && item.text === '设备名称' ? true : false }" @click="deviceDetail(scope.row)"> {{
+            scope.row[item.value] }}</span>
           <el-input
             v-if="scope.row.editable && item.type === 'input'" v-model="scope.row[item.value]" :autofocus="true"
-            :placeholder="`${item.text}`" class="input"
-            @focus="select(item.text, scope.$index)"
+            :placeholder="`${item.text}`" class="input" @focus="select(item.text, scope.$index)"
           />
           <el-input
             v-if="scope.row.editable && item.type === 'btn'" v-model="scope.row[item.value]" :autofocus="true"
@@ -420,11 +442,16 @@
             </span>
           </template>
         </el-table-column>
+
+        <el-table-column align="center" label="接受状态说明">
+          <template #default="scope">
+            {{ scope.row.remark }}
+          </template>
+        </el-table-column>
         <el-table-column align="center" label="检定结果">
           <template #default="scope">
             <el-tag
-              v-if="['合格', '不合格', '限用'].includes(scope.row.measureCompletePercent)" :type="
-                scope.row.measureCompletePercent === '合格' ? 'success' : scope.row.measureCompletePercent === '不合格' ? 'danger' : scope.row.measureCompletePercent === '限用' ? 'warning' : 'primary'
+              v-if="['合格', '不合格', '限用'].includes(scope.row.measureCompletePercent)" :type="scope.row.measureCompletePercent === '合格' ? 'success' : scope.row.measureCompletePercent === '不合格' ? 'danger' : scope.row.measureCompletePercent === '限用' ? 'warning' : ''
               "
             >
               {{ scope.row.measureCompletePercent }}
@@ -439,6 +466,11 @@
             {{ scope.row.measureCompleteTime }}
           </template>
         </el-table-column>
+        <el-table-column align="center" label="检定说明">
+          <template #default="scope">
+            {{ scope.row.measureRemark }}
+          </template>
+        </el-table-column>
       </template>
     </el-table>
   </detail-block-switch>
@@ -452,4 +484,13 @@
 .el-select {
   width: 100%;
 }
+
+.link {
+  color: #40aaff;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
 </style>
diff --git a/src/views/tested/dashboard/list.vue b/src/views/tested/dashboard/list.vue
index f82c9b0..ec65781 100644
--- a/src/views/tested/dashboard/list.vue
+++ b/src/views/tested/dashboard/list.vue
@@ -1,8 +1,13 @@
 <script lang="ts" setup name="BoardIndex">
 import messList from './components/list.vue'
 import apprList from './components/listApprove.vue'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $route = useRoute()
 //  检定 verification  通知 notice  审批 approve  工作 work
+
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'BoardIndex')
+})
 </script>
 
 <template>
diff --git a/src/views/tested/device/group/components/list.vue b/src/views/tested/device/group/components/list.vue
index 4d3e229..04df4b7 100644
--- a/src/views/tested/device/group/components/list.vue
+++ b/src/views/tested/device/group/components/list.vue
@@ -8,6 +8,7 @@
 import { toTreeList } from '@/utils/structure'
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
 import { getDeptList, getDeptTree, getDeptTreeList, getDeptTreeListByPid } from '@/api/system/dept'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const userStore = useUserStore()
 const listQuery = reactive({
@@ -23,6 +24,10 @@
   sort: 'desc',
   orderBy: 'create_time',
 })
+
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'DeviceGroupIndex')
+})
 const columns = ref([
   {
     text: '所在单位',
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index 755d7ea..b3003ea 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -461,6 +461,14 @@
         //     ruleForm.value.deptId = deptList.value[0].id
         //   }
         // })
+        // 自定填充部门
+        if ($route.params.type === 'create') {
+          if (userStore.deptName !== ruleForm.value.companyName) {
+            setTimeout(() => {
+              ruleForm.value.deptId = userStore.deptId
+            })
+          }
+        }
       }
     })
   }
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index 8b8bfeb..a7aa6ab 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -36,7 +36,7 @@
   },
 })
 onBeforeRouteLeave((to: any) => {
-  keepSearchParams(to.path, 'DeviceInfo')
+  keepSearchParams(to.path, $props.equipmentType === '1' ? 'DeviceInfo' : 'SpecialDevice')
 })
 const userStore = useUserStore()
 const applyDict = ref<{ [key: string]: string }>({
diff --git a/src/views/tested/device/remind/index.vue b/src/views/tested/device/remind/index.vue
index 538572d..f5cf7d4 100644
--- a/src/views/tested/device/remind/index.vue
+++ b/src/views/tested/device/remind/index.vue
@@ -10,13 +10,16 @@
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 import { getTaskList } from '@/api/eqpt/device/task'
 import { getUserDept, getUserDeptSon } from '@/api/system/user'
+import { toTreeList } from '@/utils/structure'
 import { getPostList } from '@/api/system/post'
 import { getDeptTree, getDeptTreeList } from '@/api/system/dept'
+import useUserStore from '@/store/modules/user'
 import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 onBeforeRouteLeave((to: any) => {
   keepSearchParams(to.path, 'RemindList')
 })
+const userStore = useUserStore()
 const listQuery = reactive({
   certificateValidEnd: '',
   certificateValidStart: '',
@@ -65,14 +68,21 @@
     align: 'center',
   },
   {
+    text: '使用部门',
+    value: 'deptName',
+    align: 'center',
+  },
+  {
     text: '计量标识',
     value: 'meterIdentifyName',
     align: 'center',
+    width: '90',
   },
   {
     text: '检定周期',
     value: 'checkCycle',
     align: 'center',
+    width: '90',
   },
 ])
 const otherColumns = ref([
@@ -80,6 +90,7 @@
     text: '使用状态',
     value: 'usageStatusName',
     align: 'center',
+    width: '90',
   },
   // {
   //   text: '备注',
@@ -97,6 +108,12 @@
     value: 'taskTimes',
     align: 'center',
   },
+  {
+    text: '检定去向',
+    value: 'checkDestinationName',
+    align: 'center',
+    width: '90',
+  },
 ])
 const list = ref([])
 const total = ref(0)
@@ -285,13 +302,18 @@
     remindList.value = res.data
   })
   // 获取当前用户所在单位
-  // getUserDept().then((res) => {
-  // getDeptTree({ pid: '0' }).then((res1) => {
-  //   deptList.value = res1.data.filter((item: any) => item.pids.split(',').length === 3 && item.pid !== '0').map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
-  // })
-  getUserDeptSon({ }).then((res) => {
-    deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  getUserDept().then((res) => {
+    // getDeptTree({ pid: '0' }).then((res1) => {
+    //   deptList.value = res1.data.filter((item: any) => item.pids.split(',').length === 3 && item.pid !== '0').map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+    // })
+    // getUserDeptSon({ }).then((res) => {
+    //   deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+    //   console.log(deptList.value, 'deptList.value')
+    getDeptTreeList({ pid: res.data.id }).then((res) => {
+      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id }))) as any
+    })
   })
+
   // })
   // 使用岗位
   getPostList({}).then((res) => {
@@ -358,9 +380,13 @@
       </search-item> -->
       <search-item>
         <!-- <dept-select v-model="listQuery.deptIds" placeholder="使用部门" /> -->
-        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门" style="width: 100%;" clearable>
+        <!-- <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>
+        </el-select> -->
+        <el-tree-select
+          v-model="listQuery.deptIds" :data="deptList" :render-after-expand="false" check-strictly
+          placeholder="使用部门"
+        />
       </search-item>
       <search-item>
         <!-- <el-input v-model.trim="listQuery.usePosition" placeholder="使用岗位" clearable /> -->
@@ -376,22 +402,14 @@
       </search-item> -->
       <search-item>
         <el-date-picker
-          v-model="listQuery.certificateValidStart"
-          type="date"
-          placeholder="证书有效期开始时间"
-          value-format="YYYY-MM-DD 00:00:00"
-          format="YYYY-MM-DD"
-          clearable
+          v-model="listQuery.certificateValidStart" type="date" placeholder="证书有效期开始时间"
+          value-format="YYYY-MM-DD 00:00:00" format="YYYY-MM-DD" clearable
         />
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="listQuery.certificateValidEnd"
-          type="date"
-          placeholder="证书有效期结束时间"
-          value-format="YYYY-MM-DD 23:59:59"
-          format="YYYY-MM-DD"
-          clearable
+          v-model="listQuery.certificateValidEnd" type="date" placeholder="证书有效期结束时间"
+          value-format="YYYY-MM-DD 23:59:59" format="YYYY-MM-DD" clearable
         />
       </search-item>
       <search-item>
@@ -421,9 +439,8 @@
       </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
+          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>
@@ -434,24 +451,29 @@
       </template>
       <!-- 普通表格 -->
       <normal-table
-        v-if="showTable"
-        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
-        :is-showmulti-select="true" :is-multi="true" @change="changePage"
+        v-if="showTable" :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>
           <el-table-column label="证书有效期" align="center">
             <template #default="scope">
-              <span :class="rowClassName(scope.row. certificateValid)">{{ scope.row. certificateValid }}</span>
+              <span :class="rowClassName(scope.row.certificateValid)">{{ scope.row.certificateValid }}</span>
             </template>
           </el-table-column>
-          <el-table-column v-for="item in otherColumns" :key="item.text" :width="item.width" :label="item.text" :prop="item.value" align="center" />
+          <el-table-column
+            v-for="item in otherColumns" :key="item.text" :width="item.width" :label="item.text"
+            :prop="item.value" align="center"
+          />
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
               <el-button link type="primary" size="small" @click="detail(scope.row)">
                 查看
               </el-button>
-              <el-button v-if="proxy.hasPerm('/tested/device/remind/remind')" link type="primary" size="small" @click="remind(scope.row)">
+              <el-button
+                v-if="proxy.hasPerm('/tested/device/remind/remind')" link type="primary" size="small"
+                @click="remind(scope.row)"
+              >
                 提醒
               </el-button>
             </template>
@@ -472,4 +494,3 @@
   color: red;
 }
 </style>
-
diff --git a/src/views/tested/document/list/index.vue b/src/views/tested/document/list/index.vue
index e1ca1c4..1123be0 100644
--- a/src/views/tested/document/list/index.vue
+++ b/src/views/tested/document/list/index.vue
@@ -8,6 +8,7 @@
 import { getPhotoUrl } from '@/api/system/tool'
 import { getDictByCode } from '@/api/system/dict'
 import { getAdminDept } from '@/api/system/user'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive<IlistQuery>({
   fileNo: '',
@@ -21,6 +22,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'DocumentList')
+})
 const columns = ref([
   {
     text: '文件号',
diff --git a/src/views/tested/status/borrow/components/list.vue b/src/views/tested/status/borrow/components/list.vue
index 16861b6..6441b38 100644
--- a/src/views/tested/status/borrow/components/list.vue
+++ b/src/views/tested/status/borrow/components/list.vue
@@ -9,6 +9,7 @@
 import { getAdminDept, getUserDept } from '@/api/system/user'
 import { toTreeList } from '@/utils/structure'
 import { getDeptTreeList } from '@/api/system/dept'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   //  审批状态  全部 审批等
   statusName: {
@@ -24,6 +25,9 @@
   未通过: '5',
   已取消: '6',
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'DeviceBorrow')
+})
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   approvalNo: '',
diff --git a/src/views/tested/status/delay/components/list.vue b/src/views/tested/status/delay/components/list.vue
index 090ba91..b640ddd 100644
--- a/src/views/tested/status/delay/components/list.vue
+++ b/src/views/tested/status/delay/components/list.vue
@@ -11,6 +11,7 @@
 import { toTreeList, underlineToHump } from '@/utils/structure'
 import { getDeptList, getDeptTree, getDeptTreeList } from '@/api/system/dept'
 import { getPostList } from '@/api/system/post'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   //  审批状态  全部 审批等
   statusName: {
@@ -23,6 +24,16 @@
     default: '',
   },
 })
+const stsusDictAlive = {
+  1: 'SealPage',
+  2: 'UnsealPage',
+  3: 'DisabledPage',
+  4: 'ScrapPage',
+  5: 'DelayPage',
+}
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, stsusDictAlive[$props.statusType])
+})
 const applyDict = ref<{ [key: string]: string }>({
   审批: '',
   草稿箱: '1',
diff --git a/src/views/tested/status/maintain/index.vue b/src/views/tested/status/maintain/index.vue
index a0378c7..0785c18 100644
--- a/src/views/tested/status/maintain/index.vue
+++ b/src/views/tested/status/maintain/index.vue
@@ -7,6 +7,7 @@
 import { getAdminDept, getUserDept } from '@/api/system/user'
 import { toTreeList } from '@/utils/structure'
 import { getDeptTreeList } from '@/api/system/dept'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 查询条件
@@ -23,6 +24,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'DeviceMainList')
+})
 // 申请开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {

diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue
index 58aa0af..1c1c923 100644
--- a/src/views/tested/MeasurementBusiness/detection/index.vue
+++ b/src/views/tested/MeasurementBusiness/detection/index.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/detection'
 import { printJSON } from '@/utils/printUtils'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   noticeDateEnd: '',
@@ -14,6 +15,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'InspectionResultReviewNotice')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
diff --git a/src/views/tested/MeasurementBusiness/notice/index.vue b/src/views/tested/MeasurementBusiness/notice/index.vue
index de0cf86..e161859 100644
--- a/src/views/tested/MeasurementBusiness/notice/index.vue
+++ b/src/views/tested/MeasurementBusiness/notice/index.vue
@@ -3,6 +3,7 @@
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/notice'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   applicantName: '',
@@ -18,6 +19,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'SubcontractingNotice')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
diff --git a/src/views/tested/MeasurementBusiness/opinion/components/list.vue b/src/views/tested/MeasurementBusiness/opinion/components/list.vue
index a2e035c..4e5fd62 100644
--- a/src/views/tested/MeasurementBusiness/opinion/components/list.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/components/list.vue
@@ -9,6 +9,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { getDictByCode } from '@/api/system/dict'
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   statusName: {
     type: String,
@@ -24,6 +25,9 @@
   未通过: '5',
   已取消: '6',
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'ClientOpinionForm')
+})
 const listQuery = reactive({
   approvalStatus: '0',
   createTimeEnd: '',
diff --git a/src/views/tested/MeasurementBusiness/review/index.vue b/src/views/tested/MeasurementBusiness/review/index.vue
index b4c16f9..c2f4c68 100644
--- a/src/views/tested/MeasurementBusiness/review/index.vue
+++ b/src/views/tested/MeasurementBusiness/review/index.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/review'
 import { getDictByCode } from '@/api/system/dict'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   approvalStatus: '',
@@ -18,6 +19,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'ReviewForm')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref([
   `${new Date().getFullYear()}-01-01`,
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/index.vue b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
index 238bbd6..aef9dab 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/index.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
@@ -3,6 +3,7 @@
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/satisfaction'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   sendTimeStart: '',
@@ -11,6 +12,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'ClientSatisfactionSurveyForm')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
diff --git a/src/views/tested/MeasurementPlan/board/index.vue b/src/views/tested/MeasurementPlan/board/index.vue
index 8d14386..850326e 100644
--- a/src/views/tested/MeasurementPlan/board/index.vue
+++ b/src/views/tested/MeasurementPlan/board/index.vue
@@ -5,12 +5,16 @@
 import { exportListApi, getListPage } from '@/api/eqpt/measurementPlan/board'
 import { exportFile } from '@/utils/exportUtils'
 import { buildTree, toTreeList } from '@/utils/structure'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   deptName: '',
   // offset: 1,
   // limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'BoardList')
+})
 const columns = ref<any>([
   {
     text: '部门',
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index f7390f9..e2061e0 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -5,6 +5,7 @@
 import { getListPage } from '@/api/eqpt/measurementPlan/dept'
 import useUserStore from '@/store/modules/user'
 import { getUserDept } from '@/api/system/user'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   // notifyType 通知类型(负责人/部门，字典值)
   notifyType: {
@@ -12,6 +13,10 @@
     required: true,
   },
 })
+
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, $props.notifyType === '2' ? 'DeptNotice' : 'CuratorNotice')
+})
 const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
 const userStore = useUserStore()
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index 1f64a62..ee1d163 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -11,6 +11,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 import { getPostList } from '@/api/system/post'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   // 申请类型（字典值，提前/延迟）
   approvalType: {
@@ -23,6 +24,9 @@
     required: true,
   },
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, $props.approvalType === '0' ? 'EarlyApplication' : 'DelayApplication')
+})
 const applyDict = ref<{ [key: string]: string }>({
   审批: '',
   草稿箱: '1',
diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue
index f5eedcb..d5b57e4 100644
--- a/src/views/tested/MeasurementPlan/plan/components/list.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/list.vue
@@ -13,6 +13,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 import useUserStore from '@/store/modules/user'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   statusName: {
     type: String,
@@ -28,6 +29,9 @@
   未通过: '5',
   已取消: '6',
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'PlanIndex')
+})
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   approvalStatus: '', //	申请状态(审批列表传)		false
diff --git a/src/views/tested/MeasurementPlan/task/components/edit.vue b/src/views/tested/MeasurementPlan/task/components/edit.vue
index 9c2f2d9..86b6bd2 100644
--- a/src/views/tested/MeasurementPlan/task/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/task/components/edit.vue
@@ -54,6 +54,7 @@
   isOnSiteCheck: '0',
   onSiteCheckTime: '',
   deptId: '',
+  orderStatusName: '',
 }) // 表单
 const checkPhone = (rule: any, value: any, callback: any) => {
   if (value === '') {
@@ -550,7 +551,7 @@
           <el-row v-if="$route.path.includes('detail') && $route.query.statusName === '全部'" :gutter="24" class="marg">
             <el-col :span="6">
               <el-form-item label="任务单状态">
-                <el-input v-model.trim="ruleForm.receiveStatusName" />
+                <el-input v-model.trim="ruleForm.orderStatusName" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
diff --git a/src/views/tested/MeasurementPlan/task/components/list.vue b/src/views/tested/MeasurementPlan/task/components/list.vue
index c81fd92..d5c6e17 100644
--- a/src/views/tested/MeasurementPlan/task/components/list.vue
+++ b/src/views/tested/MeasurementPlan/task/components/list.vue
@@ -31,7 +31,7 @@
   usePositionId: '',
   measureCompany: '',
   manufactureNo: '',
-  receiveStatus: '',
+  orderStatus: '',
   offset: 1,
   limit: 20,
   sort: 'desc',
@@ -110,7 +110,7 @@
   // },
   {
     text: '计划送检时间',
-    value: 'requireOverTime',
+    value: 'planDeliverTime',
     align: 'center',
   },
   // {
@@ -144,7 +144,7 @@
 watch(() => $props.statusName, (newVal) => {
   if (newVal) {
     listQuery.approvalStatus = applyDict.value[newVal] as string
-    listQuery.receiveStatus = $props.statusName === '全部' ? '' : listQuery.receiveStatus
+    listQuery.orderStatus = $props.statusName === '全部' ? '' : listQuery.orderStatus
     fetchData()
   }
 },
@@ -165,7 +165,7 @@
   listQuery.usePositionId = ''
   listQuery.measureCompany = ''
   listQuery.manufactureNo = ''
-  listQuery.receiveStatus = ''
+  listQuery.orderStatus = ''
   listQuery.offset = 1
   listQuery.limit = 20
   listQuery.sort = 'desc'
@@ -278,7 +278,7 @@
   })
   // })
   // 接收状态
-  getDictByCode('orderStatus').then((res) => {
+  getDictByCode('eqptTaskStatus').then((res) => {
     receiveStatusList.value = res.data
   })
 }
@@ -362,9 +362,12 @@
       case '已退回':
         color = '#F68787'
         break
-      case '检测完成':
+      case '待取回':
         color = '#82CD5E'
         break
+      case '已取回':
+        color = '#89D961'
+        break
       default:
         color = '#000'
         break
@@ -408,7 +411,7 @@
         <el-input v-model.trim="listQuery.manufactureNo" placeholder="设备出厂编号" clearable />
       </search-item>
       <search-item v-if="$props.statusName === '全部'">
-        <el-select v-model="listQuery.receiveStatus" placeholder="任务单状态" clearable>
+        <el-select v-model="listQuery.orderStatus" placeholder="任务单状态" clearable>
           <el-option v-for="item in receiveStatusList" :key="item.value" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
@@ -435,8 +438,8 @@
         <template #columns>
           <el-table-column v-if="$props.statusName === '全部'" label="任务单状态" align="center">
             <template #default="scope">
-              <span :style="{ color: TextColor(scope.row.receiveStatusName) }">
-                {{ scope.row.receiveStatusName }}
+              <span :style="{ color: TextColor(scope.row.orderStatusName) }">
+                {{ scope.row.orderStatusName }}
               </span>
             </template>
           </el-table-column>
@@ -487,7 +490,7 @@
               <!-- <el-button v-if="proxy.hasPerm(permUrl.edit) && $props.statusName === '全部'" link type="primary" :disabled="scope.row.receiveStatusName !== '未接收'" size="small" @click="handler(scope.row, 'update')">
                 编辑
               </el-button> -->
-              <el-button v-if="proxy.hasPerm(permUrl.cancel) && $props.statusName === '全部'" :disabled="scope.row.receiveStatusName !== '未接收'" link type="danger" size="small" @click="cancelHandler(scope.row)">
+              <el-button v-if="proxy.hasPerm(permUrl.cancel) && $props.statusName === '全部'" :disabled="scope.row.orderStatusName !== '未接收'" link type="danger" size="small" @click="cancelHandler(scope.row)">
                 取消
               </el-button>
             </template>
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index 0bf751f..8110a5b 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -314,23 +314,44 @@
   return (name: string) => {
     let color = ''
     switch (name) {
-      case '未接收':
-        color = '#888'
+      // case '未接收':
+      //   color = '#888'
+      //   break
+      // case '已接收':
+      //   color = '#000'
+      //   break
+      // case '已取消':
+      //   color = '#EAA341'
+      //   break
+      // case '已退回':
+      //   color = '#F68787'
+      //   break
+      // case '待取回':
+      //   color = '#82CD5E'
+      //   break
+      // case '已取回':
+      //   color = '#89D961'
+      //   break
+      case '检定中':
+        color = '#40AAFF'
         break
-      case '已接收':
+      case '已检完':
+        color = '#F0F9EB'
+        break
+      case '未检定':
         color = '#000'
         break
-      case '已取消':
-        color = '#EAA341'
+      case '已接收':
+        color = '#F0F9EB'
+        break
+      case '未接收':
+        color = '#000'
         break
       case '已退回':
         color = '#F68787'
         break
-      case '检测完成':
-        color = '#82CD5E'
-        break
-      case '检定中':
-        color = '#4FA6FF'
+      case '待补送':
+        color = '#EAA341'
         break
       default:
         color = '#000'
@@ -372,11 +393,12 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in ($route.path.includes('detail') && $route.query.statusName === '全部' ? columnsDetail : columnsHandler)" :key="item.value" :width="item.width" :prop="item.value" :label="item.text"
-        align="center"
+        v-for="item in ($route.path.includes('detail') && $route.query.statusName === '全部' ? columnsDetail : columnsHandler)"
+        :key="item.value" :width="item.width" :prop="item.value" :label="item.text" align="center"
       >
         <template #header>
-          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text
+          }}</span>
         </template>
         <template #default="scope">
           <!-- <el-button v-if="!scope.row.editable && !item.isUpload && item.text === '设备名称' && $route.path.includes('detail')" link type="primary" @click="deviceDetail(scope.row)">
@@ -388,11 +410,11 @@
             v-if="scope.row.editable && !item.isBtn && !item.isUpload" v-model="scope.row[item.value]" :autofocus="true"
             :placeholder="`${item.text}`" class="input"
           /> -->
-          <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+          <span v-if="!scope.row.editable" :class="{ link: $route.query.statusName === '全部' && item.text === '设备名称' ? true : false }" @click="deviceDetail(scope.row)"> {{
+            scope.row[item.value] }}</span>
           <el-input
             v-if="scope.row.editable && item.type === 'input'" v-model="scope.row[item.value]" :autofocus="true"
-            :placeholder="`${item.text}`" class="input"
-            @focus="select(item.text, scope.$index)"
+            :placeholder="`${item.text}`" class="input" @focus="select(item.text, scope.$index)"
           />
           <el-input
             v-if="scope.row.editable && item.type === 'btn'" v-model="scope.row[item.value]" :autofocus="true"
@@ -420,11 +442,16 @@
             </span>
           </template>
         </el-table-column>
+
+        <el-table-column align="center" label="接受状态说明">
+          <template #default="scope">
+            {{ scope.row.remark }}
+          </template>
+        </el-table-column>
         <el-table-column align="center" label="检定结果">
           <template #default="scope">
             <el-tag
-              v-if="['合格', '不合格', '限用'].includes(scope.row.measureCompletePercent)" :type="
-                scope.row.measureCompletePercent === '合格' ? 'success' : scope.row.measureCompletePercent === '不合格' ? 'danger' : scope.row.measureCompletePercent === '限用' ? 'warning' : 'primary'
+              v-if="['合格', '不合格', '限用'].includes(scope.row.measureCompletePercent)" :type="scope.row.measureCompletePercent === '合格' ? 'success' : scope.row.measureCompletePercent === '不合格' ? 'danger' : scope.row.measureCompletePercent === '限用' ? 'warning' : ''
               "
             >
               {{ scope.row.measureCompletePercent }}
@@ -439,6 +466,11 @@
             {{ scope.row.measureCompleteTime }}
           </template>
         </el-table-column>
+        <el-table-column align="center" label="检定说明">
+          <template #default="scope">
+            {{ scope.row.measureRemark }}
+          </template>
+        </el-table-column>
       </template>
     </el-table>
   </detail-block-switch>
@@ -452,4 +484,13 @@
 .el-select {
   width: 100%;
 }
+
+.link {
+  color: #40aaff;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
 </style>
diff --git a/src/views/tested/dashboard/list.vue b/src/views/tested/dashboard/list.vue
index f82c9b0..ec65781 100644
--- a/src/views/tested/dashboard/list.vue
+++ b/src/views/tested/dashboard/list.vue
@@ -1,8 +1,13 @@
 <script lang="ts" setup name="BoardIndex">
 import messList from './components/list.vue'
 import apprList from './components/listApprove.vue'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $route = useRoute()
 //  检定 verification  通知 notice  审批 approve  工作 work
+
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'BoardIndex')
+})
 </script>
 
 <template>
diff --git a/src/views/tested/device/group/components/list.vue b/src/views/tested/device/group/components/list.vue
index 4d3e229..04df4b7 100644
--- a/src/views/tested/device/group/components/list.vue
+++ b/src/views/tested/device/group/components/list.vue
@@ -8,6 +8,7 @@
 import { toTreeList } from '@/utils/structure'
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
 import { getDeptList, getDeptTree, getDeptTreeList, getDeptTreeListByPid } from '@/api/system/dept'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const userStore = useUserStore()
 const listQuery = reactive({
@@ -23,6 +24,10 @@
   sort: 'desc',
   orderBy: 'create_time',
 })
+
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'DeviceGroupIndex')
+})
 const columns = ref([
   {
     text: '所在单位',
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index 755d7ea..b3003ea 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -461,6 +461,14 @@
         //     ruleForm.value.deptId = deptList.value[0].id
         //   }
         // })
+        // 自定填充部门
+        if ($route.params.type === 'create') {
+          if (userStore.deptName !== ruleForm.value.companyName) {
+            setTimeout(() => {
+              ruleForm.value.deptId = userStore.deptId
+            })
+          }
+        }
       }
     })
   }
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index 8b8bfeb..a7aa6ab 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -36,7 +36,7 @@
   },
 })
 onBeforeRouteLeave((to: any) => {
-  keepSearchParams(to.path, 'DeviceInfo')
+  keepSearchParams(to.path, $props.equipmentType === '1' ? 'DeviceInfo' : 'SpecialDevice')
 })
 const userStore = useUserStore()
 const applyDict = ref<{ [key: string]: string }>({
diff --git a/src/views/tested/device/remind/index.vue b/src/views/tested/device/remind/index.vue
index 538572d..f5cf7d4 100644
--- a/src/views/tested/device/remind/index.vue
+++ b/src/views/tested/device/remind/index.vue
@@ -10,13 +10,16 @@
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 import { getTaskList } from '@/api/eqpt/device/task'
 import { getUserDept, getUserDeptSon } from '@/api/system/user'
+import { toTreeList } from '@/utils/structure'
 import { getPostList } from '@/api/system/post'
 import { getDeptTree, getDeptTreeList } from '@/api/system/dept'
+import useUserStore from '@/store/modules/user'
 import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 onBeforeRouteLeave((to: any) => {
   keepSearchParams(to.path, 'RemindList')
 })
+const userStore = useUserStore()
 const listQuery = reactive({
   certificateValidEnd: '',
   certificateValidStart: '',
@@ -65,14 +68,21 @@
     align: 'center',
   },
   {
+    text: '使用部门',
+    value: 'deptName',
+    align: 'center',
+  },
+  {
     text: '计量标识',
     value: 'meterIdentifyName',
     align: 'center',
+    width: '90',
   },
   {
     text: '检定周期',
     value: 'checkCycle',
     align: 'center',
+    width: '90',
   },
 ])
 const otherColumns = ref([
@@ -80,6 +90,7 @@
     text: '使用状态',
     value: 'usageStatusName',
     align: 'center',
+    width: '90',
   },
   // {
   //   text: '备注',
@@ -97,6 +108,12 @@
     value: 'taskTimes',
     align: 'center',
   },
+  {
+    text: '检定去向',
+    value: 'checkDestinationName',
+    align: 'center',
+    width: '90',
+  },
 ])
 const list = ref([])
 const total = ref(0)
@@ -285,13 +302,18 @@
     remindList.value = res.data
   })
   // 获取当前用户所在单位
-  // getUserDept().then((res) => {
-  // getDeptTree({ pid: '0' }).then((res1) => {
-  //   deptList.value = res1.data.filter((item: any) => item.pids.split(',').length === 3 && item.pid !== '0').map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
-  // })
-  getUserDeptSon({ }).then((res) => {
-    deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  getUserDept().then((res) => {
+    // getDeptTree({ pid: '0' }).then((res1) => {
+    //   deptList.value = res1.data.filter((item: any) => item.pids.split(',').length === 3 && item.pid !== '0').map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+    // })
+    // getUserDeptSon({ }).then((res) => {
+    //   deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+    //   console.log(deptList.value, 'deptList.value')
+    getDeptTreeList({ pid: res.data.id }).then((res) => {
+      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id }))) as any
+    })
   })
+
   // })
   // 使用岗位
   getPostList({}).then((res) => {
@@ -358,9 +380,13 @@
       </search-item> -->
       <search-item>
         <!-- <dept-select v-model="listQuery.deptIds" placeholder="使用部门" /> -->
-        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门" style="width: 100%;" clearable>
+        <!-- <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>
+        </el-select> -->
+        <el-tree-select
+          v-model="listQuery.deptIds" :data="deptList" :render-after-expand="false" check-strictly
+          placeholder="使用部门"
+        />
       </search-item>
       <search-item>
         <!-- <el-input v-model.trim="listQuery.usePosition" placeholder="使用岗位" clearable /> -->
@@ -376,22 +402,14 @@
       </search-item> -->
       <search-item>
         <el-date-picker
-          v-model="listQuery.certificateValidStart"
-          type="date"
-          placeholder="证书有效期开始时间"
-          value-format="YYYY-MM-DD 00:00:00"
-          format="YYYY-MM-DD"
-          clearable
+          v-model="listQuery.certificateValidStart" type="date" placeholder="证书有效期开始时间"
+          value-format="YYYY-MM-DD 00:00:00" format="YYYY-MM-DD" clearable
         />
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="listQuery.certificateValidEnd"
-          type="date"
-          placeholder="证书有效期结束时间"
-          value-format="YYYY-MM-DD 23:59:59"
-          format="YYYY-MM-DD"
-          clearable
+          v-model="listQuery.certificateValidEnd" type="date" placeholder="证书有效期结束时间"
+          value-format="YYYY-MM-DD 23:59:59" format="YYYY-MM-DD" clearable
         />
       </search-item>
       <search-item>
@@ -421,9 +439,8 @@
       </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
+          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>
@@ -434,24 +451,29 @@
       </template>
       <!-- 普通表格 -->
       <normal-table
-        v-if="showTable"
-        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
-        :is-showmulti-select="true" :is-multi="true" @change="changePage"
+        v-if="showTable" :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>
           <el-table-column label="证书有效期" align="center">
             <template #default="scope">
-              <span :class="rowClassName(scope.row. certificateValid)">{{ scope.row. certificateValid }}</span>
+              <span :class="rowClassName(scope.row.certificateValid)">{{ scope.row.certificateValid }}</span>
             </template>
           </el-table-column>
-          <el-table-column v-for="item in otherColumns" :key="item.text" :width="item.width" :label="item.text" :prop="item.value" align="center" />
+          <el-table-column
+            v-for="item in otherColumns" :key="item.text" :width="item.width" :label="item.text"
+            :prop="item.value" align="center"
+          />
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
               <el-button link type="primary" size="small" @click="detail(scope.row)">
                 查看
               </el-button>
-              <el-button v-if="proxy.hasPerm('/tested/device/remind/remind')" link type="primary" size="small" @click="remind(scope.row)">
+              <el-button
+                v-if="proxy.hasPerm('/tested/device/remind/remind')" link type="primary" size="small"
+                @click="remind(scope.row)"
+              >
                 提醒
               </el-button>
             </template>
@@ -472,4 +494,3 @@
   color: red;
 }
 </style>
-
diff --git a/src/views/tested/document/list/index.vue b/src/views/tested/document/list/index.vue
index e1ca1c4..1123be0 100644
--- a/src/views/tested/document/list/index.vue
+++ b/src/views/tested/document/list/index.vue
@@ -8,6 +8,7 @@
 import { getPhotoUrl } from '@/api/system/tool'
 import { getDictByCode } from '@/api/system/dict'
 import { getAdminDept } from '@/api/system/user'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive<IlistQuery>({
   fileNo: '',
@@ -21,6 +22,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'DocumentList')
+})
 const columns = ref([
   {
     text: '文件号',
diff --git a/src/views/tested/status/borrow/components/list.vue b/src/views/tested/status/borrow/components/list.vue
index 16861b6..6441b38 100644
--- a/src/views/tested/status/borrow/components/list.vue
+++ b/src/views/tested/status/borrow/components/list.vue
@@ -9,6 +9,7 @@
 import { getAdminDept, getUserDept } from '@/api/system/user'
 import { toTreeList } from '@/utils/structure'
 import { getDeptTreeList } from '@/api/system/dept'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   //  审批状态  全部 审批等
   statusName: {
@@ -24,6 +25,9 @@
   未通过: '5',
   已取消: '6',
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'DeviceBorrow')
+})
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   approvalNo: '',
diff --git a/src/views/tested/status/delay/components/list.vue b/src/views/tested/status/delay/components/list.vue
index 090ba91..b640ddd 100644
--- a/src/views/tested/status/delay/components/list.vue
+++ b/src/views/tested/status/delay/components/list.vue
@@ -11,6 +11,7 @@
 import { toTreeList, underlineToHump } from '@/utils/structure'
 import { getDeptList, getDeptTree, getDeptTreeList } from '@/api/system/dept'
 import { getPostList } from '@/api/system/post'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   //  审批状态  全部 审批等
   statusName: {
@@ -23,6 +24,16 @@
     default: '',
   },
 })
+const stsusDictAlive = {
+  1: 'SealPage',
+  2: 'UnsealPage',
+  3: 'DisabledPage',
+  4: 'ScrapPage',
+  5: 'DelayPage',
+}
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, stsusDictAlive[$props.statusType])
+})
 const applyDict = ref<{ [key: string]: string }>({
   审批: '',
   草稿箱: '1',
diff --git a/src/views/tested/status/maintain/index.vue b/src/views/tested/status/maintain/index.vue
index a0378c7..0785c18 100644
--- a/src/views/tested/status/maintain/index.vue
+++ b/src/views/tested/status/maintain/index.vue
@@ -7,6 +7,7 @@
 import { getAdminDept, getUserDept } from '@/api/system/user'
 import { toTreeList } from '@/utils/structure'
 import { getDeptTreeList } from '@/api/system/dept'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 查询条件
@@ -23,6 +24,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'DeviceMainList')
+})
 // 申请开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
diff --git a/src/views/tested/subpackage/certificate/index.vue b/src/views/tested/subpackage/certificate/index.vue
index 635f5dc..5336612 100644
--- a/src/views/tested/subpackage/certificate/index.vue
+++ b/src/views/tested/subpackage/certificate/index.vue
@@ -13,6 +13,7 @@
 import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
 import { getListPage } from '@/api/eqpt/subpackage/directory'
 import { getDictByCode } from '@/api/system/dict'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   certificateName: '',
@@ -32,6 +33,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'SubpackageCertificate')
+})
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
   listQuery.checkDateStart = ''

diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue
index 58aa0af..1c1c923 100644
--- a/src/views/tested/MeasurementBusiness/detection/index.vue
+++ b/src/views/tested/MeasurementBusiness/detection/index.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/detection'
 import { printJSON } from '@/utils/printUtils'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   noticeDateEnd: '',
@@ -14,6 +15,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'InspectionResultReviewNotice')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
diff --git a/src/views/tested/MeasurementBusiness/notice/index.vue b/src/views/tested/MeasurementBusiness/notice/index.vue
index de0cf86..e161859 100644
--- a/src/views/tested/MeasurementBusiness/notice/index.vue
+++ b/src/views/tested/MeasurementBusiness/notice/index.vue
@@ -3,6 +3,7 @@
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/notice'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   applicantName: '',
@@ -18,6 +19,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'SubcontractingNotice')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
diff --git a/src/views/tested/MeasurementBusiness/opinion/components/list.vue b/src/views/tested/MeasurementBusiness/opinion/components/list.vue
index a2e035c..4e5fd62 100644
--- a/src/views/tested/MeasurementBusiness/opinion/components/list.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/components/list.vue
@@ -9,6 +9,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { getDictByCode } from '@/api/system/dict'
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   statusName: {
     type: String,
@@ -24,6 +25,9 @@
   未通过: '5',
   已取消: '6',
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'ClientOpinionForm')
+})
 const listQuery = reactive({
   approvalStatus: '0',
   createTimeEnd: '',
diff --git a/src/views/tested/MeasurementBusiness/review/index.vue b/src/views/tested/MeasurementBusiness/review/index.vue
index b4c16f9..c2f4c68 100644
--- a/src/views/tested/MeasurementBusiness/review/index.vue
+++ b/src/views/tested/MeasurementBusiness/review/index.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/review'
 import { getDictByCode } from '@/api/system/dict'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   approvalStatus: '',
@@ -18,6 +19,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'ReviewForm')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref([
   `${new Date().getFullYear()}-01-01`,
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/index.vue b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
index 238bbd6..aef9dab 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/index.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
@@ -3,6 +3,7 @@
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/satisfaction'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   sendTimeStart: '',
@@ -11,6 +12,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'ClientSatisfactionSurveyForm')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
diff --git a/src/views/tested/MeasurementPlan/board/index.vue b/src/views/tested/MeasurementPlan/board/index.vue
index 8d14386..850326e 100644
--- a/src/views/tested/MeasurementPlan/board/index.vue
+++ b/src/views/tested/MeasurementPlan/board/index.vue
@@ -5,12 +5,16 @@
 import { exportListApi, getListPage } from '@/api/eqpt/measurementPlan/board'
 import { exportFile } from '@/utils/exportUtils'
 import { buildTree, toTreeList } from '@/utils/structure'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   deptName: '',
   // offset: 1,
   // limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'BoardList')
+})
 const columns = ref<any>([
   {
     text: '部门',
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index f7390f9..e2061e0 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -5,6 +5,7 @@
 import { getListPage } from '@/api/eqpt/measurementPlan/dept'
 import useUserStore from '@/store/modules/user'
 import { getUserDept } from '@/api/system/user'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   // notifyType 通知类型(负责人/部门，字典值)
   notifyType: {
@@ -12,6 +13,10 @@
     required: true,
   },
 })
+
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, $props.notifyType === '2' ? 'DeptNotice' : 'CuratorNotice')
+})
 const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
 const userStore = useUserStore()
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index 1f64a62..ee1d163 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -11,6 +11,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 import { getPostList } from '@/api/system/post'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   // 申请类型（字典值，提前/延迟）
   approvalType: {
@@ -23,6 +24,9 @@
     required: true,
   },
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, $props.approvalType === '0' ? 'EarlyApplication' : 'DelayApplication')
+})
 const applyDict = ref<{ [key: string]: string }>({
   审批: '',
   草稿箱: '1',
diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue
index f5eedcb..d5b57e4 100644
--- a/src/views/tested/MeasurementPlan/plan/components/list.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/list.vue
@@ -13,6 +13,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 import useUserStore from '@/store/modules/user'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   statusName: {
     type: String,
@@ -28,6 +29,9 @@
   未通过: '5',
   已取消: '6',
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'PlanIndex')
+})
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   approvalStatus: '', //	申请状态(审批列表传)		false
diff --git a/src/views/tested/MeasurementPlan/task/components/edit.vue b/src/views/tested/MeasurementPlan/task/components/edit.vue
index 9c2f2d9..86b6bd2 100644
--- a/src/views/tested/MeasurementPlan/task/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/task/components/edit.vue
@@ -54,6 +54,7 @@
   isOnSiteCheck: '0',
   onSiteCheckTime: '',
   deptId: '',
+  orderStatusName: '',
 }) // 表单
 const checkPhone = (rule: any, value: any, callback: any) => {
   if (value === '') {
@@ -550,7 +551,7 @@
           <el-row v-if="$route.path.includes('detail') && $route.query.statusName === '全部'" :gutter="24" class="marg">
             <el-col :span="6">
               <el-form-item label="任务单状态">
-                <el-input v-model.trim="ruleForm.receiveStatusName" />
+                <el-input v-model.trim="ruleForm.orderStatusName" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
diff --git a/src/views/tested/MeasurementPlan/task/components/list.vue b/src/views/tested/MeasurementPlan/task/components/list.vue
index c81fd92..d5c6e17 100644
--- a/src/views/tested/MeasurementPlan/task/components/list.vue
+++ b/src/views/tested/MeasurementPlan/task/components/list.vue
@@ -31,7 +31,7 @@
   usePositionId: '',
   measureCompany: '',
   manufactureNo: '',
-  receiveStatus: '',
+  orderStatus: '',
   offset: 1,
   limit: 20,
   sort: 'desc',
@@ -110,7 +110,7 @@
   // },
   {
     text: '计划送检时间',
-    value: 'requireOverTime',
+    value: 'planDeliverTime',
     align: 'center',
   },
   // {
@@ -144,7 +144,7 @@
 watch(() => $props.statusName, (newVal) => {
   if (newVal) {
     listQuery.approvalStatus = applyDict.value[newVal] as string
-    listQuery.receiveStatus = $props.statusName === '全部' ? '' : listQuery.receiveStatus
+    listQuery.orderStatus = $props.statusName === '全部' ? '' : listQuery.orderStatus
     fetchData()
   }
 },
@@ -165,7 +165,7 @@
   listQuery.usePositionId = ''
   listQuery.measureCompany = ''
   listQuery.manufactureNo = ''
-  listQuery.receiveStatus = ''
+  listQuery.orderStatus = ''
   listQuery.offset = 1
   listQuery.limit = 20
   listQuery.sort = 'desc'
@@ -278,7 +278,7 @@
   })
   // })
   // 接收状态
-  getDictByCode('orderStatus').then((res) => {
+  getDictByCode('eqptTaskStatus').then((res) => {
     receiveStatusList.value = res.data
   })
 }
@@ -362,9 +362,12 @@
       case '已退回':
         color = '#F68787'
         break
-      case '检测完成':
+      case '待取回':
         color = '#82CD5E'
         break
+      case '已取回':
+        color = '#89D961'
+        break
       default:
         color = '#000'
         break
@@ -408,7 +411,7 @@
         <el-input v-model.trim="listQuery.manufactureNo" placeholder="设备出厂编号" clearable />
       </search-item>
       <search-item v-if="$props.statusName === '全部'">
-        <el-select v-model="listQuery.receiveStatus" placeholder="任务单状态" clearable>
+        <el-select v-model="listQuery.orderStatus" placeholder="任务单状态" clearable>
           <el-option v-for="item in receiveStatusList" :key="item.value" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
@@ -435,8 +438,8 @@
         <template #columns>
           <el-table-column v-if="$props.statusName === '全部'" label="任务单状态" align="center">
             <template #default="scope">
-              <span :style="{ color: TextColor(scope.row.receiveStatusName) }">
-                {{ scope.row.receiveStatusName }}
+              <span :style="{ color: TextColor(scope.row.orderStatusName) }">
+                {{ scope.row.orderStatusName }}
               </span>
             </template>
           </el-table-column>
@@ -487,7 +490,7 @@
               <!-- <el-button v-if="proxy.hasPerm(permUrl.edit) && $props.statusName === '全部'" link type="primary" :disabled="scope.row.receiveStatusName !== '未接收'" size="small" @click="handler(scope.row, 'update')">
                 编辑
               </el-button> -->
-              <el-button v-if="proxy.hasPerm(permUrl.cancel) && $props.statusName === '全部'" :disabled="scope.row.receiveStatusName !== '未接收'" link type="danger" size="small" @click="cancelHandler(scope.row)">
+              <el-button v-if="proxy.hasPerm(permUrl.cancel) && $props.statusName === '全部'" :disabled="scope.row.orderStatusName !== '未接收'" link type="danger" size="small" @click="cancelHandler(scope.row)">
                 取消
               </el-button>
             </template>
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index 0bf751f..8110a5b 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -314,23 +314,44 @@
   return (name: string) => {
     let color = ''
     switch (name) {
-      case '未接收':
-        color = '#888'
+      // case '未接收':
+      //   color = '#888'
+      //   break
+      // case '已接收':
+      //   color = '#000'
+      //   break
+      // case '已取消':
+      //   color = '#EAA341'
+      //   break
+      // case '已退回':
+      //   color = '#F68787'
+      //   break
+      // case '待取回':
+      //   color = '#82CD5E'
+      //   break
+      // case '已取回':
+      //   color = '#89D961'
+      //   break
+      case '检定中':
+        color = '#40AAFF'
         break
-      case '已接收':
+      case '已检完':
+        color = '#F0F9EB'
+        break
+      case '未检定':
         color = '#000'
         break
-      case '已取消':
-        color = '#EAA341'
+      case '已接收':
+        color = '#F0F9EB'
+        break
+      case '未接收':
+        color = '#000'
         break
       case '已退回':
         color = '#F68787'
         break
-      case '检测完成':
-        color = '#82CD5E'
-        break
-      case '检定中':
-        color = '#4FA6FF'
+      case '待补送':
+        color = '#EAA341'
         break
       default:
         color = '#000'
@@ -372,11 +393,12 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in ($route.path.includes('detail') && $route.query.statusName === '全部' ? columnsDetail : columnsHandler)" :key="item.value" :width="item.width" :prop="item.value" :label="item.text"
-        align="center"
+        v-for="item in ($route.path.includes('detail') && $route.query.statusName === '全部' ? columnsDetail : columnsHandler)"
+        :key="item.value" :width="item.width" :prop="item.value" :label="item.text" align="center"
       >
         <template #header>
-          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text
+          }}</span>
         </template>
         <template #default="scope">
           <!-- <el-button v-if="!scope.row.editable && !item.isUpload && item.text === '设备名称' && $route.path.includes('detail')" link type="primary" @click="deviceDetail(scope.row)">
@@ -388,11 +410,11 @@
             v-if="scope.row.editable && !item.isBtn && !item.isUpload" v-model="scope.row[item.value]" :autofocus="true"
             :placeholder="`${item.text}`" class="input"
           /> -->
-          <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+          <span v-if="!scope.row.editable" :class="{ link: $route.query.statusName === '全部' && item.text === '设备名称' ? true : false }" @click="deviceDetail(scope.row)"> {{
+            scope.row[item.value] }}</span>
           <el-input
             v-if="scope.row.editable && item.type === 'input'" v-model="scope.row[item.value]" :autofocus="true"
-            :placeholder="`${item.text}`" class="input"
-            @focus="select(item.text, scope.$index)"
+            :placeholder="`${item.text}`" class="input" @focus="select(item.text, scope.$index)"
           />
           <el-input
             v-if="scope.row.editable && item.type === 'btn'" v-model="scope.row[item.value]" :autofocus="true"
@@ -420,11 +442,16 @@
             </span>
           </template>
         </el-table-column>
+
+        <el-table-column align="center" label="接受状态说明">
+          <template #default="scope">
+            {{ scope.row.remark }}
+          </template>
+        </el-table-column>
         <el-table-column align="center" label="检定结果">
           <template #default="scope">
             <el-tag
-              v-if="['合格', '不合格', '限用'].includes(scope.row.measureCompletePercent)" :type="
-                scope.row.measureCompletePercent === '合格' ? 'success' : scope.row.measureCompletePercent === '不合格' ? 'danger' : scope.row.measureCompletePercent === '限用' ? 'warning' : 'primary'
+              v-if="['合格', '不合格', '限用'].includes(scope.row.measureCompletePercent)" :type="scope.row.measureCompletePercent === '合格' ? 'success' : scope.row.measureCompletePercent === '不合格' ? 'danger' : scope.row.measureCompletePercent === '限用' ? 'warning' : ''
               "
             >
               {{ scope.row.measureCompletePercent }}
@@ -439,6 +466,11 @@
             {{ scope.row.measureCompleteTime }}
           </template>
         </el-table-column>
+        <el-table-column align="center" label="检定说明">
+          <template #default="scope">
+            {{ scope.row.measureRemark }}
+          </template>
+        </el-table-column>
       </template>
     </el-table>
   </detail-block-switch>
@@ -452,4 +484,13 @@
 .el-select {
   width: 100%;
 }
+
+.link {
+  color: #40aaff;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
 </style>
diff --git a/src/views/tested/dashboard/list.vue b/src/views/tested/dashboard/list.vue
index f82c9b0..ec65781 100644
--- a/src/views/tested/dashboard/list.vue
+++ b/src/views/tested/dashboard/list.vue
@@ -1,8 +1,13 @@
 <script lang="ts" setup name="BoardIndex">
 import messList from './components/list.vue'
 import apprList from './components/listApprove.vue'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $route = useRoute()
 //  检定 verification  通知 notice  审批 approve  工作 work
+
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'BoardIndex')
+})
 </script>
 
 <template>
diff --git a/src/views/tested/device/group/components/list.vue b/src/views/tested/device/group/components/list.vue
index 4d3e229..04df4b7 100644
--- a/src/views/tested/device/group/components/list.vue
+++ b/src/views/tested/device/group/components/list.vue
@@ -8,6 +8,7 @@
 import { toTreeList } from '@/utils/structure'
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
 import { getDeptList, getDeptTree, getDeptTreeList, getDeptTreeListByPid } from '@/api/system/dept'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const userStore = useUserStore()
 const listQuery = reactive({
@@ -23,6 +24,10 @@
   sort: 'desc',
   orderBy: 'create_time',
 })
+
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'DeviceGroupIndex')
+})
 const columns = ref([
   {
     text: '所在单位',
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index 755d7ea..b3003ea 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -461,6 +461,14 @@
         //     ruleForm.value.deptId = deptList.value[0].id
         //   }
         // })
+        // 自定填充部门
+        if ($route.params.type === 'create') {
+          if (userStore.deptName !== ruleForm.value.companyName) {
+            setTimeout(() => {
+              ruleForm.value.deptId = userStore.deptId
+            })
+          }
+        }
       }
     })
   }
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index 8b8bfeb..a7aa6ab 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -36,7 +36,7 @@
   },
 })
 onBeforeRouteLeave((to: any) => {
-  keepSearchParams(to.path, 'DeviceInfo')
+  keepSearchParams(to.path, $props.equipmentType === '1' ? 'DeviceInfo' : 'SpecialDevice')
 })
 const userStore = useUserStore()
 const applyDict = ref<{ [key: string]: string }>({
diff --git a/src/views/tested/device/remind/index.vue b/src/views/tested/device/remind/index.vue
index 538572d..f5cf7d4 100644
--- a/src/views/tested/device/remind/index.vue
+++ b/src/views/tested/device/remind/index.vue
@@ -10,13 +10,16 @@
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 import { getTaskList } from '@/api/eqpt/device/task'
 import { getUserDept, getUserDeptSon } from '@/api/system/user'
+import { toTreeList } from '@/utils/structure'
 import { getPostList } from '@/api/system/post'
 import { getDeptTree, getDeptTreeList } from '@/api/system/dept'
+import useUserStore from '@/store/modules/user'
 import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 onBeforeRouteLeave((to: any) => {
   keepSearchParams(to.path, 'RemindList')
 })
+const userStore = useUserStore()
 const listQuery = reactive({
   certificateValidEnd: '',
   certificateValidStart: '',
@@ -65,14 +68,21 @@
     align: 'center',
   },
   {
+    text: '使用部门',
+    value: 'deptName',
+    align: 'center',
+  },
+  {
     text: '计量标识',
     value: 'meterIdentifyName',
     align: 'center',
+    width: '90',
   },
   {
     text: '检定周期',
     value: 'checkCycle',
     align: 'center',
+    width: '90',
   },
 ])
 const otherColumns = ref([
@@ -80,6 +90,7 @@
     text: '使用状态',
     value: 'usageStatusName',
     align: 'center',
+    width: '90',
   },
   // {
   //   text: '备注',
@@ -97,6 +108,12 @@
     value: 'taskTimes',
     align: 'center',
   },
+  {
+    text: '检定去向',
+    value: 'checkDestinationName',
+    align: 'center',
+    width: '90',
+  },
 ])
 const list = ref([])
 const total = ref(0)
@@ -285,13 +302,18 @@
     remindList.value = res.data
   })
   // 获取当前用户所在单位
-  // getUserDept().then((res) => {
-  // getDeptTree({ pid: '0' }).then((res1) => {
-  //   deptList.value = res1.data.filter((item: any) => item.pids.split(',').length === 3 && item.pid !== '0').map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
-  // })
-  getUserDeptSon({ }).then((res) => {
-    deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  getUserDept().then((res) => {
+    // getDeptTree({ pid: '0' }).then((res1) => {
+    //   deptList.value = res1.data.filter((item: any) => item.pids.split(',').length === 3 && item.pid !== '0').map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+    // })
+    // getUserDeptSon({ }).then((res) => {
+    //   deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+    //   console.log(deptList.value, 'deptList.value')
+    getDeptTreeList({ pid: res.data.id }).then((res) => {
+      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id }))) as any
+    })
   })
+
   // })
   // 使用岗位
   getPostList({}).then((res) => {
@@ -358,9 +380,13 @@
       </search-item> -->
       <search-item>
         <!-- <dept-select v-model="listQuery.deptIds" placeholder="使用部门" /> -->
-        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门" style="width: 100%;" clearable>
+        <!-- <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>
+        </el-select> -->
+        <el-tree-select
+          v-model="listQuery.deptIds" :data="deptList" :render-after-expand="false" check-strictly
+          placeholder="使用部门"
+        />
       </search-item>
       <search-item>
         <!-- <el-input v-model.trim="listQuery.usePosition" placeholder="使用岗位" clearable /> -->
@@ -376,22 +402,14 @@
       </search-item> -->
       <search-item>
         <el-date-picker
-          v-model="listQuery.certificateValidStart"
-          type="date"
-          placeholder="证书有效期开始时间"
-          value-format="YYYY-MM-DD 00:00:00"
-          format="YYYY-MM-DD"
-          clearable
+          v-model="listQuery.certificateValidStart" type="date" placeholder="证书有效期开始时间"
+          value-format="YYYY-MM-DD 00:00:00" format="YYYY-MM-DD" clearable
         />
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="listQuery.certificateValidEnd"
-          type="date"
-          placeholder="证书有效期结束时间"
-          value-format="YYYY-MM-DD 23:59:59"
-          format="YYYY-MM-DD"
-          clearable
+          v-model="listQuery.certificateValidEnd" type="date" placeholder="证书有效期结束时间"
+          value-format="YYYY-MM-DD 23:59:59" format="YYYY-MM-DD" clearable
         />
       </search-item>
       <search-item>
@@ -421,9 +439,8 @@
       </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
+          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>
@@ -434,24 +451,29 @@
       </template>
       <!-- 普通表格 -->
       <normal-table
-        v-if="showTable"
-        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
-        :is-showmulti-select="true" :is-multi="true" @change="changePage"
+        v-if="showTable" :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>
           <el-table-column label="证书有效期" align="center">
             <template #default="scope">
-              <span :class="rowClassName(scope.row. certificateValid)">{{ scope.row. certificateValid }}</span>
+              <span :class="rowClassName(scope.row.certificateValid)">{{ scope.row.certificateValid }}</span>
             </template>
           </el-table-column>
-          <el-table-column v-for="item in otherColumns" :key="item.text" :width="item.width" :label="item.text" :prop="item.value" align="center" />
+          <el-table-column
+            v-for="item in otherColumns" :key="item.text" :width="item.width" :label="item.text"
+            :prop="item.value" align="center"
+          />
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
               <el-button link type="primary" size="small" @click="detail(scope.row)">
                 查看
               </el-button>
-              <el-button v-if="proxy.hasPerm('/tested/device/remind/remind')" link type="primary" size="small" @click="remind(scope.row)">
+              <el-button
+                v-if="proxy.hasPerm('/tested/device/remind/remind')" link type="primary" size="small"
+                @click="remind(scope.row)"
+              >
                 提醒
               </el-button>
             </template>
@@ -472,4 +494,3 @@
   color: red;
 }
 </style>
-
diff --git a/src/views/tested/document/list/index.vue b/src/views/tested/document/list/index.vue
index e1ca1c4..1123be0 100644
--- a/src/views/tested/document/list/index.vue
+++ b/src/views/tested/document/list/index.vue
@@ -8,6 +8,7 @@
 import { getPhotoUrl } from '@/api/system/tool'
 import { getDictByCode } from '@/api/system/dict'
 import { getAdminDept } from '@/api/system/user'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive<IlistQuery>({
   fileNo: '',
@@ -21,6 +22,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'DocumentList')
+})
 const columns = ref([
   {
     text: '文件号',
diff --git a/src/views/tested/status/borrow/components/list.vue b/src/views/tested/status/borrow/components/list.vue
index 16861b6..6441b38 100644
--- a/src/views/tested/status/borrow/components/list.vue
+++ b/src/views/tested/status/borrow/components/list.vue
@@ -9,6 +9,7 @@
 import { getAdminDept, getUserDept } from '@/api/system/user'
 import { toTreeList } from '@/utils/structure'
 import { getDeptTreeList } from '@/api/system/dept'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   //  审批状态  全部 审批等
   statusName: {
@@ -24,6 +25,9 @@
   未通过: '5',
   已取消: '6',
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'DeviceBorrow')
+})
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   approvalNo: '',
diff --git a/src/views/tested/status/delay/components/list.vue b/src/views/tested/status/delay/components/list.vue
index 090ba91..b640ddd 100644
--- a/src/views/tested/status/delay/components/list.vue
+++ b/src/views/tested/status/delay/components/list.vue
@@ -11,6 +11,7 @@
 import { toTreeList, underlineToHump } from '@/utils/structure'
 import { getDeptList, getDeptTree, getDeptTreeList } from '@/api/system/dept'
 import { getPostList } from '@/api/system/post'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   //  审批状态  全部 审批等
   statusName: {
@@ -23,6 +24,16 @@
     default: '',
   },
 })
+const stsusDictAlive = {
+  1: 'SealPage',
+  2: 'UnsealPage',
+  3: 'DisabledPage',
+  4: 'ScrapPage',
+  5: 'DelayPage',
+}
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, stsusDictAlive[$props.statusType])
+})
 const applyDict = ref<{ [key: string]: string }>({
   审批: '',
   草稿箱: '1',
diff --git a/src/views/tested/status/maintain/index.vue b/src/views/tested/status/maintain/index.vue
index a0378c7..0785c18 100644
--- a/src/views/tested/status/maintain/index.vue
+++ b/src/views/tested/status/maintain/index.vue
@@ -7,6 +7,7 @@
 import { getAdminDept, getUserDept } from '@/api/system/user'
 import { toTreeList } from '@/utils/structure'
 import { getDeptTreeList } from '@/api/system/dept'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 查询条件
@@ -23,6 +24,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'DeviceMainList')
+})
 // 申请开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
diff --git a/src/views/tested/subpackage/certificate/index.vue b/src/views/tested/subpackage/certificate/index.vue
index 635f5dc..5336612 100644
--- a/src/views/tested/subpackage/certificate/index.vue
+++ b/src/views/tested/subpackage/certificate/index.vue
@@ -13,6 +13,7 @@
 import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
 import { getListPage } from '@/api/eqpt/subpackage/directory'
 import { getDictByCode } from '@/api/system/dict'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   certificateName: '',
@@ -32,6 +33,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'SubpackageCertificate')
+})
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
   listQuery.checkDateStart = ''
diff --git a/src/views/tested/subpackage/directory/components/list.vue b/src/views/tested/subpackage/directory/components/list.vue
index cec8ccb..9985bbb 100644
--- a/src/views/tested/subpackage/directory/components/list.vue
+++ b/src/views/tested/subpackage/directory/components/list.vue
@@ -7,12 +7,16 @@
 import { getDictByCode } from '@/api/system/dict'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   statusName: {
     type: String,
     default: '',
   },
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'SubpackageDirectory')
+})
 const applyDict = ref<{ [key: string]: string }>({
   审批: '',
   草稿箱: '1',

diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue
index 58aa0af..1c1c923 100644
--- a/src/views/tested/MeasurementBusiness/detection/index.vue
+++ b/src/views/tested/MeasurementBusiness/detection/index.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/detection'
 import { printJSON } from '@/utils/printUtils'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   noticeDateEnd: '',
@@ -14,6 +15,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'InspectionResultReviewNotice')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
diff --git a/src/views/tested/MeasurementBusiness/notice/index.vue b/src/views/tested/MeasurementBusiness/notice/index.vue
index de0cf86..e161859 100644
--- a/src/views/tested/MeasurementBusiness/notice/index.vue
+++ b/src/views/tested/MeasurementBusiness/notice/index.vue
@@ -3,6 +3,7 @@
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/notice'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   applicantName: '',
@@ -18,6 +19,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'SubcontractingNotice')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
diff --git a/src/views/tested/MeasurementBusiness/opinion/components/list.vue b/src/views/tested/MeasurementBusiness/opinion/components/list.vue
index a2e035c..4e5fd62 100644
--- a/src/views/tested/MeasurementBusiness/opinion/components/list.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/components/list.vue
@@ -9,6 +9,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { getDictByCode } from '@/api/system/dict'
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   statusName: {
     type: String,
@@ -24,6 +25,9 @@
   未通过: '5',
   已取消: '6',
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'ClientOpinionForm')
+})
 const listQuery = reactive({
   approvalStatus: '0',
   createTimeEnd: '',
diff --git a/src/views/tested/MeasurementBusiness/review/index.vue b/src/views/tested/MeasurementBusiness/review/index.vue
index b4c16f9..c2f4c68 100644
--- a/src/views/tested/MeasurementBusiness/review/index.vue
+++ b/src/views/tested/MeasurementBusiness/review/index.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/review'
 import { getDictByCode } from '@/api/system/dict'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   approvalStatus: '',
@@ -18,6 +19,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'ReviewForm')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref([
   `${new Date().getFullYear()}-01-01`,
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/index.vue b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
index 238bbd6..aef9dab 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/index.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
@@ -3,6 +3,7 @@
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/satisfaction'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   sendTimeStart: '',
@@ -11,6 +12,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'ClientSatisfactionSurveyForm')
+})
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
diff --git a/src/views/tested/MeasurementPlan/board/index.vue b/src/views/tested/MeasurementPlan/board/index.vue
index 8d14386..850326e 100644
--- a/src/views/tested/MeasurementPlan/board/index.vue
+++ b/src/views/tested/MeasurementPlan/board/index.vue
@@ -5,12 +5,16 @@
 import { exportListApi, getListPage } from '@/api/eqpt/measurementPlan/board'
 import { exportFile } from '@/utils/exportUtils'
 import { buildTree, toTreeList } from '@/utils/structure'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   deptName: '',
   // offset: 1,
   // limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'BoardList')
+})
 const columns = ref<any>([
   {
     text: '部门',
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index f7390f9..e2061e0 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -5,6 +5,7 @@
 import { getListPage } from '@/api/eqpt/measurementPlan/dept'
 import useUserStore from '@/store/modules/user'
 import { getUserDept } from '@/api/system/user'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   // notifyType 通知类型(负责人/部门，字典值)
   notifyType: {
@@ -12,6 +13,10 @@
     required: true,
   },
 })
+
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, $props.notifyType === '2' ? 'DeptNotice' : 'CuratorNotice')
+})
 const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
 const userStore = useUserStore()
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index 1f64a62..ee1d163 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -11,6 +11,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 import { getPostList } from '@/api/system/post'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   // 申请类型（字典值，提前/延迟）
   approvalType: {
@@ -23,6 +24,9 @@
     required: true,
   },
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, $props.approvalType === '0' ? 'EarlyApplication' : 'DelayApplication')
+})
 const applyDict = ref<{ [key: string]: string }>({
   审批: '',
   草稿箱: '1',
diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue
index f5eedcb..d5b57e4 100644
--- a/src/views/tested/MeasurementPlan/plan/components/list.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/list.vue
@@ -13,6 +13,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 import useUserStore from '@/store/modules/user'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   statusName: {
     type: String,
@@ -28,6 +29,9 @@
   未通过: '5',
   已取消: '6',
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'PlanIndex')
+})
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   approvalStatus: '', //	申请状态(审批列表传)		false
diff --git a/src/views/tested/MeasurementPlan/task/components/edit.vue b/src/views/tested/MeasurementPlan/task/components/edit.vue
index 9c2f2d9..86b6bd2 100644
--- a/src/views/tested/MeasurementPlan/task/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/task/components/edit.vue
@@ -54,6 +54,7 @@
   isOnSiteCheck: '0',
   onSiteCheckTime: '',
   deptId: '',
+  orderStatusName: '',
 }) // 表单
 const checkPhone = (rule: any, value: any, callback: any) => {
   if (value === '') {
@@ -550,7 +551,7 @@
           <el-row v-if="$route.path.includes('detail') && $route.query.statusName === '全部'" :gutter="24" class="marg">
             <el-col :span="6">
               <el-form-item label="任务单状态">
-                <el-input v-model.trim="ruleForm.receiveStatusName" />
+                <el-input v-model.trim="ruleForm.orderStatusName" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
diff --git a/src/views/tested/MeasurementPlan/task/components/list.vue b/src/views/tested/MeasurementPlan/task/components/list.vue
index c81fd92..d5c6e17 100644
--- a/src/views/tested/MeasurementPlan/task/components/list.vue
+++ b/src/views/tested/MeasurementPlan/task/components/list.vue
@@ -31,7 +31,7 @@
   usePositionId: '',
   measureCompany: '',
   manufactureNo: '',
-  receiveStatus: '',
+  orderStatus: '',
   offset: 1,
   limit: 20,
   sort: 'desc',
@@ -110,7 +110,7 @@
   // },
   {
     text: '计划送检时间',
-    value: 'requireOverTime',
+    value: 'planDeliverTime',
     align: 'center',
   },
   // {
@@ -144,7 +144,7 @@
 watch(() => $props.statusName, (newVal) => {
   if (newVal) {
     listQuery.approvalStatus = applyDict.value[newVal] as string
-    listQuery.receiveStatus = $props.statusName === '全部' ? '' : listQuery.receiveStatus
+    listQuery.orderStatus = $props.statusName === '全部' ? '' : listQuery.orderStatus
     fetchData()
   }
 },
@@ -165,7 +165,7 @@
   listQuery.usePositionId = ''
   listQuery.measureCompany = ''
   listQuery.manufactureNo = ''
-  listQuery.receiveStatus = ''
+  listQuery.orderStatus = ''
   listQuery.offset = 1
   listQuery.limit = 20
   listQuery.sort = 'desc'
@@ -278,7 +278,7 @@
   })
   // })
   // 接收状态
-  getDictByCode('orderStatus').then((res) => {
+  getDictByCode('eqptTaskStatus').then((res) => {
     receiveStatusList.value = res.data
   })
 }
@@ -362,9 +362,12 @@
       case '已退回':
         color = '#F68787'
         break
-      case '检测完成':
+      case '待取回':
         color = '#82CD5E'
         break
+      case '已取回':
+        color = '#89D961'
+        break
       default:
         color = '#000'
         break
@@ -408,7 +411,7 @@
         <el-input v-model.trim="listQuery.manufactureNo" placeholder="设备出厂编号" clearable />
       </search-item>
       <search-item v-if="$props.statusName === '全部'">
-        <el-select v-model="listQuery.receiveStatus" placeholder="任务单状态" clearable>
+        <el-select v-model="listQuery.orderStatus" placeholder="任务单状态" clearable>
           <el-option v-for="item in receiveStatusList" :key="item.value" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
@@ -435,8 +438,8 @@
         <template #columns>
           <el-table-column v-if="$props.statusName === '全部'" label="任务单状态" align="center">
             <template #default="scope">
-              <span :style="{ color: TextColor(scope.row.receiveStatusName) }">
-                {{ scope.row.receiveStatusName }}
+              <span :style="{ color: TextColor(scope.row.orderStatusName) }">
+                {{ scope.row.orderStatusName }}
               </span>
             </template>
           </el-table-column>
@@ -487,7 +490,7 @@
               <!-- <el-button v-if="proxy.hasPerm(permUrl.edit) && $props.statusName === '全部'" link type="primary" :disabled="scope.row.receiveStatusName !== '未接收'" size="small" @click="handler(scope.row, 'update')">
                 编辑
               </el-button> -->
-              <el-button v-if="proxy.hasPerm(permUrl.cancel) && $props.statusName === '全部'" :disabled="scope.row.receiveStatusName !== '未接收'" link type="danger" size="small" @click="cancelHandler(scope.row)">
+              <el-button v-if="proxy.hasPerm(permUrl.cancel) && $props.statusName === '全部'" :disabled="scope.row.orderStatusName !== '未接收'" link type="danger" size="small" @click="cancelHandler(scope.row)">
                 取消
               </el-button>
             </template>
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index 0bf751f..8110a5b 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -314,23 +314,44 @@
   return (name: string) => {
     let color = ''
     switch (name) {
-      case '未接收':
-        color = '#888'
+      // case '未接收':
+      //   color = '#888'
+      //   break
+      // case '已接收':
+      //   color = '#000'
+      //   break
+      // case '已取消':
+      //   color = '#EAA341'
+      //   break
+      // case '已退回':
+      //   color = '#F68787'
+      //   break
+      // case '待取回':
+      //   color = '#82CD5E'
+      //   break
+      // case '已取回':
+      //   color = '#89D961'
+      //   break
+      case '检定中':
+        color = '#40AAFF'
         break
-      case '已接收':
+      case '已检完':
+        color = '#F0F9EB'
+        break
+      case '未检定':
         color = '#000'
         break
-      case '已取消':
-        color = '#EAA341'
+      case '已接收':
+        color = '#F0F9EB'
+        break
+      case '未接收':
+        color = '#000'
         break
       case '已退回':
         color = '#F68787'
         break
-      case '检测完成':
-        color = '#82CD5E'
-        break
-      case '检定中':
-        color = '#4FA6FF'
+      case '待补送':
+        color = '#EAA341'
         break
       default:
         color = '#000'
@@ -372,11 +393,12 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in ($route.path.includes('detail') && $route.query.statusName === '全部' ? columnsDetail : columnsHandler)" :key="item.value" :width="item.width" :prop="item.value" :label="item.text"
-        align="center"
+        v-for="item in ($route.path.includes('detail') && $route.query.statusName === '全部' ? columnsDetail : columnsHandler)"
+        :key="item.value" :width="item.width" :prop="item.value" :label="item.text" align="center"
       >
         <template #header>
-          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text
+          }}</span>
         </template>
         <template #default="scope">
           <!-- <el-button v-if="!scope.row.editable && !item.isUpload && item.text === '设备名称' && $route.path.includes('detail')" link type="primary" @click="deviceDetail(scope.row)">
@@ -388,11 +410,11 @@
             v-if="scope.row.editable && !item.isBtn && !item.isUpload" v-model="scope.row[item.value]" :autofocus="true"
             :placeholder="`${item.text}`" class="input"
           /> -->
-          <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+          <span v-if="!scope.row.editable" :class="{ link: $route.query.statusName === '全部' && item.text === '设备名称' ? true : false }" @click="deviceDetail(scope.row)"> {{
+            scope.row[item.value] }}</span>
           <el-input
             v-if="scope.row.editable && item.type === 'input'" v-model="scope.row[item.value]" :autofocus="true"
-            :placeholder="`${item.text}`" class="input"
-            @focus="select(item.text, scope.$index)"
+            :placeholder="`${item.text}`" class="input" @focus="select(item.text, scope.$index)"
           />
           <el-input
             v-if="scope.row.editable && item.type === 'btn'" v-model="scope.row[item.value]" :autofocus="true"
@@ -420,11 +442,16 @@
             </span>
           </template>
         </el-table-column>
+
+        <el-table-column align="center" label="接受状态说明">
+          <template #default="scope">
+            {{ scope.row.remark }}
+          </template>
+        </el-table-column>
         <el-table-column align="center" label="检定结果">
           <template #default="scope">
             <el-tag
-              v-if="['合格', '不合格', '限用'].includes(scope.row.measureCompletePercent)" :type="
-                scope.row.measureCompletePercent === '合格' ? 'success' : scope.row.measureCompletePercent === '不合格' ? 'danger' : scope.row.measureCompletePercent === '限用' ? 'warning' : 'primary'
+              v-if="['合格', '不合格', '限用'].includes(scope.row.measureCompletePercent)" :type="scope.row.measureCompletePercent === '合格' ? 'success' : scope.row.measureCompletePercent === '不合格' ? 'danger' : scope.row.measureCompletePercent === '限用' ? 'warning' : ''
               "
             >
               {{ scope.row.measureCompletePercent }}
@@ -439,6 +466,11 @@
             {{ scope.row.measureCompleteTime }}
           </template>
         </el-table-column>
+        <el-table-column align="center" label="检定说明">
+          <template #default="scope">
+            {{ scope.row.measureRemark }}
+          </template>
+        </el-table-column>
       </template>
     </el-table>
   </detail-block-switch>
@@ -452,4 +484,13 @@
 .el-select {
   width: 100%;
 }
+
+.link {
+  color: #40aaff;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
 </style>
diff --git a/src/views/tested/dashboard/list.vue b/src/views/tested/dashboard/list.vue
index f82c9b0..ec65781 100644
--- a/src/views/tested/dashboard/list.vue
+++ b/src/views/tested/dashboard/list.vue
@@ -1,8 +1,13 @@
 <script lang="ts" setup name="BoardIndex">
 import messList from './components/list.vue'
 import apprList from './components/listApprove.vue'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $route = useRoute()
 //  检定 verification  通知 notice  审批 approve  工作 work
+
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'BoardIndex')
+})
 </script>
 
 <template>
diff --git a/src/views/tested/device/group/components/list.vue b/src/views/tested/device/group/components/list.vue
index 4d3e229..04df4b7 100644
--- a/src/views/tested/device/group/components/list.vue
+++ b/src/views/tested/device/group/components/list.vue
@@ -8,6 +8,7 @@
 import { toTreeList } from '@/utils/structure'
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
 import { getDeptList, getDeptTree, getDeptTreeList, getDeptTreeListByPid } from '@/api/system/dept'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const userStore = useUserStore()
 const listQuery = reactive({
@@ -23,6 +24,10 @@
   sort: 'desc',
   orderBy: 'create_time',
 })
+
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'DeviceGroupIndex')
+})
 const columns = ref([
   {
     text: '所在单位',
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index 755d7ea..b3003ea 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -461,6 +461,14 @@
         //     ruleForm.value.deptId = deptList.value[0].id
         //   }
         // })
+        // 自定填充部门
+        if ($route.params.type === 'create') {
+          if (userStore.deptName !== ruleForm.value.companyName) {
+            setTimeout(() => {
+              ruleForm.value.deptId = userStore.deptId
+            })
+          }
+        }
       }
     })
   }
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index 8b8bfeb..a7aa6ab 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -36,7 +36,7 @@
   },
 })
 onBeforeRouteLeave((to: any) => {
-  keepSearchParams(to.path, 'DeviceInfo')
+  keepSearchParams(to.path, $props.equipmentType === '1' ? 'DeviceInfo' : 'SpecialDevice')
 })
 const userStore = useUserStore()
 const applyDict = ref<{ [key: string]: string }>({
diff --git a/src/views/tested/device/remind/index.vue b/src/views/tested/device/remind/index.vue
index 538572d..f5cf7d4 100644
--- a/src/views/tested/device/remind/index.vue
+++ b/src/views/tested/device/remind/index.vue
@@ -10,13 +10,16 @@
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 import { getTaskList } from '@/api/eqpt/device/task'
 import { getUserDept, getUserDeptSon } from '@/api/system/user'
+import { toTreeList } from '@/utils/structure'
 import { getPostList } from '@/api/system/post'
 import { getDeptTree, getDeptTreeList } from '@/api/system/dept'
+import useUserStore from '@/store/modules/user'
 import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 onBeforeRouteLeave((to: any) => {
   keepSearchParams(to.path, 'RemindList')
 })
+const userStore = useUserStore()
 const listQuery = reactive({
   certificateValidEnd: '',
   certificateValidStart: '',
@@ -65,14 +68,21 @@
     align: 'center',
   },
   {
+    text: '使用部门',
+    value: 'deptName',
+    align: 'center',
+  },
+  {
     text: '计量标识',
     value: 'meterIdentifyName',
     align: 'center',
+    width: '90',
   },
   {
     text: '检定周期',
     value: 'checkCycle',
     align: 'center',
+    width: '90',
   },
 ])
 const otherColumns = ref([
@@ -80,6 +90,7 @@
     text: '使用状态',
     value: 'usageStatusName',
     align: 'center',
+    width: '90',
   },
   // {
   //   text: '备注',
@@ -97,6 +108,12 @@
     value: 'taskTimes',
     align: 'center',
   },
+  {
+    text: '检定去向',
+    value: 'checkDestinationName',
+    align: 'center',
+    width: '90',
+  },
 ])
 const list = ref([])
 const total = ref(0)
@@ -285,13 +302,18 @@
     remindList.value = res.data
   })
   // 获取当前用户所在单位
-  // getUserDept().then((res) => {
-  // getDeptTree({ pid: '0' }).then((res1) => {
-  //   deptList.value = res1.data.filter((item: any) => item.pids.split(',').length === 3 && item.pid !== '0').map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
-  // })
-  getUserDeptSon({ }).then((res) => {
-    deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  getUserDept().then((res) => {
+    // getDeptTree({ pid: '0' }).then((res1) => {
+    //   deptList.value = res1.data.filter((item: any) => item.pids.split(',').length === 3 && item.pid !== '0').map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+    // })
+    // getUserDeptSon({ }).then((res) => {
+    //   deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+    //   console.log(deptList.value, 'deptList.value')
+    getDeptTreeList({ pid: res.data.id }).then((res) => {
+      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id }))) as any
+    })
   })
+
   // })
   // 使用岗位
   getPostList({}).then((res) => {
@@ -358,9 +380,13 @@
       </search-item> -->
       <search-item>
         <!-- <dept-select v-model="listQuery.deptIds" placeholder="使用部门" /> -->
-        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门" style="width: 100%;" clearable>
+        <!-- <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>
+        </el-select> -->
+        <el-tree-select
+          v-model="listQuery.deptIds" :data="deptList" :render-after-expand="false" check-strictly
+          placeholder="使用部门"
+        />
       </search-item>
       <search-item>
         <!-- <el-input v-model.trim="listQuery.usePosition" placeholder="使用岗位" clearable /> -->
@@ -376,22 +402,14 @@
       </search-item> -->
       <search-item>
         <el-date-picker
-          v-model="listQuery.certificateValidStart"
-          type="date"
-          placeholder="证书有效期开始时间"
-          value-format="YYYY-MM-DD 00:00:00"
-          format="YYYY-MM-DD"
-          clearable
+          v-model="listQuery.certificateValidStart" type="date" placeholder="证书有效期开始时间"
+          value-format="YYYY-MM-DD 00:00:00" format="YYYY-MM-DD" clearable
         />
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="listQuery.certificateValidEnd"
-          type="date"
-          placeholder="证书有效期结束时间"
-          value-format="YYYY-MM-DD 23:59:59"
-          format="YYYY-MM-DD"
-          clearable
+          v-model="listQuery.certificateValidEnd" type="date" placeholder="证书有效期结束时间"
+          value-format="YYYY-MM-DD 23:59:59" format="YYYY-MM-DD" clearable
         />
       </search-item>
       <search-item>
@@ -421,9 +439,8 @@
       </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
+          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>
@@ -434,24 +451,29 @@
       </template>
       <!-- 普通表格 -->
       <normal-table
-        v-if="showTable"
-        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
-        :is-showmulti-select="true" :is-multi="true" @change="changePage"
+        v-if="showTable" :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>
           <el-table-column label="证书有效期" align="center">
             <template #default="scope">
-              <span :class="rowClassName(scope.row. certificateValid)">{{ scope.row. certificateValid }}</span>
+              <span :class="rowClassName(scope.row.certificateValid)">{{ scope.row.certificateValid }}</span>
             </template>
           </el-table-column>
-          <el-table-column v-for="item in otherColumns" :key="item.text" :width="item.width" :label="item.text" :prop="item.value" align="center" />
+          <el-table-column
+            v-for="item in otherColumns" :key="item.text" :width="item.width" :label="item.text"
+            :prop="item.value" align="center"
+          />
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
               <el-button link type="primary" size="small" @click="detail(scope.row)">
                 查看
               </el-button>
-              <el-button v-if="proxy.hasPerm('/tested/device/remind/remind')" link type="primary" size="small" @click="remind(scope.row)">
+              <el-button
+                v-if="proxy.hasPerm('/tested/device/remind/remind')" link type="primary" size="small"
+                @click="remind(scope.row)"
+              >
                 提醒
               </el-button>
             </template>
@@ -472,4 +494,3 @@
   color: red;
 }
 </style>
-
diff --git a/src/views/tested/document/list/index.vue b/src/views/tested/document/list/index.vue
index e1ca1c4..1123be0 100644
--- a/src/views/tested/document/list/index.vue
+++ b/src/views/tested/document/list/index.vue
@@ -8,6 +8,7 @@
 import { getPhotoUrl } from '@/api/system/tool'
 import { getDictByCode } from '@/api/system/dict'
 import { getAdminDept } from '@/api/system/user'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive<IlistQuery>({
   fileNo: '',
@@ -21,6 +22,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'DocumentList')
+})
 const columns = ref([
   {
     text: '文件号',
diff --git a/src/views/tested/status/borrow/components/list.vue b/src/views/tested/status/borrow/components/list.vue
index 16861b6..6441b38 100644
--- a/src/views/tested/status/borrow/components/list.vue
+++ b/src/views/tested/status/borrow/components/list.vue
@@ -9,6 +9,7 @@
 import { getAdminDept, getUserDept } from '@/api/system/user'
 import { toTreeList } from '@/utils/structure'
 import { getDeptTreeList } from '@/api/system/dept'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   //  审批状态  全部 审批等
   statusName: {
@@ -24,6 +25,9 @@
   未通过: '5',
   已取消: '6',
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'DeviceBorrow')
+})
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   approvalNo: '',
diff --git a/src/views/tested/status/delay/components/list.vue b/src/views/tested/status/delay/components/list.vue
index 090ba91..b640ddd 100644
--- a/src/views/tested/status/delay/components/list.vue
+++ b/src/views/tested/status/delay/components/list.vue
@@ -11,6 +11,7 @@
 import { toTreeList, underlineToHump } from '@/utils/structure'
 import { getDeptList, getDeptTree, getDeptTreeList } from '@/api/system/dept'
 import { getPostList } from '@/api/system/post'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   //  审批状态  全部 审批等
   statusName: {
@@ -23,6 +24,16 @@
     default: '',
   },
 })
+const stsusDictAlive = {
+  1: 'SealPage',
+  2: 'UnsealPage',
+  3: 'DisabledPage',
+  4: 'ScrapPage',
+  5: 'DelayPage',
+}
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, stsusDictAlive[$props.statusType])
+})
 const applyDict = ref<{ [key: string]: string }>({
   审批: '',
   草稿箱: '1',
diff --git a/src/views/tested/status/maintain/index.vue b/src/views/tested/status/maintain/index.vue
index a0378c7..0785c18 100644
--- a/src/views/tested/status/maintain/index.vue
+++ b/src/views/tested/status/maintain/index.vue
@@ -7,6 +7,7 @@
 import { getAdminDept, getUserDept } from '@/api/system/user'
 import { toTreeList } from '@/utils/structure'
 import { getDeptTreeList } from '@/api/system/dept'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 查询条件
@@ -23,6 +24,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'DeviceMainList')
+})
 // 申请开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
diff --git a/src/views/tested/subpackage/certificate/index.vue b/src/views/tested/subpackage/certificate/index.vue
index 635f5dc..5336612 100644
--- a/src/views/tested/subpackage/certificate/index.vue
+++ b/src/views/tested/subpackage/certificate/index.vue
@@ -13,6 +13,7 @@
 import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
 import { getListPage } from '@/api/eqpt/subpackage/directory'
 import { getDictByCode } from '@/api/system/dict'
+import { keepSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   certificateName: '',
@@ -32,6 +33,9 @@
   offset: 1,
   limit: 20,
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'SubpackageCertificate')
+})
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
   listQuery.checkDateStart = ''
diff --git a/src/views/tested/subpackage/directory/components/list.vue b/src/views/tested/subpackage/directory/components/list.vue
index cec8ccb..9985bbb 100644
--- a/src/views/tested/subpackage/directory/components/list.vue
+++ b/src/views/tested/subpackage/directory/components/list.vue
@@ -7,12 +7,16 @@
 import { getDictByCode } from '@/api/system/dict'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   statusName: {
     type: String,
     default: '',
   },
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'SubpackageDirectory')
+})
 const applyDict = ref<{ [key: string]: string }>({
   审批: '',
   草稿箱: '1',
diff --git a/src/views/tested/subpackage/task/components/list.vue b/src/views/tested/subpackage/task/components/list.vue
index ad5fe16..ee69ad0 100644
--- a/src/views/tested/subpackage/task/components/list.vue
+++ b/src/views/tested/subpackage/task/components/list.vue
@@ -10,6 +10,7 @@
 import { getAdminDept, getUserDept } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   statusName: {
     type: String,
@@ -24,6 +25,9 @@
   未通过: '5',
   已取消: '6',
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'SubpackageReview')
+})
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   createTimeEnd: '',